From: Glauber Costa <glommer@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@redhat.com
Subject: [PATCH 2/2] fix compilation with kvm disabled
Date: Tue, 7 Jul 2009 14:36:31 -0400 [thread overview]
Message-ID: <1246991791-21741-3-git-send-email-glommer@redhat.com> (raw)
In-Reply-To: <1246991791-21741-2-git-send-email-glommer@redhat.com>
Signed-off-by: Glauber Costa <glommer@redhat.com>
---
hw/msix.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/hw/msix.c b/hw/msix.c
index b6f3948..8636f69 100644
--- a/hw/msix.c
+++ b/hw/msix.c
@@ -63,6 +63,7 @@
/* Flag for interrupt controller to declare MSI-X support */
int msix_supported;
+#ifdef USE_KVM
/* KVM specific MSIX helpers */
static void kvm_msix_free(PCIDevice *dev)
{
@@ -157,6 +158,14 @@ static void kvm_msix_del(PCIDevice *dev, unsigned vector)
kvm_del_routing_entry(kvm_context, &dev->msix_irq_entries[vector]);
kvm_commit_irq_routes(kvm_context);
}
+#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
@@ -337,10 +346,12 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
if (nentries > MSIX_MAX_ENTRIES)
return -EINVAL;
+#ifdef KVM_CAP_IRQCHIP
if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
dev->msix_irq_entries = qemu_malloc(nentries *
sizeof *dev->msix_irq_entries);
}
+#endif
dev->msix_entry_used = qemu_mallocz(MSIX_MAX_ENTRIES *
sizeof *dev->msix_entry_used);
@@ -454,10 +465,13 @@ void msix_notify(PCIDevice *dev, unsigned vector)
msix_set_pending(dev, vector);
return;
}
+
+#ifdef KVM_CAP_IRQCHIP
if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
kvm_set_irq(dev->msix_irq_entries[vector].gsi, 1, NULL);
return;
}
+#endif
address = pci_get_long(table_entry + MSIX_MSG_UPPER_ADDR);
address = (address << 32) | pci_get_long(table_entry + MSIX_MSG_ADDR);
--
1.6.2.2
next prev parent reply other threads:[~2009-07-07 18:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-07 18:36 [PATCH 0/2] Fix compilation with --disable-kvm Glauber Costa
2009-07-07 18:36 ` [PATCH 1/2] surround kvm function with kvm_enabled Glauber Costa
2009-07-07 18:36 ` Glauber Costa [this message]
2009-07-08 7:59 ` [PATCH 2/2] fix compilation with kvm disabled Michael S. Tsirkin
2009-07-08 12:09 ` Glauber Costa
2009-07-08 12:10 ` Avi Kivity
2009-07-08 12:11 ` Avi Kivity
2009-07-08 12:13 ` Michael S. Tsirkin
2009-07-08 12:20 ` Avi Kivity
2009-07-08 12:20 ` Michael S. Tsirkin
2009-07-09 12:57 ` Michael S. Tsirkin
2009-07-07 18:43 ` [PATCH 0/2] Fix compilation with --disable-kvm Jan Kiszka
2009-07-08 12:14 ` 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=1246991791-21741-3-git-send-email-glommer@redhat.com \
--to=glommer@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/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