External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: rename QEMU_CAPS_SCLP_S390 to QEMU_CAPS_DEVICE_SCLPCONSOLE

Browse Source 
Give a better name to the capability for the sclpconsole device.

Signed-off-by: Pino Toscano <ptoscano@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Pino Toscano 2017-11-15 18:05:44 +01:00 committed by Andrea Bolognani
parent 87eabeb17d
commit 98b55862ef
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View File

@ -1598,7 +1598,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "ich9-ahci", QEMU_CAPS_ICH9_AHCI }, { "ich9-ahci", QEMU_CAPS_ICH9_AHCI },
{ "virtio-blk-s390", QEMU_CAPS_VIRTIO_S390 }, { "virtio-blk-s390", QEMU_CAPS_VIRTIO_S390 },
{ "virtio-blk-ccw", QEMU_CAPS_VIRTIO_CCW }, { "virtio-blk-ccw", QEMU_CAPS_VIRTIO_CCW },
{ "sclpconsole", QEMU_CAPS_SCLP_S390 }, { "sclpconsole", QEMU_CAPS_DEVICE_SCLPCONSOLE },
{ "lsi53c895a", QEMU_CAPS_SCSI_LSI }, { "lsi53c895a", QEMU_CAPS_SCSI_LSI },
{ "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI },
{ "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI }, { "virtio-scsi-s390", QEMU_CAPS_VIRTIO_SCSI },

2
src/qemu/qemu_capabilities.h
View File

@ -220,7 +220,7 @@ typedef enum {
QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */ QEMU_CAPS_DEVICE_CIRRUS_VGA, /* -device cirrus-vga */
QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */ QEMU_CAPS_DEVICE_VMWARE_SVGA, /* -device vmware-svga */
QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */ QEMU_CAPS_DEVICE_VIDEO_PRIMARY, /* -device safe for primary video device */
QEMU_CAPS_SCLP_S390, /* -device sclp* */ QEMU_CAPS_DEVICE_SCLPCONSOLE, /* -device sclpconsole */
/* 125 */ /* 125 */
QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */

4
src/qemu/qemu_command.c
View File

@ -9308,9 +9308,9 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager,
switch (console->targetType) { switch (console->targetType) {
case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP:
case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCLP_S390)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCLPCONSOLE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("sclp console requires QEMU to support s390-sclp")); _("sclpconsole is not supported in this QEMU binary"));
return -1; return -1;
} }

2
tests/qemuxml2argvtest.c
View File

@ -1330,7 +1330,7 @@ mymain(void)
DO_TEST("console-sclp", DO_TEST("console-sclp",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_SCLP_S390); QEMU_CAPS_DEVICE_SCLPCONSOLE);
DO_TEST("channel-spicevmc", DO_TEST("channel-spicevmc",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_SPICE, QEMU_CAPS_SPICE,