|
 |
404507 |
From 77bc396146f85ba8f767fd51f0238037cb9784cc Mon Sep 17 00:00:00 2001
|
|
|
404507 |
Message-Id: <77bc396146f85ba8f767fd51f0238037cb9784cc@dist-git>
|
|
|
404507 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
404507 |
Date: Wed, 29 Nov 2017 16:22:59 +0100
|
|
|
404507 |
Subject: [PATCH] conf: Drop virDomainChrDeviceType.targetTypeAttr
|
|
|
404507 |
|
|
|
404507 |
This attribute was used to decide whether to format the type
|
|
|
404507 |
attribute of the <target> element, but the logic didn't take into
|
|
|
404507 |
account all possible cases and as such could lead to unexpected
|
|
|
404507 |
results. Moreover, it's one more thing to keep track of, and can
|
|
|
404507 |
easily fall out of sync with other attributes.
|
|
|
404507 |
|
|
|
404507 |
Now that we have VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE, we can
|
|
|
404507 |
use that value to signal that no specific target type has been
|
|
|
404507 |
configured for the serial device and as such the attribute should
|
|
|
404507 |
not be formatted at all. All other values are now formatted.
|
|
|
404507 |
|
|
|
404507 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
404507 |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
404507 |
(cherry picked from commit 4fb8ff9987b7e34d331c4af8f573db11579a0e88)
|
|
|
404507 |
|
|
|
404507 |
https://bugzilla.redhat.com/show_bug.cgi?id=1449265
|
|
|
404507 |
https://bugzilla.redhat.com/show_bug.cgi?id=1511421
|
|
|
404507 |
https://bugzilla.redhat.com/show_bug.cgi?id=1512929
|
|
|
404507 |
https://bugzilla.redhat.com/show_bug.cgi?id=1512934
|
|
|
404507 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
404507 |
---
|
|
|
404507 |
src/conf/domain_conf.c | 11 ++++-------
|
|
|
404507 |
src/conf/domain_conf.h | 1 -
|
|
|
404507 |
src/vz/vz_sdk.c | 3 +--
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml | 4 ++--
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 4 ++--
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 2 +-
|
|
|
404507 |
tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 2 +-
|
|
|
404507 |
.../qemuhotplug-console-compat-2-live+console-virtio.xml | 4 ++--
|
|
|
404507 |
.../qemuhotplug-console-compat-2-live.xml | 4 ++--
|
|
|
404507 |
.../qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 4 ++--
|
|
|
404507 |
tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 4 ++--
|
|
|
404507 |
.../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml | 4 ++--
|
|
|
404507 |
.../qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml | 4 ++--
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-pseries-cpu-compat-power9.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-pseries-panic-missing.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-pseries-panic-no-address.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-q35-virt-manager-basic.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-serial-spiceport-nospice.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml | 2 +-
|
|
|
404507 |
.../qemuxml2xmlout-serial-target-port-auto.xml | 6 +++---
|
|
|
404507 |
.../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 4 ++--
|
|
|
404507 |
.../qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml | 2 +-
|
|
|
404507 |
tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml | 2 +-
|
|
|
404507 |
43 files changed, 56 insertions(+), 61 deletions(-)
|
|
|
404507 |
|
|
|
404507 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
404507 |
index 3a5ecd3a9d..586a840672 100644
|
|
|
404507 |
--- a/src/conf/domain_conf.c
|
|
|
404507 |
+++ b/src/conf/domain_conf.c
|
|
|
404507 |
@@ -11499,8 +11499,7 @@ virDomainChrDefaultTargetType(int devtype)
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
static int
|
|
|
404507 |
-virDomainChrTargetTypeFromString(virDomainChrDefPtr def,
|
|
|
404507 |
- int devtype,
|
|
|
404507 |
+virDomainChrTargetTypeFromString(int devtype,
|
|
|
404507 |
const char *targetType)
|
|
|
404507 |
{
|
|
|
404507 |
int ret = -1;
|
|
|
404507 |
@@ -11528,8 +11527,6 @@ virDomainChrTargetTypeFromString(virDomainChrDefPtr def,
|
|
|
404507 |
break;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
- def->targetTypeAttr = true;
|
|
|
404507 |
-
|
|
|
404507 |
return ret;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
@@ -11546,7 +11543,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
|
|
|
404507 |
char *stateStr = NULL;
|
|
|
404507 |
|
|
|
404507 |
if ((def->targetType =
|
|
|
404507 |
- virDomainChrTargetTypeFromString(def, def->deviceType,
|
|
|
404507 |
+ virDomainChrTargetTypeFromString(def->deviceType,
|
|
|
404507 |
targetType)) < 0) {
|
|
|
404507 |
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
404507 |
_("unknown target type '%s' specified for character device"),
|
|
|
404507 |
@@ -16466,7 +16463,7 @@ virDomainChrEquals(virDomainChrDefPtr src,
|
|
|
404507 |
break;
|
|
|
404507 |
|
|
|
404507 |
case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
|
|
|
404507 |
- if (src->targetTypeAttr != tgt->targetTypeAttr)
|
|
|
404507 |
+ if (src->targetType != tgt->targetType)
|
|
|
404507 |
return false;
|
|
|
404507 |
|
|
|
404507 |
ATTRIBUTE_FALLTHROUGH;
|
|
|
404507 |
@@ -24026,7 +24023,7 @@ virDomainChrDefFormat(virBufferPtr buf,
|
|
|
404507 |
break;
|
|
|
404507 |
|
|
|
404507 |
case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
|
|
|
404507 |
- if (def->targetTypeAttr) {
|
|
|
404507 |
+ if (def->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) {
|
|
|
404507 |
virBufferAsprintf(buf,
|
|
|
404507 |
"<target type='%s' port='%d'/>\n",
|
|
|
404507 |
virDomainChrTargetTypeToString(def->deviceType,
|
|
|
404507 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
404507 |
index 9502573b34..bbb056cf21 100644
|
|
|
404507 |
--- a/src/conf/domain_conf.h
|
|
|
404507 |
+++ b/src/conf/domain_conf.h
|
|
|
404507 |
@@ -1199,7 +1199,6 @@ struct _virDomainChrSourceDef {
|
|
|
404507 |
struct _virDomainChrDef {
|
|
|
404507 |
int deviceType; /* enum virDomainChrDeviceType */
|
|
|
404507 |
|
|
|
404507 |
- bool targetTypeAttr;
|
|
|
404507 |
int targetType; /* enum virDomainChrConsoleTargetType ||
|
|
|
404507 |
enum virDomainChrChannelTargetType ||
|
|
|
404507 |
enum virDomainChrSerialTargetType according to deviceType */
|
|
|
404507 |
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
|
|
|
404507 |
index 3910deeb3a..c8de1b9598 100644
|
|
|
404507 |
--- a/src/vz/vz_sdk.c
|
|
|
404507 |
+++ b/src/vz/vz_sdk.c
|
|
|
404507 |
@@ -1191,7 +1191,6 @@ prlsdkGetSerialInfo(PRL_HANDLE serialPort, virDomainChrDefPtr chr)
|
|
|
404507 |
int ret = -1;
|
|
|
404507 |
|
|
|
404507 |
chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL;
|
|
|
404507 |
- chr->targetTypeAttr = false;
|
|
|
404507 |
pret = PrlVmDev_GetIndex(serialPort, &serialPortIndex);
|
|
|
404507 |
prlsdkCheckRetGoto(pret, cleanup);
|
|
|
404507 |
chr->target.port = serialPortIndex;
|
|
|
404507 |
@@ -2864,7 +2863,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr)
|
|
|
404507 |
return -1;
|
|
|
404507 |
}
|
|
|
404507 |
|
|
|
404507 |
- if (chr->targetTypeAttr) {
|
|
|
404507 |
+ if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) {
|
|
|
404507 |
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
|
404507 |
_("Specified character device target type is not "
|
|
|
404507 |
"supported by vz driver."));
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
|
|
|
404507 |
index f512844427..7c106f145c 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
|
|
|
404507 |
index aac814d59f..e76d0211dc 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml
|
|
|
404507 |
@@ -29,7 +29,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='dev'>
|
|
|
404507 |
<source path='/dev/ttyS2'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='dev'>
|
|
|
404507 |
<source path='/dev/ttyS2'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
|
|
|
404507 |
index 64819a48ae..ed67ada0d8 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml
|
|
|
404507 |
@@ -29,7 +29,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='file'>
|
|
|
404507 |
<source path='/tmp/serial.log'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='file'>
|
|
|
404507 |
<source path='/tmp/serial.log'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
|
|
|
404507 |
index e00afe317f..420771dc9c 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml
|
|
|
404507 |
@@ -28,11 +28,11 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='file'>
|
|
|
404507 |
<source path='/tmp/serial.log'/>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
|
|
|
404507 |
index f512844427..7c106f145c 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
|
|
|
404507 |
index c35a4ca73a..3fe61ffa05 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml
|
|
|
404507 |
@@ -30,7 +30,7 @@
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
<protocol type='telnet'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='tcp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
|
|
|
404507 |
index 0d218f5482..3fc9fd39b0 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml
|
|
|
404507 |
@@ -30,7 +30,7 @@
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
<protocol type='raw'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='tcp'>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
|
|
|
404507 |
index f7069d541f..5b4af3fe95 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml
|
|
|
404507 |
@@ -30,11 +30,11 @@
|
|
|
404507 |
<serial type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='9998'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='udp'>
|
|
|
404507 |
<source mode='connect' service='9999'/>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='9999'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
|
|
|
404507 |
index 14fc8fc7c9..6bb291ff7f 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml
|
|
|
404507 |
@@ -29,7 +29,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='unix'>
|
|
|
404507 |
<source mode='connect' path='/tmp/serial.sock'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='unix'>
|
|
|
404507 |
<source mode='connect' path='/tmp/serial.sock'/>
|
|
|
404507 |
diff --git a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
|
|
|
404507 |
index 95aa1c7b9b..41954fc85d 100644
|
|
|
404507 |
--- a/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
|
|
|
404507 |
+++ b/tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='vc'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='vc'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
404507 |
index 4e1dd49c22..427f431cce 100644
|
|
|
404507 |
--- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
404507 |
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
|
|
|
404507 |
@@ -72,13 +72,13 @@
|
|
|
404507 |
<alias name='serial0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<alias name='serial1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='bind' host='0.0.0.0' service='2445'/>
|
|
|
404507 |
<protocol type='raw'/>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
<alias name='serial2'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
|
|
|
404507 |
index c56d13ef4a..144f6eff7a 100644
|
|
|
404507 |
--- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
|
|
|
404507 |
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
|
|
|
404507 |
@@ -72,13 +72,13 @@
|
|
|
404507 |
<alias name='serial0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<alias name='serial1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='bind' host='0.0.0.0' service='2445'/>
|
|
|
404507 |
<protocol type='raw'/>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
<alias name='serial2'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml
|
|
|
404507 |
index a95e29ad8a..e6c4adb6f3 100644
|
|
|
404507 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml
|
|
|
404507 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml
|
|
|
404507 |
@@ -29,12 +29,12 @@
|
|
|
404507 |
<serial type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='1111'/>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='2222'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='5555' tls='no'/>
|
|
|
404507 |
<protocol type='raw'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='1111'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
|
|
|
404507 |
index c760098fe0..f9724d320e 100644
|
|
|
404507 |
--- a/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
|
|
|
404507 |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml
|
|
|
404507 |
@@ -110,10 +110,10 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml
|
|
|
404507 |
index 033e86d3a3..5ee73b527e 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram-os-interleave.xml
|
|
|
404507 |
@@ -33,7 +33,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml
|
|
|
404507 |
index 840bf69f61..ad77f62d9e 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml
|
|
|
404507 |
@@ -25,13 +25,13 @@
|
|
|
404507 |
<source path='/tmp/serial.file'>
|
|
|
404507 |
<seclabel model='dac' relabel='no'/>
|
|
|
404507 |
</source>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='unix'>
|
|
|
404507 |
<source mode='connect' path='/tmp/serial.sock'>
|
|
|
404507 |
<seclabel model='dac' relabel='no'/>
|
|
|
404507 |
</source>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='file'>
|
|
|
404507 |
<source path='/tmp/serial.file'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
|
|
|
404507 |
index e76f857aee..cd9d75c4b7 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
|
|
|
404507 |
@@ -27,7 +27,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml
|
|
|
404507 |
index 8dc361dfc6..0c0bd7b348 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml
|
|
|
404507 |
index 858b2c6750..305c53eab7 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml
|
|
|
404507 |
@@ -31,7 +31,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml
|
|
|
404507 |
index f9f9abd2df..b38b3ce987 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml
|
|
|
404507 |
@@ -30,7 +30,7 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml
|
|
|
404507 |
index 1c55017678..06192fbb4a 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml
|
|
|
404507 |
@@ -47,7 +47,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
|
|
|
404507 |
index 95b6e2df1a..a6eaa38079 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml
|
|
|
404507 |
@@ -104,10 +104,10 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
|
|
|
404507 |
index 7fe69bd6cb..e6ad234240 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml
|
|
|
404507 |
@@ -55,7 +55,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
|
|
|
404507 |
index b631e5b515..66448ec3dd 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml
|
|
|
404507 |
@@ -44,7 +44,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
|
|
|
404507 |
index fd5fdbece5..b1240b8ed1 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml
|
|
|
404507 |
@@ -57,7 +57,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml
|
|
|
404507 |
index 4571b6a829..4f7ad323ed 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-mtu.xml
|
|
|
404507 |
@@ -54,7 +54,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml
|
|
|
404507 |
index 7fb49feb0f..a563b6dddf 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml
|
|
|
404507 |
@@ -22,7 +22,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml
|
|
|
404507 |
index f020056219..59587b3c32 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat-power9.xml
|
|
|
404507 |
@@ -25,7 +25,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml
|
|
|
404507 |
index 3cbce9fe6a..a39e1fd015 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-compat.xml
|
|
|
404507 |
@@ -25,7 +25,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml
|
|
|
404507 |
index d69b387686..666eede1a5 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-cpu-exact.xml
|
|
|
404507 |
@@ -26,7 +26,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
|
|
|
404507 |
index 7fb49feb0f..a563b6dddf 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml
|
|
|
404507 |
@@ -22,7 +22,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml
|
|
|
404507 |
index 7fb49feb0f..a563b6dddf 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-no-address.xml
|
|
|
404507 |
@@ -22,7 +22,7 @@
|
|
|
404507 |
<target index='0'/>
|
|
|
404507 |
</controller>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
<address type='spapr-vio' reg='0x30000000'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml
|
|
|
404507 |
index c4ccd98aac..27baaa3f14 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-virt-manager-basic.xml
|
|
|
404507 |
@@ -79,7 +79,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml
|
|
|
404507 |
index 79c4ebc734..63462e6f94 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='spiceport'>
|
|
|
404507 |
<source channel='org.qemu.console.serial.0'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='spiceport'>
|
|
|
404507 |
<source channel='org.qemu.console.serial.0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml
|
|
|
404507 |
index 9527b2d15f..c90bbeb7d5 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml
|
|
|
404507 |
@@ -28,7 +28,7 @@
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='spiceport'>
|
|
|
404507 |
<source channel='org.qemu.console.serial.0'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='spiceport'>
|
|
|
404507 |
<source channel='org.qemu.console.serial.0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml
|
|
|
404507 |
index 71516a31a9..a8790b5098 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml
|
|
|
404507 |
@@ -27,13 +27,13 @@
|
|
|
404507 |
</controller>
|
|
|
404507 |
<controller type='pci' index='0' model='pci-root'/>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='null'>
|
|
|
404507 |
- <target port='1'/>
|
|
|
404507 |
+ <target type='isa-serial' port='1'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='stdio'>
|
|
|
404507 |
- <target port='2'/>
|
|
|
404507 |
+ <target type='isa-serial' port='2'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml
|
|
|
404507 |
index 18f51e5383..a8af87b53b 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml
|
|
|
404507 |
@@ -29,12 +29,12 @@
|
|
|
404507 |
<serial type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='1111'/>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='2222'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<serial type='tcp'>
|
|
|
404507 |
<source mode='connect' host='127.0.0.1' service='5555'/>
|
|
|
404507 |
<protocol type='raw'/>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='udp'>
|
|
|
404507 |
<source mode='bind' host='127.0.0.1' service='1111'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
|
|
|
404507 |
index 3a95b6088c..6d847de3a2 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost-incorrect.xml
|
|
|
404507 |
@@ -40,7 +40,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
|
|
|
404507 |
index 759b844395..30989658f4 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml
|
|
|
404507 |
@@ -47,7 +47,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml
|
|
|
404507 |
index 8c27470ddf..72cbcc4cb5 100644
|
|
|
404507 |
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml
|
|
|
404507 |
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml
|
|
|
404507 |
@@ -46,7 +46,7 @@
|
|
|
404507 |
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
|
|
|
404507 |
</interface>
|
|
|
404507 |
<serial type='pty'>
|
|
|
404507 |
- <target port='0'/>
|
|
|
404507 |
+ <target type='isa-serial' port='0'/>
|
|
|
404507 |
</serial>
|
|
|
404507 |
<console type='pty'>
|
|
|
404507 |
<target type='serial' port='0'/>
|
|
|
404507 |
--
|
|
|
404507 |
2.15.1
|
|
|
404507 |
|