[PATCH 13/33] qemu: Drop qemuDomainSetSCSIControllerModel()
It only has a single caller.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/qemu/qemu_domain.c | 4 +++-
src/qemu/qemu_domain_address.c | 25 -------------------------
src/qemu/qemu_domain_address.h | 4 ----
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9289c1fa18..48d721a809 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5584,7 +5584,9 @@ qemuDomainControllerDefPostParse(virDomainControllerDef *cont,
switch (cont->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
/* Set the default SCSI controller model if not already set */
- if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0)
+ cont->model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps);
+
+ if (cont->model < 0)
return -1;
break;
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 22af903b6a..0a7273dc07 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -74,31 +74,6 @@ qemuDomainGetSCSIControllerModel(const virDomainDef *def,
}
-/**
- * @def: Domain definition
- * @cont: Domain controller def
- * @qemuCaps: qemu capabilities
- *
- * Set the controller model based on the existing value and the
- * capabilities if possible.
- *
- * Returns 0 on success, -1 on failure with error set.
- */
-int
-qemuDomainSetSCSIControllerModel(const virDomainDef *def,
- virDomainControllerDef *cont,
- virQEMUCaps *qemuCaps)
-{
- int model = qemuDomainGetSCSIControllerModel(def, cont, qemuCaps);
-
- if (model < 0)
- return -1;
-
- cont->model = model;
- return 0;
-}
-
-
static int
qemuDomainAssignVirtioSerialAddresses(virDomainDef *def)
{
diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h
index a571312469..0ac6285f2e 100644
--- a/src/qemu/qemu_domain_address.h
+++ b/src/qemu/qemu_domain_address.h
@@ -28,10 +28,6 @@ int qemuDomainGetSCSIControllerModel(const virDomainDef *def,
const virDomainControllerDef *cont,
virQEMUCaps *qemuCaps);
-int qemuDomainSetSCSIControllerModel(const virDomainDef *def,
- virDomainControllerDef *cont,
- virQEMUCaps *qemuCaps);
-
int qemuDomainAssignAddresses(virDomainDef *def,
virQEMUCaps *qemuCaps,
virQEMUDriver *driver,
--
2.43.0