From patchwork Wed Apr 30 20:29:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 344318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 353F4140104 for ; Thu, 1 May 2014 06:33:47 +1000 (EST) Received: from localhost ([::1]:59191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfbCK-0005N8-Tw for incoming@patchwork.ozlabs.org; Wed, 30 Apr 2014 16:33:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfb8p-00009a-Ev for qemu-devel@nongnu.org; Wed, 30 Apr 2014 16:30:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wfb8h-0005IN-OA for qemu-devel@nongnu.org; Wed, 30 Apr 2014 16:30:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wfb8h-0005IG-GX for qemu-devel@nongnu.org; Wed, 30 Apr 2014 16:29:59 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3UKTwoG024263 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Apr 2014 16:29:59 -0400 Received: from localhost (ovpn-113-106.phx2.redhat.com [10.3.113.106]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3UKTv6J021904; Wed, 30 Apr 2014 16:29:58 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 30 Apr 2014 17:29:31 -0300 Message-Id: <1398889773-14652-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1398889773-14652-1-git-send-email-ehabkost@redhat.com> References: <1398889773-14652-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: libvir-list@redhat.com, Igor Mammedov , Jiri Denemark , Peter Krempa , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC 3/5] pc: Don't crash on apic_accept_pic_intr() if CPU has no apic_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org apic_accept_pic_intr() returns -1 if gets NULL as argument. So, instead of checking if apic_accept_pic_intr() returns non-zero, check for return value > 0. Signed-off-by: Eduardo Habkost --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 14f0d91..c747615 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -197,7 +197,7 @@ static void pic_irq_request(void *opaque, int irq, int level) if (cpu->apic_state) { CPU_FOREACH(cs) { cpu = X86_CPU(cs); - if (apic_accept_pic_intr(cpu->apic_state)) { + if (apic_accept_pic_intr(cpu->apic_state) > 0) { apic_deliver_pic_intr(cpu->apic_state, level); } }