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 <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 202f2dfacab261bd08b34c97db7fbd1aea73527d..7658cc4d395ae8781fb4d71db4b952577fa360b7 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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 7a71aa107da0245bcf9a94b7bb67d42056fbc20d..cac4e8e76010a89f1aaca81df8b7cb06feddd45d 100644 (file)
--- 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