The (now assumed) QEMU_CAPS_CHARDEV_SPICEVMC is preferred.
Signed-off-by: Ján Tomko
---
src/qemu/qemu_capabilities.c | 4 --
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 71
tests/qemuxml2argvdata/channel-spicevmc-old.args | 30 --
tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35
tests/qemuxml2argvtest.c | 4 --
6 files changed, 25 insertions(+), 121 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args
delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d123dfcef3..fca73cf9b1 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1025,7 +1025,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI },
{ "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI },
{ "megasas", QEMU_CAPS_SCSI_MEGASAS },
-{ "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC },
{ "qxl", QEMU_CAPS_DEVICE_QXL },
{ "sga", QEMU_CAPS_SGA },
{ "scsi-block", QEMU_CAPS_SCSI_BLOCK },
@@ -2100,9 +2099,6 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
virStringListFreeCount(values, nvalues);
}
-/* Prefer -chardev spicevmc (detected earlier) over -device spicevmc */
-virQEMUCapsClear(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC);
-
return 0;
}
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7a859cb2cc..83b2980180 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -127,7 +127,7 @@ typedef enum {
/* 55 */
QEMU_CAPS_CCID_PASSTHRU, /* -device ccid-card-passthru */
X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */
-QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/
+X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/
QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c00f2c431f..03592a20ab 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5359,8 +5359,7 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager,
static char *
qemuBuildVirtioSerialPortDevStr(const virDomainDef *def,
-virDomainChrDefPtr dev,
-virQEMUCapsPtr qemuCaps)
+virDomainChrDefPtr dev)
{
virBuffer buf = VIR_BUFFER_INITIALIZER;
const char *contAlias;
@@ -5370,13 +5369,7 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def,
virBufferAddLit(&buf, "virtconsole");
break;
case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
-/* Legacy syntax '-device spicevmc' */
-if (dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC &&
-virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC)) {
-virBufferAddLit(&buf, "spicevmc");
-} else {
-virBufferAddLit(&buf, "virtserialport");
-}
+virBufferAddLit(&buf, "virtserialport");
break;
default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5414,19 +5407,13 @@ qemuBuildVirtioSerialPortDevStr(const virDomainDef *def,
goto error;
}
-if (!(dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
- dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC))) {
-virBufferAsprintf(&buf, ",chardev=char%s,id=%s",
- dev->info.alias, dev->info.alias);
-if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
-(dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC ||
- dev->target.name)) {
-virBufferAsprintf(&buf, ",name=%s", dev->target.name
- ? dev->target.name : "com.redhat.spice.0");
-}
-} else {
-virBufferAsprintf(&buf, ",id=%s", dev->info.alias);
+virBufferAsprintf(&buf, ",chardev=char%s,id=%s",
+ dev->info.alias, dev->info.alias);
+if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL &&
+(dev->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC ||
+ dev->target.name)) {
+virBufferAsprintf(&buf, ",name=%s", dev->target.name
+ ? dev->target.name : "com.redhat.spice.0");
}
if (virBufferCheckError(&buf) < 0)
goto error;
@@ -9147,23 +9134,15 @@ qemuBuildChannelsCommandLine(virLogManagerPtr
logManager,
break;
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO:
-if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPICEVMC) &&
-channel->source->type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) {
-/* spicevmc was
