From 69b894dc0410a09f1a8da37d3b67e8b3fe937181 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 13 Feb 2024 19:28:09 +0100 Subject: [PATCH] qemu: Improve error message for USB controller validation Use the same wording as for SCSI controllers, which also happens to contain additional information (the controller's index). The new error message and error type are more accurate anyway: in most cases, it's perfectly fine for the user not to provide a controller model explicitly, as libvirt will try to figure out a reasonable default. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 5 +++-- ...b-controller-default-unavailable-g3beige.ppc64-latest.err | 2 +- ...b-controller-default-unavailable-i440fx.x86_64-latest.err | 2 +- ...usb-controller-default-unavailable-mac99.ppc64-latest.err | 2 +- ...sb-controller-default-unavailable-mac99ppc.ppc-latest.err | 2 +- ...-controller-default-unavailable-powernv9.ppc64-latest.err | 2 +- ...b-controller-default-unavailable-pseries.ppc64-latest.err | 2 +- .../usb-controller-default-unavailable-q35.x86_64-latest.err | 2 +- ...-default-unavailable-versatilepb-armv7l.armv7l-latest.err | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 202f2dfaca..7658cc4d39 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2581,8 +2581,9 @@ qemuValidateDomainDeviceDefControllerUSB(const virDomainControllerDef *def, virQEMUCaps *qemuCaps) { if (def->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("no model provided for USB controller")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to determine model for USB controller idx=%1$d"), + def->idx); return -1; } diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-g3beige.ppc64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-i440fx.x86_64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99.ppc64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-mac99ppc.ppc-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-powernv9.ppc64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-pseries.ppc64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-q35.x86_64-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 diff --git a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.err b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.err index 7a71aa107d..cac4e8e760 100644 --- a/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.err +++ b/tests/qemuxmlconfdata/usb-controller-default-unavailable-versatilepb-armv7l.armv7l-latest.err @@ -1 +1 @@ -unsupported configuration: no model provided for USB controller +internal error: Unable to determine model for USB controller idx=0 -- 2.47.3