Commit 8c43812b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael S. Tsirkin
Browse files

Revert "contrib/vhost-user-blk: fix the compilation issue" 



Commit a56de056 squashed the following two unrelated commits
at once:

- "contrib/vhost-user-blk: fix the compilation issue"
  (Message-Id: 1547615970-23545-2-git-send-email-changpeng.liu@intel.com)
- "i386/kvm: ignore masked irqs when update msi routes"
  (Message-Id: 20190116030815.27273-5-peterx@redhat.com)

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: default avatarPeter Xu <peterx@redhat.com>
Fixes: a56de056
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190212140621.17009-2-philmd@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
parent f60f5e80

contrib/vhost-user-blk/vhost-user-blk.c

+1 −5
Original line number Diff line number Diff line
@@ -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

target/i386/kvm.c

+3 −11
Original line number Diff line number Diff line
@@ -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);