public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	kvm@vger.kernel.org
Subject: [PATCH v2 7/8] msix: remove CONFIG_KVM depedency
Date: Sun, 10 Oct 2010 16:42:06 +0200	[thread overview]
Message-ID: <1286721727-31447-8-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1286721727-31447-1-git-send-email-avi@redhat.com>

Now that the kvm support is properly stubbed, we can build the msix/kvm glue
unconditionally.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 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


  parent reply	other threads:[~2010-10-10 14:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-10 14:41 [PATCH v2 0/8] Move msix.o back to target independent files list Avi Kivity
2010-10-10 14:42 ` [PATCH v2 1/8] msix: avoid leaking kvm data on init failure Avi Kivity
2010-10-10 14:42 ` [PATCH v2 2/8] kvm: drop kvm_context parameter from msix-related kvm functions Avi Kivity
2010-10-10 14:42 ` [PATCH v2 3/8] Avoid using kvm_irq_routing_entry in PCIDevice Avi Kivity
2010-10-10 14:42 ` [PATCH v2 4/8] Avoid use of kvm_irq_routing_entry in hw/msix.c Avi Kivity
2010-10-10 14:42 ` [PATCH v2 5/8] kvm: Add stubs for msix support code Avi Kivity
2010-10-10 14:42 ` [PATCH v2 6/8] kvm: allow kvm.h to be included from target independent files Avi Kivity
2010-10-10 14:42 ` Avi Kivity [this message]
2010-10-10 14:42 ` [PATCH v2 8/8] Move msix.o build back to Makefile.objs Avi Kivity
2010-10-10 15:02 ` [PATCH v2 0/8] Move msix.o back to target independent files list Michael S. Tsirkin
2010-10-20 10:18 ` Michael S. Tsirkin
2010-10-20 10:38   ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1286721727-31447-8-git-send-email-avi@redhat.com \
    --to=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=mtosatti@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox