diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52df21e283e74709f68d80cbef725c1f6ce62d1a..bcb0cf0bfb53b9b9d7b706fb8e032781b4fc0d20 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13712,15 +13712,10 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, for (i = 0; i < def->ndisks; i++) { virDomainSnapshotDiskDefPtr disk = &def->disks[i]; virDomainDiskDefPtr dom_disk = vm->def->disks[i]; - qemuDomainDiskPrivatePtr dom_diskPriv = QEMU_DOMAIN_DISK_PRIVATE(dom_disk); if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE && - dom_diskPriv->blockjob) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk '%s' has an active block job"), - disk->name); + qemuDomainDiskBlockJobIsActive(dom_disk)) goto cleanup; - } switch ((virDomainSnapshotLocation) disk->snapshot) { case VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7d050739ad53ddde8196e74b8c62ed400cebe9dd..e1c3de7b3a306eca7426867929f38cea0f756815 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3444,12 +3444,8 @@ qemuDomainDetachDiskDevice(virQEMUDriverPtr driver, int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - if (detach->mirror) { - virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, - _("disk '%s' is in an active block job"), - detach->dst); + if (qemuDomainDiskBlockJobIsActive(detach)) goto cleanup; - } qemuDomainMarkDeviceForRemoval(vm, &detach->info);