External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-03 18:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Require QEMU_CAPS_DEVICE_ISA_SERIAL for isa-serial

Browse Source 
We should make sure the isa-serial device is available before
formatting it on the QEMU command line.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Andrea Bolognani 2017-11-26 17:35:28 +01:00
parent b0f1c291a0
commit b9be657b68
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_command.c
View File

@ -9227,6 +9227,8 @@ static virQEMUCapsFlags
qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel) qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel)
{ {
switch (targetModel) { switch (targetModel) {
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
return QEMU_CAPS_DEVICE_ISA_SERIAL;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:
return QEMU_CAPS_DEVICE_USB_SERIAL; return QEMU_CAPS_DEVICE_USB_SERIAL;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:
@ -9237,7 +9239,6 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel)
return QEMU_CAPS_DEVICE_SCLPCONSOLE; return QEMU_CAPS_DEVICE_SCLPCONSOLE;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE:
return QEMU_CAPS_DEVICE_SCLPLMCONSOLE; return QEMU_CAPS_DEVICE_SCLPLMCONSOLE;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:
@ -10385,6 +10386,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
virQEMUCapsFlags caps; virQEMUCapsFlags caps;
switch ((virDomainChrSerialTargetModel) serial->targetModel) { switch ((virDomainChrSerialTargetModel) serial->targetModel) {
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY:
@ -10401,9 +10403,6 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
} }
break; break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL:
break;
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE:
case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST:

29
tests/qemuxml2argvtest.c
View File

@ -771,6 +771,7 @@ mymain(void)
DO_TEST_FAILURE("reboot-timeout-enabled", NONE); DO_TEST_FAILURE("reboot-timeout-enabled", NONE);
DO_TEST("bios", DO_TEST("bios",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_SGA); QEMU_CAPS_SGA);
DO_TEST("bios-nvram", NONE); DO_TEST("bios-nvram", NONE);
DO_TEST("bios-nvram-secure", DO_TEST("bios-nvram-secure",
@ -814,6 +815,7 @@ mymain(void)
QEMU_CAPS_SPICE, QEMU_CAPS_SPICE,
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_DUPLEX,
QEMU_CAPS_USB_HUB, QEMU_CAPS_USB_HUB,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA); QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("eoi-disabled", NONE); DO_TEST("eoi-disabled", NONE);
DO_TEST("eoi-enabled", NONE); DO_TEST("eoi-enabled", NONE);
@ -1231,48 +1233,64 @@ mymain(void)
DO_TEST("serial-file-log", DO_TEST("serial-file-log",
QEMU_CAPS_CHARDEV_FILE_APPEND, QEMU_CAPS_CHARDEV_FILE_APPEND,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_LOGFILE); QEMU_CAPS_CHARDEV_LOGFILE);
DO_TEST("serial-spiceport", DO_TEST("serial-spiceport",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_SPICE, QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_SPICEPORT); QEMU_CAPS_CHARDEV_SPICEPORT);
DO_TEST("serial-spiceport-nospice", NONE); DO_TEST("serial-spiceport-nospice", NONE);
DO_TEST("console-compat", NONE); DO_TEST("console-compat",
DO_TEST("console-compat-auto", NONE); QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("console-compat-auto",
QEMU_CAPS_DEVICE_ISA_SERIAL);
DO_TEST("serial-vc-chardev", DO_TEST("serial-vc-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-pty-chardev", DO_TEST("serial-pty-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-dev-chardev", DO_TEST("serial-dev-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-dev-chardev-iobase", DO_TEST("serial-dev-chardev-iobase",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-file-chardev", DO_TEST("serial-file-chardev",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_FILE_APPEND); QEMU_CAPS_CHARDEV_FILE_APPEND);
DO_TEST("serial-unix-chardev", DO_TEST("serial-unix-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-tcp-chardev", DO_TEST("serial-tcp-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-udp-chardev", DO_TEST("serial-udp-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("serial-tcp-telnet-chardev", DO_TEST("serial-tcp-telnet-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
driver.config->chardevTLS = 1; driver.config->chardevTLS = 1;
DO_TEST("serial-tcp-tlsx509-chardev", DO_TEST("serial-tcp-tlsx509-chardev",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509); QEMU_CAPS_OBJECT_TLS_CREDS_X509);
driver.config->chardevTLSx509verify = 1; driver.config->chardevTLSx509verify = 1;
DO_TEST("serial-tcp-tlsx509-chardev-verify", DO_TEST("serial-tcp-tlsx509-chardev-verify",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509); QEMU_CAPS_OBJECT_TLS_CREDS_X509);
driver.config->chardevTLSx509verify = 0; driver.config->chardevTLSx509verify = 0;
DO_TEST("serial-tcp-tlsx509-chardev-notls", DO_TEST("serial-tcp-tlsx509-chardev-notls",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509); QEMU_CAPS_OBJECT_TLS_CREDS_X509);
VIR_FREE(driver.config->chardevTLSx509certdir); VIR_FREE(driver.config->chardevTLSx509certdir);
if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0) if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509certdir, "/etc/pki/libvirt-chardev") < 0)
@ -1284,22 +1302,26 @@ mymain(void)
DO_TEST("serial-tcp-tlsx509-secret-chardev", DO_TEST("serial-tcp-tlsx509-secret-chardev",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509); QEMU_CAPS_OBJECT_TLS_CREDS_X509);
# else # else
DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev", DO_TEST_FAILURE("serial-tcp-tlsx509-secret-chardev",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_OBJECT_TLS_CREDS_X509); QEMU_CAPS_OBJECT_TLS_CREDS_X509);
# endif # endif
driver.config->chardevTLS = 0; driver.config->chardevTLS = 0;
VIR_FREE(driver.config->chardevTLSx509certdir); VIR_FREE(driver.config->chardevTLSx509certdir);
DO_TEST("serial-many-chardev", DO_TEST("serial-many-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("parallel-tcp-chardev", DO_TEST("parallel-tcp-chardev",
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("parallel-parport-chardev", DO_TEST("parallel-parport-chardev",
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("console-compat-chardev", DO_TEST("console-compat-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("pci-serial-dev-chardev", DO_TEST("pci-serial-dev-chardev",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
@ -1320,6 +1342,7 @@ mymain(void)
DO_TEST("console-virtio", DO_TEST("console-virtio",
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("console-virtio-many", DO_TEST("console-virtio-many",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_NODEFCONFIG); QEMU_CAPS_NODEFCONFIG);
DO_TEST("console-virtio-s390", DO_TEST("console-virtio-s390",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
@ -2312,6 +2335,7 @@ mymain(void)
QEMU_CAPS_CHARDEV_SPICEVMC, QEMU_CAPS_CHARDEV_SPICEVMC,
QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL,
QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_DUPLEX,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_USB_REDIR); QEMU_CAPS_USB_REDIR);
/* Test automatic and manual setting of pcie-root-port attributes */ /* Test automatic and manual setting of pcie-root-port attributes */
@ -2916,6 +2940,7 @@ mymain(void)
DO_TEST("user-aliases", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_CIRRUS_VGA, DO_TEST("user-aliases", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_PIIX_DISABLE_S3,
QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VNC, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_HDA_DUPLEX); QEMU_CAPS_HDA_DUPLEX);
DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI);