[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] Revert "contrib/vhost-user-blk: fix the compila
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 1/3] Revert "contrib/vhost-user-blk: fix the compilation issue" |
Date: |
Tue, 12 Feb 2019 15:06:19 +0100 |
Commit a56de056c91f8 squashed the following two unrelated commits
at once:
- "contrib/vhost-user-blk: fix the compilation issue"
(Message-Id: address@hidden)
- "i386/kvm: ignore masked irqs when update msi routes"
(Message-Id: address@hidden)
While the git history remains bisectable, having a commit that changes
MSI/MSIX code but describes it as "fix vhost-user-blk compilation" is
rather confusing.
Revert the offending commit to properly apply both patches separately.
Reported-by: Peter Xu <address@hidden>
Fixes: a56de056c91f8
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
contrib/vhost-user-blk/vhost-user-blk.c | 6 +-----
target/i386/kvm.c | 14 +++-----------
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c
b/contrib/vhost-user-blk/vhost-user-blk.c
index 43583f2659..5c2092e13a 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -20,10 +20,6 @@
#include "contrib/libvhost-user/libvhost-user-glib.h"
#include "contrib/libvhost-user/libvhost-user.h"
-#if defined(__linux__)
-#include <linux/fs.h>
-#include <sys/ioctl.h>
-#endif
struct virtio_blk_inhdr {
unsigned char status;
@@ -525,7 +521,7 @@ vub_get_blocksize(int fd)
#if defined(__linux__) && defined(BLKSSZGET)
if (ioctl(fd, BLKSSZGET, &blocksize) == 0) {
- return blocksize;
+ return blocklen;
}
#endif
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index beae1b99da..9af4542fb8 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -3894,7 +3894,7 @@ static QLIST_HEAD(, MSIRouteEntry) msi_route_list = \
static void kvm_update_msi_routes_all(void *private, bool global,
uint32_t index, uint32_t mask)
{
- int cnt = 0, vector;
+ int cnt = 0;
MSIRouteEntry *entry;
MSIMessage msg;
PCIDevice *dev;
@@ -3902,19 +3902,11 @@ static void kvm_update_msi_routes_all(void *private,
bool global,
/* TODO: explicit route update */
QLIST_FOREACH(entry, &msi_route_list, list) {
cnt++;
- vector = entry->vector;
dev = entry->dev;
- if (msix_enabled(dev) && !msix_is_masked(dev, vector)) {
- msg = msix_get_message(dev, vector);
- } else if (msi_enabled(dev) && !msi_is_masked(dev, vector)) {
- msg = msi_get_message(dev, vector);
- } else {
- /*
- * Either MSI/MSIX is disabled for the device, or the
- * specific message was masked out. Skip this one.
- */
+ if (!msix_enabled(dev) && !msi_enabled(dev)) {
continue;
}
+ msg = pci_get_msi_message(dev, entry->vector);
kvm_irqchip_update_msi_route(kvm_state, entry->virq, msg, dev);
}
kvm_irqchip_commit_routes(kvm_state);
--
2.20.1