From a00e5c662b437e11f9b375c8870f4b556bce2623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 4 Mar 2015 08:58:02 +0100 Subject: [PATCH] Error out on an address for isa-serial in QEMU driver. 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(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5fbc62dbe7..5303de5eb8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -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; } } -- GitLab