From 7cb923a5d76d710401399990f8f395770d62c0f7 Mon Sep 17 00:00:00 2001
Message-Id: <7cb923a5d76d710401399990f8f395770d62c0f7@dist-git>
From: Cole Robinson <crobinso@redhat.com>
Date: Tue, 11 Jul 2017 10:57:41 +0200
Subject: [PATCH] qemu: command: Remove old style -parallel building
AFAIK there aren't any qemu arch/machine types with platform parallel
devices that would require old style -parallel config, so we shouldn't
ever need this nowadays.
Remove a now redundant test
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
(cherry picked from commit ca5c5b997b348e650a086965c5e975c7101ee40e)
Conflicts:
* src/qemu/qemu_command.c:
caused by fcd922427cf6a264d3cb89915481be6594e6df03 not being
in the tree; resolved by removing the chardevStdioLogd argument
from the call to qemuBuildChrChardevStr();
* tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args,
* tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml:
caused by e6e26a899df05e3c1b36c40eef5ba0a4b1e36f95 not being
in the tree; resolved by removing the files regardless of their
contents.
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1435681
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
src/qemu/qemu_command.c | 31 +++++++------------
.../qemuxml2argv-parallel-tcp.args | 22 --------------
.../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 35 ----------------------
tests/qemuxml2argvtest.c | 1 -
tests/qemuxml2xmltest.c | 1 -
5 files changed, 11 insertions(+), 79 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e3be487d20..f3a9466083 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9243,27 +9243,18 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager,
virDomainChrDefPtr parallel = def->parallels[i];
char *devstr;
- /* Use -chardev with -device if they are available */
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) {
- if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def,
- parallel->source,
- parallel->info.alias,
- qemuCaps, true)))
- return -1;
- virCommandAddArg(cmd, "-chardev");
- virCommandAddArg(cmd, devstr);
- VIR_FREE(devstr);
+ if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def,
+ parallel->source,
+ parallel->info.alias,
+ qemuCaps, true)))
+ return -1;
+ virCommandAddArg(cmd, "-chardev");
+ virCommandAddArg(cmd, devstr);
+ VIR_FREE(devstr);
- if (qemuBuildChrDeviceCommandLine(cmd, def, parallel,
- qemuCaps) < 0)
- return -1;
- } else {
- virCommandAddArg(cmd, "-parallel");
- if (!(devstr = qemuBuildChrArgStr(parallel->source, NULL)))
- return -1;
- virCommandAddArg(cmd, devstr);
- VIR_FREE(devstr);
- }
+ if (qemuBuildChrDeviceCommandLine(cmd, def, parallel,
+ qemuCaps) < 0)
+ return -1;
}
return 0;
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
deleted file mode 100644
index fab1167c15..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args
+++ /dev/null
@@ -1,22 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu \
--name QEMUGuest1 \
--S \
--M pc \
--m 214 \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
--nodefaults \
--monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--parallel tcp:127.0.0.1:9999,server,nowait
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
deleted file mode 100644
index 99d2110b21..0000000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory unit='KiB'>219100</memory>
- <currentMemory unit='KiB'>219100</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <parallel type='tcp'>
- <source mode='bind' host='127.0.0.1' service='9999'/>
- <protocol type='raw'/>
- <target port='0'/>
- </parallel>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f47d282e31..3e029224dc 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1194,7 +1194,6 @@ mymain(void)
QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT);
DO_TEST("serial-spiceport-nospice", NONE);
- DO_TEST("parallel-tcp", NONE);
DO_TEST("console-compat", NONE);
DO_TEST("console-compat-auto", NONE);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 95bb154400..fe4fd6afa2 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -549,7 +549,6 @@ mymain(void)
DO_TEST("serial-many", NONE);
DO_TEST("serial-spiceport", NONE);
DO_TEST("serial-spiceport-nospice", NONE);
- DO_TEST("parallel-tcp", NONE);
DO_TEST("console-compat", NONE);
DO_TEST("console-compat2", NONE);
DO_TEST("console-virtio-many", NONE);
--
2.13.3