From patchwork Tue Jun 15 12:51:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 55657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74549B7D47 for ; Tue, 15 Jun 2010 22:55:08 +1000 (EST) Received: from localhost ([127.0.0.1]:39981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOVfU-0003zk-Sf for incoming@patchwork.ozlabs.org; Tue, 15 Jun 2010 08:55:04 -0400 Received: from [140.186.70.92] (port=53246 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOVcE-0002Eo-97 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:51:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOVcD-0008Pg-3e for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:51:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48223) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOVcC-0008PR-TI for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:51:41 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5FCpd3h028060 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jun 2010 08:51:40 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5FCpMbE029172; Tue, 15 Jun 2010 08:51:33 -0400 From: Jes.Sorensen@redhat.com To: mtosatti@redhat.com Date: Tue, 15 Jun 2010 14:51:12 +0200 Message-Id: <1276606278-24268-2-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1276606278-24268-1-git-send-email-Jes.Sorensen@redhat.com> References: <1276606278-24268-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org, Jes Sorensen Subject: [Qemu-devel] [PATCH 1/7] Only call kvm_set_irqfd() if CONFIG_KVM is defined X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Only call kvm_set_irqfd() if CONFIG_KVM is defined to avoid breaking the build for non x86. Signed-off-by: Jes Sorensen --- hw/virtio-pci.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c3c1fcd..926b8e1 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -431,6 +431,7 @@ static void virtio_pci_guest_notifier_read(void *opaque) static int virtio_pci_mask_notifier(PCIDevice *dev, unsigned vector, void *opaque, int masked) { +#ifdef CONFIG_KVM VirtQueue *vq = opaque; EventNotifier *notifier = virtio_queue_get_guest_notifier(vq); int r = kvm_set_irqfd(dev->msix_irq_entries[vector].gsi, @@ -447,6 +448,9 @@ static int virtio_pci_mask_notifier(PCIDevice *dev, unsigned vector, NULL, NULL, NULL); } return 0; +#else + return -ENOSYS; +#endif } static int virtio_pci_set_guest_notifier(void *opaque, int n, bool assign)