qemu: Rename qemuDomainDefaultSCSIControllerModel()

The original name was qemuDomainGetSCSIControllerModel().

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0d2548d8d45ccef40e7c7d182d5bbc9318e9ae60..01617a5ba13540b59ae91b171ad9f1519263e7c8 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4243,9 +4243,9 @@ qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver,
  * Returns model on success, -1 on failure with error set.
  */
 int
-qemuDomainGetSCSIControllerModel(const virDomainDef *def,
-                                 const virDomainControllerDef *cont,
-                                 virQEMUCaps *qemuCaps)
+qemuDomainDefaultSCSIControllerModel(const virDomainDef *def,
+                                     const virDomainControllerDef *cont,
+                                     virQEMUCaps *qemuCaps)
 {
     if (cont->model > 0)
         return cont->model;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index c7287eb669f7103f2daa33f34a967c914f8cb1a9..751607c12b9d1b35a8f84af0bc317b8a96b63677 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -838,9 +838,9 @@ bool qemuDomainHasBuiltinESP(const virDomainDef *def);
 bool qemuDomainNeedsFDC(const virDomainDef *def);
 bool qemuDomainSupportsPCI(const virDomainDef *def);
 bool qemuDomainSupportsPCIMultibus(const virDomainDef *def);
-int qemuDomainGetSCSIControllerModel(const virDomainDef *def,
-                                     const virDomainControllerDef *cont,
-                                     virQEMUCaps *qemuCaps);
+int qemuDomainDefaultSCSIControllerModel(const virDomainDef *def,
+                                         const virDomainControllerDef *cont,
+                                         virQEMUCaps *qemuCaps);
 
 int qemuDomainDefAddDefaultAudioBackend(virQEMUDriver *driver,
                                         virDomainDef *def);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 67a2464ce4f65dadd6441d44dc591f9203437b27..df7c4f65bfc73df5f130774e6cd20d954b03e815 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -958,7 +958,7 @@ qemuDomainFindOrCreateSCSIDiskController(virDomainObj *vm,
     cont->idx = controller;
 
     if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT)
-        cont->model = qemuDomainGetSCSIControllerModel(vm->def, cont, priv->qemuCaps);
+        cont->model = qemuDomainDefaultSCSIControllerModel(vm->def, cont, priv->qemuCaps);
     else
         cont->model = model;
 

diff --git a/src/qemu/qemu_postparse.c b/src/qemu/qemu_postparse.c
index 7db378c5ce663212753e51bd1915c6fb21443c3b..119ea32a8504bf4886e816292c33ce5e7c02b0b7 100644 (file)
--- a/src/qemu/qemu_postparse.c
+++ b/src/qemu/qemu_postparse.c
@@ -344,7 +344,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDef *cont,
     switch (cont->type) {
     case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
         /* Set the default SCSI controller model if not already set */
-        cont->model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps);
+        cont->model = qemuDomainDefaultSCSIControllerModel(def, cont, qemuCaps);
 
         if (cont->model < 0)
             return -1;