Commit 8cb340c6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging 



Block patches 2018-03-01

Coverity fixes for nvme://

# gpg: Signature made Thu 01 Mar 2018 07:24:24 GMT
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  block/nvme: fix Coverity reports

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2963d782 78d8c99e

block/nvme.c

+7 −3
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, 
    aio_set_event_notifier(bdrv_get_aio_context(bs), &s->irq_notifier,

                           false, nvme_handle_event, nvme_poll_cb);



    nvme_identify(bs, namespace, errp);

    nvme_identify(bs, namespace, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EIO;
@@ -666,8 +666,12 @@ fail_queue: 
    nvme_free_queue_pair(bs, s->queues[0]);

fail:

    g_free(s->queues);

    if (s->regs) {

        qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)s->regs, 0, NVME_BAR_SIZE);

    }

    if (s->vfio) {

        qemu_vfio_close(s->vfio);

    }

    event_notifier_cleanup(&s->irq_notifier);

    return ret;

}

util/vfio-helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static char *sysfs_find_group_file(const char *device, Error **errp) 
    char *path = NULL;



    sysfs_link = g_strdup_printf("/sys/bus/pci/devices/%s/iommu_group", device);

    sysfs_group = g_malloc(PATH_MAX);

    sysfs_group = g_malloc0(PATH_MAX);

    if (readlink(sysfs_link, sysfs_group, PATH_MAX - 1) == -1) {

        error_setg_errno(errp, errno, "Failed to find iommu group sysfs path");

        goto out;