[libvirt] [PATCH] Error out on an address for isa-serial in QEMU driver.

Martin Kletzander mkletzan at redhat.com
Mon Mar 9 13:11:55 UTC 2015


On Wed, Mar 04, 2015 at 09:07:32AM +0100, Ján Tomko wrote:
>We've never formatted them on the qemu command line.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1164053
>---
> src/qemu/qemu_command.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>

ACK

>diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>index c112619..e7b8c66 100644
>--- a/src/qemu/qemu_command.c
>+++ b/src/qemu/qemu_command.c
>@@ -10409,7 +10409,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"));
>@@ -10425,6 +10426,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;
>         }
>     }
>
>--
>2.0.5
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150309/b14dba14/attachment-0001.sig>


More information about the libvir-list mailing list