From b732704f49ab46d31bd18b2fa370bdd6fbf39d21 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 9 Jun 2016 07:16:10 -0400
Subject: [PATCH] qemu: More usage of qemuDomainDiskBlockJobIsActive

qemuDomainDiskBlockJobIsActive already checks if a disk has a
blockjob, and if so, raises an error
---
 src/qemu/qemu_driver.c  | 7 +------
 src/qemu/qemu_hotplug.c | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 52df21e283..bcb0cf0bfb 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 7d050739ad..e1c3de7b3a 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);