From: Peter Krempa <pkrempa@redhat.com> Since it's currently called above the place where it is defined we also need to move it within qemu_process.c. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_process.c | 98 ++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 3 -- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c130483659..ba8bda0f99 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8639,6 +8639,55 @@ qemuProcessRefreshRxFilters(virDomainObj *vm, } +static int +qemuProcessRefreshDisks(virDomainObj *vm, + virDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivate *priv = vm->privateData; + virQEMUDriver *driver = priv->driver; + g_autoptr(GHashTable) table = NULL; + size_t i; + + if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) == 0) { + table = qemuMonitorGetBlockInfo(priv->mon); + qemuDomainObjExitMonitor(vm); + } + + if (!table) + return -1; + + for (i = 0; i < vm->def->ndisks; i++) { + virDomainDiskDef *disk = vm->def->disks[i]; + qemuDomainDiskPrivate *diskpriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + struct qemuDomainDiskInfo *info; + const char *entryname = disk->info.alias; + virDomainDiskTray old_tray_status = disk->tray_status; + + if (diskpriv->qomName) + entryname = diskpriv->qomName; + + if (!(info = virHashLookup(table, entryname))) + continue; + + qemuProcessRefreshDiskProps(disk, info); + + if (diskpriv->tray && + old_tray_status != disk->tray_status) { + virDomainEventTrayChangeReason reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN; + virObjectEvent *event; + + if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_CLOSED) + reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE; + + event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason); + virObjectEventStateQueue(driver->domainEventState, event); + } + } + + return 0; +} + + /** * qemuProcessRefreshState: * @driver: qemu driver data @@ -9556,55 +9605,6 @@ qemuProcessRefreshDiskProps(virDomainDiskDef *disk, } -int -qemuProcessRefreshDisks(virDomainObj *vm, - virDomainAsyncJob asyncJob) -{ - qemuDomainObjPrivate *priv = vm->privateData; - virQEMUDriver *driver = priv->driver; - g_autoptr(GHashTable) table = NULL; - size_t i; - - if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) == 0) { - table = qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitor(vm); - } - - if (!table) - return -1; - - for (i = 0; i < vm->def->ndisks; i++) { - virDomainDiskDef *disk = vm->def->disks[i]; - qemuDomainDiskPrivate *diskpriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - struct qemuDomainDiskInfo *info; - const char *entryname = disk->info.alias; - virDomainDiskTray old_tray_status = disk->tray_status; - - if (diskpriv->qomName) - entryname = diskpriv->qomName; - - if (!(info = virHashLookup(table, entryname))) - continue; - - qemuProcessRefreshDiskProps(disk, info); - - if (diskpriv->tray && - old_tray_status != disk->tray_status) { - virDomainEventTrayChangeReason reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN; - virObjectEvent *event; - - if (disk->tray_status == VIR_DOMAIN_DISK_TRAY_CLOSED) - reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE; - - event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason); - virObjectEventStateQueue(driver->domainEventState, event); - } - } - - return 0; -} - - static int qemuProcessRefreshCPUMigratability(virDomainObj *vm, virDomainAsyncJob asyncJob) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 426e11d79e..201b3ebb63 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -218,9 +218,6 @@ int qemuRefreshVirtioChannelState(virQEMUDriver *driver, int qemuProcessRefreshBalloonState(virDomainObj *vm, int asyncJob); -int qemuProcessRefreshDisks(virDomainObj *vm, - virDomainAsyncJob asyncJob); - int qemuProcessStartManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE; void qemuProcessKillManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE; -- 2.53.0