External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Refactor access to 'qomName' field of the qemu disk private data

Browse Source 
The code which fills 'qomName' does so only when the blockdev capability
is enabled so we don't have to check it separately as it can be only
non-NULL when blockdev is used.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-20 20:08:37 +02:00
parent 5998381b08
commit 31556cf167
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_driver.c
View File

@ -10085,17 +10085,16 @@ qemuDomainBlocksStatsGather(virDomainObj *vm,
return -1; return -1;
} }
if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName)
entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
} else { else
if (!disk->info.alias) { entryname = disk->info.alias;
if (!entryname) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("missing disk device alias name for %s"), disk->dst); _("missing disk device alias name for %s"), disk->dst);
return -1; return -1;
} }
entryname = disk->info.alias;
}
} }
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitor(vm);
@ -10146,7 +10145,7 @@ qemuDomainBlocksStatsGather(virDomainObj *vm,
if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER)
continue; continue;
if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName)
entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
if (!entryname) if (!entryname)
@ -16253,8 +16252,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
goto endjob; goto endjob;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
} else { } else {
if (!(drivealias = qemuAliasDiskDriveFromDisk(disk))) if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
@ -16437,8 +16435,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src)) if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
goto endjob; goto endjob;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
} else { } else {
if (!(drivealias = qemuAliasDiskDriveFromDisk(disk))) if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
@ -16536,7 +16533,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
virDomainObj *vm = NULL; virDomainObj *vm = NULL;
qemuDomainObjPrivate *priv; qemuDomainObjPrivate *priv;
g_autoptr(GHashTable) table = NULL; g_autoptr(GHashTable) table = NULL;
bool blockdev = false;
int ret = -1; int ret = -1;
size_t i; size_t i;
int n = 0; int n = 0;
@ -16547,7 +16543,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
goto cleanup; goto cleanup;
priv = vm->privateData; priv = vm->privateData;
blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
@ -16575,7 +16570,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
const char *entryname = disk->info.alias; const char *entryname = disk->info.alias;
if (blockdev && diskPriv->qomName) if (diskPriv->qomName)
entryname = diskPriv->qomName; entryname = diskPriv->qomName;
if ((info = virHashLookup(table, entryname)) && if ((info = virHashLookup(table, entryname)) &&
@ -18430,7 +18425,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
/* for 'sd' disks we won't be displaying stats for the backing chain /* for 'sd' disks we won't be displaying stats for the backing chain
* as we don't update the stats correctly */ * as we don't update the stats correctly */
if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) { if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
frontendalias = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName; frontendalias = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
backendalias = n->nodeformat; backendalias = n->nodeformat;
backendstoragealias = n->nodestorage; backendstoragealias = n->nodestorage;

3
src/qemu/qemu_process.c
View File

@ -8573,7 +8573,6 @@ qemuProcessRefreshDisks(virDomainObj *vm,
virDomainAsyncJob asyncJob) virDomainAsyncJob asyncJob)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
g_autoptr(GHashTable) table = NULL; g_autoptr(GHashTable) table = NULL;
size_t i; size_t i;
@ -8591,7 +8590,7 @@ qemuProcessRefreshDisks(virDomainObj *vm,
struct qemuDomainDiskInfo *info; struct qemuDomainDiskInfo *info;
const char *entryname = disk->info.alias; const char *entryname = disk->info.alias;
if (blockdev && diskpriv->qomName) if (diskpriv->qomName)
entryname = diskpriv->qomName; entryname = diskpriv->qomName;
if (!(info = virHashLookup(table, entryname))) if (!(info = virHashLookup(table, entryname)))