ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Block patches 2018-03-01 

Coverity fixes for nvme://
 -----BEGIN PGP SIGNATURE-----
 
 iQFEBAABCAAuFiEEUAN8t5cGD3bwIa1WyjViTGqRccYFAlqXqqgQHGZhbXpAcmVk
 aGF0LmNvbQAKCRDKNWJMapFxxgwdB/92oB2DXOAIatBVUQyJqHWTDw2f6/bFRLzi
 dKKDYfdvjk0ENuPc/kEv0KdjK+1lOb8XJxnYAHjo6t/jKWII5jDv0kWouNwJZi7d
 V9WOsULOqZqSmy+4CbUwVB6ZXBv/L6wo1JDpaaxM+bsyxGkhO4rzMxVjJ7dq1I7A
 X5O1tR6LNvBS76gnhrrat9Zm1JDKWSvRc1fx9OYV4cS2JNsqKVrAj/FSRYwm2F9d
 xtFOyTyBoCO3n6b8d1EFHUHl2w0zO5efh9ATqMJ3GbfVaKNGZCXRHZf3jNg5aXRu
 VZ2/iC4Uy6BAO/YlSGPOv3qPBcH0Y/8gK7WD2zkpnoSpkWP7RGP2
 =5oPh
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-03-01 12:32:31 +00:00
parent 2963d78204 78d8c99e29
commit 8cb340c613
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/nvme.c
View File

@ -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);
qemu_vfio_pci_unmap_bar(s->vfio, 0, (void *)s->regs, 0, NVME_BAR_SIZE);
qemu_vfio_close(s->vfio);
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;
}

2
util/vfio-helpers.c
View File

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