This makes the signature consistent with that of other
qemuValidateDomainDeviceDefController*() functions, which
are passed a virDomainDef along with the existing
virDomainControllerDef. Later changes to this function
will require access to the additional data structure.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/qemu/qemu_command.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e57bbc3d9a..f48165f75c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2588,29 +2588,29 @@ qemuControllerModelUSBToCaps(int model)
 
 
 static int
-qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def,
+qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *controller,
                                          virQEMUCaps *qemuCaps)
 {
-    if (def->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) {
+    if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to determine model for USB controller idx=%1$d"),
-                       def->idx);
+                       controller->idx);
         return -1;
     }
 
-    if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(def->model))) {
+    if (!virQEMUCapsGet(qemuCaps, qemuControllerModelUSBToCaps(controller->model))) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("USB controller model '%1$s' not supported in this QEMU binary"),
-                       virDomainControllerModelUSBTypeToString(def->model));
+                       virDomainControllerModelUSBTypeToString(controller->model));
         return -1;
     }
 
-    if (def->opts.usbopts.ports != -1) {
-        if (def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI &&
-            def->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) {
+    if (controller->opts.usbopts.ports != -1) {
+        if (controller->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI &&
+            controller->model != VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("usb controller type '%1$s' doesn't support 'ports' with this QEMU binary"),
-                           virDomainControllerModelUSBTypeToString(def->model));
+                           virDomainControllerModelUSBTypeToString(controller->model));
             return -1;
         }
     }
-- 
2.51.0

On Thu, Sep 25, 2025 at 20:07:10 +0200, Andrea Bolognani via Devel wrote:
> This makes the signature consistent with that of other
> qemuValidateDomainDeviceDefController*() functions, which
> are passed a virDomainDef along with the existing
> virDomainControllerDef. Later changes to this function
> will require access to the additional data structure.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  src/qemu/qemu_command.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)

Reviewed-by: Peter Krempa <pkrempa@redhat.com>