]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Display nicer error message for unsupported chardev hotplug
authorJán Tomko <jtomko@redhat.com>
Mon, 10 Nov 2014 15:52:49 +0000 (16:52 +0100)
committerCole Robinson <crobinso@redhat.com>
Sat, 15 Nov 2014 21:02:09 +0000 (16:02 -0500)
Use the device type name if we know it instead of its number,
even if we can't hotplug it:
qemuMonitorJSONAttachCharDevCommand:6094 : operation failed: Unsupported
char device type '10'

(cherry picked from commit cce8e5f7395fef5fa782910bc4a6fc8a786f8bc2)

src/qemu/qemu_monitor_json.c

index b3b64510124001aad5ecdefd0f5777928f8bac93..d59166378f0b83e63fddc1fb2a84d70a4f2b2f6e 100644 (file)
@@ -5657,9 +5657,15 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID,
     case VIR_DOMAIN_CHR_TYPE_STDIO:
     case VIR_DOMAIN_CHR_TYPE_NMDM:
     case VIR_DOMAIN_CHR_TYPE_LAST:
-        virReportError(VIR_ERR_OPERATION_FAILED,
-                       _("Unsupported char device type '%d'"),
-                       chr->type);
+        if (virDomainChrTypeToString(chr->type)) {
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           _("Hotplug unsupported for char device type '%s'"),
+                           virDomainChrTypeToString(chr->type));
+        } else {
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           _("Hotplug unsupported for char device type '%d'"),
+                           chr->type);
+        }
         goto error;
     }