Commit a56de056 authored by Peter Xu's avatar Peter Xu Committed by Michael S. Tsirkin
Browse files

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



Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent afa26ecc

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

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#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;
@@ -454,7 +458,7 @@ vub_get_blocksize(int fd) 


#if defined(__linux__) && defined(BLKSSZGET)

    if (ioctl(fd, BLKSSZGET, &blocksize) == 0) {

        return blocklen;

        return blocksize;

    }

#endif

target/i386/kvm.c

+11 −3
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;

    int cnt = 0, vector;

    MSIRouteEntry *entry;

    MSIMessage msg;

    PCIDevice *dev;
@@ -3902,11 +3902,19 @@ 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) && !msi_enabled(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.

             */

            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);