]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Error out on an address for isa-serial in QEMU driver.
authorJán Tomko <jtomko@redhat.com>
Wed, 4 Mar 2015 07:58:02 +0000 (08:58 +0100)
committerJán Tomko <jtomko@redhat.com>
Thu, 12 Mar 2015 08:13:31 +0000 (09:13 +0100)
We've never formatted them on the qemu command line.

https://bugzilla.redhat.com/show_bug.cgi?id=1164053

src/qemu/qemu_command.c

index 5fbc62dbe76f28d1d0b3a2ee47df9435dbdae0b7..5303de5eb89a3529c4709a183573cc52c08719c9 100644 (file)
@@ -10533,7 +10533,8 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
                           virDomainChrSerialTargetTypeToString(serial->targetType),
                           serial->info.alias, serial->info.alias);
 
-        if (serial->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) {
+        switch (serial->targetType) {
+        case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB:
             if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_USB_SERIAL)) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                                _("usb-serial is not supported in this QEMU binary"));
@@ -10549,6 +10550,15 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
 
             if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0)
                 goto error;
+            break;
+
+        case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA:
+            if (serial->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("no addresses are suported for isa-serial"));
+                goto error;
+            }
+            break;
         }
     }