[PATCH 07/38] qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument

Peter Krempa pkrempa at redhat.com
Mon Apr 19 12:35:11 UTC 2021


Signed-off-by: Peter Krempa <pkrempa at redhat.com>
Reviewed-by: Ján Tomko <jtomko at redhat.com>
Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
Reviewed-by: Neal Gompa <ngompa13 at gmail.com>
---
 src/qemu/qemu_alias.c   | 3 +--
 src/qemu/qemu_alias.h   | 1 -
 src/qemu/qemu_hotplug.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 695e150c43..98f0b90ca5 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -122,7 +122,6 @@ qemuAssignDeviceChrAlias(virDomainDef *def,

 int
 qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
-                                virQEMUCaps *qemuCaps G_GNUC_UNUSED,
                                 virDomainControllerDef *controller)
 {
     const char *prefix = virDomainControllerTypeToString(controller->type);
@@ -653,7 +652,7 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
             return -1;
     }
     for (i = 0; i < def->ncontrollers; i++) {
-        if (qemuAssignDeviceControllerAlias(def, qemuCaps, def->controllers[i]) < 0)
+        if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0)
             return -1;
     }
     for (i = 0; i < def->ninputs; i++) {
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 9161145a48..cfce05833d 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -32,7 +32,6 @@ int qemuAssignDeviceChrAlias(virDomainDef *def,
                              ssize_t idx);

 int qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
-                                    virQEMUCaps *qemuCaps,
                                     virDomainControllerDef *controller);

 int qemuAssignDeviceDiskAlias(virDomainDef *def,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 20c34ef104..2c91f0d6de 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -870,7 +870,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriver *driver,
     if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "controller") < 0)
         return -1;

-    if (qemuAssignDeviceControllerAlias(vm->def, priv->qemuCaps, controller) < 0)
+    if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0)
         goto cleanup;

     if (qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, &devstr) < 0)
-- 
2.30.2




More information about the libvir-list mailing list