From: Alex Williamson <alex.williamson@redhat.com>
To: kvm@vger.kernel.org
Cc: jan.kiszka@siemens.com, avi@redhat.com, yongjie.ren@intel.com,
alex.williamson@redhat.com
Subject: [PATCH v2 2/2] pci-assign: Fix MSI-X capability test
Date: Thu, 22 Sep 2011 12:09:07 -0600 [thread overview]
Message-ID: <20110922180907.13603.15531.stgit@s20.home> (raw)
In-Reply-To: <20110922180823.13603.57187.stgit@s20.home>
Commit c4525754 added a capability check for KVM_CAP_DEVICE_MSIX,
which is unfortunately not exposed, resulting in MSIX never
being listed as a capability. This breaks anything depending on
MSIX, such as igbvf. Instead let's use a dummy call to
KVM_ASSIGN_SET_MSIX_NR which will return -EFAULT if the call
exists.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
hw/device-assignment.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 137c409..f0a6ca9 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1212,7 +1212,10 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
}
/* Expose MSI-X capability */
pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_MSIX, 0);
- if (pos != 0 && kvm_check_extension(kvm_state, KVM_CAP_DEVICE_MSIX)) {
+ /* Would really like to test kvm_check_extension(, KVM_CAP_DEVICE_MSIX),
+ * but the kernel doesn't expose it. Instead do a dummy call to
+ * KVM_ASSIGN_SET_MSIX_NR to see if it exists. */
+ if (pos != 0 && kvm_assign_set_msix_nr(kvm_state, NULL) == -EFAULT) {
int bar_nr;
uint32_t msix_table_entry;
next prev parent reply other threads:[~2011-09-22 18:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 18:08 [PATCH v2 0/2] pci-assign: Fix MSI-X support Alex Williamson
2011-09-22 18:09 ` [PATCH v2 1/2] pci-assign: Re-order initfn for memory API Alex Williamson
2011-09-22 18:09 ` Alex Williamson [this message]
2011-09-23 17:00 ` [PATCH v2 0/2] pci-assign: Fix MSI-X support Jan Kiszka
2011-10-03 19:39 ` Marcelo Tosatti
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=20110922180907.13603.15531.stgit@s20.home \
--to=alex.williamson@redhat.com \
--cc=avi@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=kvm@vger.kernel.org \
--cc=yongjie.ren@intel.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