From: Avi Kivity Subject: [PATCH v2 7/8] msix: remove CONFIG_KVM depedency Date: Sun, 10 Oct 2010 16:42:06 +0200 Message-ID: <1286721727-31447-8-git-send-email-avi@redhat.com> References: <1286721727-31447-1-git-send-email-avi@redhat.com> To: "Michael S. Tsirkin" , Marcelo Tosatti , kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:1033 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753307Ab0JJOmK (ORCPT ); Sun, 10 Oct 2010 10:42:10 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9AEgAAI011420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 10 Oct 2010 10:42:10 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9AEg9Px005490 for ; Sun, 10 Oct 2010 10:42:09 -0400 In-Reply-To: <1286721727-31447-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Now that the kvm support is properly stubbed, we can build the msix/kvm glue unconditionally. Signed-off-by: Avi Kivity --- hw/msix.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/hw/msix.c b/hw/msix.c index c752e90..f6ab686 100644 --- a/hw/msix.c +++ b/hw/msix.c @@ -47,8 +47,6 @@ /* Flag for interrupt controller to declare MSI-X support */ int msix_supported; -#ifdef CONFIG_KVM - /* KVM specific MSIX helpers */ static void kvm_msix_free(PCIDevice *dev) { @@ -158,14 +156,6 @@ static void kvm_msix_del(PCIDevice *dev, unsigned vector) kvm_del_msix(kmm->gsi, kmm->addr_lo, kmm->addr_hi, kmm->data); kvm_commit_irq_routes(); } -#else - -static void kvm_msix_free(PCIDevice *dev) {} -static void kvm_msix_update(PCIDevice *dev, int vector, - int was_masked, int is_masked) {} -static int kvm_msix_add(PCIDevice *dev, unsigned vector) { return -1; } -static void kvm_msix_del(PCIDevice *dev, unsigned vector) {} -#endif /* Add MSI-X capability to the config space for the device. */ /* Given a bar and its size, add MSI-X table on top of it -- 1.7.3.1