[libvirt] [PATCH 04/12] qemu: domain: Rename qemuDomainStorageSourceChainAccessPrepare

Peter Krempa pkrempa at redhat.com
Thu Apr 18 14:42:59 UTC 2019


The function will be able to deal with non-chains too so drop 'Chain'
and also change the suffix to 'Modify' as it's used both for setup and
teardown.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 85e43027d5..b4c59b9a74 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9212,7 +9212,7 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,


 /**
- * qemuDomainStorageSourceChainAccessPrepare:
+ * qemuDomainStorageSourceAccessModify:
  * @driver: qemu driver struct
  * @vm: domain object
  * @src: Source to prepare
@@ -9225,10 +9225,10 @@ qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr disk,
  * Returns 0 on success and -1 on error. Reports libvirt error.
  */
 static int
-qemuDomainStorageSourceChainAccessPrepare(virQEMUDriverPtr driver,
-                                          virDomainObjPtr vm,
-                                          virStorageSourcePtr src,
-                                          bool teardown)
+qemuDomainStorageSourceAccessModify(virQEMUDriverPtr driver,
+                                    virDomainObjPtr vm,
+                                    virStorageSourcePtr src,
+                                    bool teardown)
 {
     VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver);
     const char *srcstr = NULLSTR(src->path);
@@ -9284,7 +9284,7 @@ qemuDomainStorageSourceChainAccessAllow(virQEMUDriverPtr driver,
                                         virDomainObjPtr vm,
                                         virStorageSourcePtr src)
 {
-    return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, false);
+    return qemuDomainStorageSourceAccessModify(driver, vm, src, false);
 }


@@ -9293,7 +9293,7 @@ qemuDomainStorageSourceChainAccessRevoke(virQEMUDriverPtr driver,
                                          virDomainObjPtr vm,
                                          virStorageSourcePtr src)
 {
-    return qemuDomainStorageSourceChainAccessPrepare(driver, vm, src, true);
+    return qemuDomainStorageSourceAccessModify(driver, vm, src, true);
 }


-- 
2.20.1




More information about the libvir-list mailing list