diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-04-29 13:24:49 +0200 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2011-05-03 16:18:26 -0300 |
commit | 6c1ec4cf90f2dfb299ac4469952fbbc8a9f8294c (patch) | |
tree | 7de66506ce1f99b3952efced45050bfe6a082e68 | |
parent | 21cee191882ecd695500da39a9b8245bf18ecceb (diff) |
qemu-kvm: Do not advertise MSI caps on lacking KVM support
As suggested by Michael Tsirkin: Move the check for GSI routing from
kvm_msi_message_add to the MSI/MSI-X initalization. If it fails (and KVM
is in in-kernel irqchip mode), do not advertise MSI at all.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | hw/msi.c | 4 | ||||
-rw-r--r-- | hw/msix.c | 4 | ||||
-rw-r--r-- | qemu-kvm.c | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -208,6 +208,10 @@ int msi_init(struct PCIDevice *dev, uint8_t offset, " 64bit %d mask %d\n", offset, nr_vectors, msi64bit, msi_per_vector_mask); + if (kvm_enabled() && kvm_irqchip_in_kernel() && !kvm_has_gsi_routing()) { + return -ENOTSUP; + } + assert(!(nr_vectors & (nr_vectors - 1))); /* power of 2 */ assert(nr_vectors > 0); assert(nr_vectors <= PCI_MSI_VECTORS_MAX); @@ -350,8 +350,10 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries, { int ret; /* Nothing to do if MSI is not supported by interrupt controller */ - if (!msix_supported) + if (!msix_supported || + (kvm_enabled() && kvm_irqchip_in_kernel() && !kvm_has_gsi_routing())) { return -ENOTSUP; + } if (nentries > MSIX_MAX_ENTRIES) return -EINVAL; diff --git a/qemu-kvm.c b/qemu-kvm.c index e8c2009c4..b9511465d 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -986,10 +986,6 @@ int kvm_msi_message_add(KVMMsiMessage *msg) struct kvm_irq_routing_entry e; int ret; - if (!kvm_has_gsi_routing()) { - return -EOPNOTSUPP; - } - ret = kvm_get_irq_route_gsi(); if (ret < 0) { return ret; |