From 49510e4191d96b82751e2b6792c2c0f3bd3fa627 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 26 Jun 2018 18:15:09 +0200 Subject: [PATCH] qemu: Use QOM path with query-block when using -blockdev MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Switch to using the QOM/qdev handles in all calls to qemuMonitorGetBlockInfo when using -blockdev. The callers also need to make sure to use the correct handle afterwards to extract the data. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 9 ++++++++- src/qemu/qemu_process.c | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16f8f9ec00..69fea8211f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18722,6 +18722,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, virDomainObjPtr vm = NULL; qemuDomainObjPrivatePtr priv; virHashTablePtr table = NULL; + bool blockdev = false; int ret = -1; size_t i; int n = 0; @@ -18732,6 +18733,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, goto cleanup; priv = vm->privateData; + blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -18757,8 +18759,13 @@ qemuDomainGetDiskErrors(virDomainPtr dom, for (i = n = 0; i < vm->def->ndisks; i++) { struct qemuDomainDiskInfo *info; virDomainDiskDefPtr disk = vm->def->disks[i]; + qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + const char *entryname = disk->info.alias; + + if (blockdev) + entryname = diskPriv->qomName; - if ((info = virHashLookup(table, disk->info.alias)) && + if ((info = virHashLookup(table, entryname)) && info->io_status != VIR_DOMAIN_DISK_ERROR_NONE) { if (n == nerrors) break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b2dddb6475..b899eed143 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7591,6 +7591,7 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; + bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); virHashTablePtr table = NULL; int ret = -1; size_t i; @@ -7608,8 +7609,12 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver, virDomainDiskDefPtr disk = vm->def->disks[i]; qemuDomainDiskPrivatePtr diskpriv = QEMU_DOMAIN_DISK_PRIVATE(disk); struct qemuDomainDiskInfo *info; + const char *entryname = disk->info.alias; + + if (blockdev) + entryname = diskpriv->qomName; - if (!(info = virHashLookup(table, disk->info.alias))) + if (!(info = virHashLookup(table, entryname))) continue; if (info->removable) { -- 2.47.2