From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 14 Nov 2023 16:09:03 +0000 (+0100)
Subject: qemu: block: Remove unused qemuBlockStorageSourceDetachOneBlockdev
X-Git-Tag: v9.10.0-rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=734e4e9783bbb16582f398cbb246d973704d6486;p=thirdparty%2Flibvirt.git

qemu: block: Remove unused qemuBlockStorageSourceDetachOneBlockdev

The only caller was converted to use the common blockdev infrastructure
thus this function is no longer needed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 8b73d93962..7e9daf0bdc 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1942,40 +1942,6 @@ qemuBlockStorageSourceChainDetach(qemuMonitor *mon,
 }
 
 
-/**
- * qemuBlockStorageSourceDetachOneBlockdev:
- * @driver: qemu driver object
- * @vm: domain object
- * @asyncJob: currently running async job
- * @src: storage source to detach
- *
- * Detaches one virStorageSource using blockdev-del. Note that this does not
- * detach any authentication/encryption objects. This function enters the
- * monitor internally.
- */
-int
-qemuBlockStorageSourceDetachOneBlockdev(virDomainObj *vm,
-                                        virDomainAsyncJob asyncJob,
-                                        virStorageSource *src)
-{
-    int ret;
-
-    if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
-        return -1;
-
-    ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm),
-                                 qemuBlockStorageSourceGetFormatNodename(src));
-
-    if (ret == 0)
-        ret = qemuMonitorBlockdevDel(qemuDomainGetMonitor(vm),
-                                     qemuBlockStorageSourceGetStorageNodename(src));
-
-    qemuDomainObjExitMonitor(vm);
-
-    return ret;
-}
-
-
 int
 qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
                              virDomainDiskDef *disk,
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index f37e10216c..0eab0d822c 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -149,11 +149,6 @@ void
 qemuBlockStorageSourceAttachRollback(qemuMonitor *mon,
                                      qemuBlockStorageSourceAttachData *data);
 
-int
-qemuBlockStorageSourceDetachOneBlockdev(virDomainObj *vm,
-                                        virDomainAsyncJob asyncJob,
-                                        virStorageSource *src);
-
 struct _qemuBlockStorageSourceChainData {
     qemuBlockStorageSourceAttachData **srcdata;
     size_t nsrcdata;