domain conf: Track <console> target type

All <console> devices now export a <target> type attribute. QEMU defaults
to 'serial', UML defaults to 'uml, xen can be either 'serial' or 'xen'
depending on fullvirt. Understandably there is lots of test fallout.

This will be used to differentiate between a serial vs. virtio console for
QEMU.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index f36bb1fa9f1eea51116ea0344382ac0ba26c47c9..04dc298b2d87d8c6d33bef17146b3c2ca5c09d64 100644 (file)
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -1212,17 +1212,37 @@
     <interleave>
       <ref name="qemucdevSrcDef"/>
       <optional>
-        <element name="target">
-          <optional>
-            <attribute name="port"/>
-          </optional>
-        </element>
+        <ref name="qemucdevTgtDef"/>
       </optional>
       <optional>
         <ref name="address"/>
       </optional>
     </interleave>
   </define>
+
+  <define name="qemucdevConsoleTgtType">
+    <attribute name="type">
+      <choice>
+        <value>xen</value>
+        <value>serial</value>
+        <value>uml</value>
+      </choice>
+    </attribute>
+  </define>
+
+  <define  name="qemucdevTgtDef">
+    <element name="target">
+      <interleave>
+        <optional>
+          <ref name="qemucdevConsoleTgtType"/>
+        </optional>
+        <optional>
+          <attribute name="port"/>
+        </optional>
+      </interleave>
+    </element>
+  </define>
+
   <define name="qemucdevSrcType">
     <attribute name="type">
       <choice>

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index cd96cc34814ee6e4735e7665ae4767be90e23d82..f41be1c8a719654d36d44269068a809fb3288447 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -140,6 +140,7 @@ struct _virCaps {
     unsigned int emulatorRequired : 1;
     const char *defaultDiskDriverName;
     const char *defaultDiskDriverType;
+    int defaultConsoleTargetType;
     void *(*privateDataAllocFunc)(void);
     void (*privateDataFreeFunc)(void *);
     int (*privateDataXMLFormat)(virBufferPtr, void *);

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a8ed9feaac4865c944e955c3abf547c3fef430d6..5d7dfbf96c4143be435d8643b0713f117484b83f 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -169,6 +169,12 @@ VIR_ENUM_IMPL(virDomainChrChannelTarget,
               "guestfwd",
               "virtio")
 
+VIR_ENUM_IMPL(virDomainChrConsoleTarget,
+              VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST,
+              "serial",
+              "xen",
+              "uml")
+
 VIR_ENUM_IMPL(virDomainChrDevice, VIR_DOMAIN_CHR_DEVICE_TYPE_LAST,
               "monitor",
               "parallel",
@@ -2374,7 +2380,7 @@ error:
 }
 
 static int
-virDomainChrDefaultTargetType(int devtype) {
+virDomainChrDefaultTargetType(virCapsPtr caps, int devtype) {
 
     int target = -1;
 
@@ -2386,6 +2392,9 @@ virDomainChrDefaultTargetType(int devtype) {
         break;
 
     case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+        target = caps->defaultConsoleTargetType;
+        break;
+
     case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
     case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
     default:
@@ -2398,14 +2407,15 @@ virDomainChrDefaultTargetType(int devtype) {
 }
 
 static int
-virDomainChrTargetTypeFromString(int devtype,
+virDomainChrTargetTypeFromString(virCapsPtr caps,
+                                 int devtype,
                                  const char *targetType)
 {
     int ret = -1;
     int target = 0;
 
     if (!targetType) {
-        target = virDomainChrDefaultTargetType(devtype);
+        target = virDomainChrDefaultTargetType(caps, devtype);
         goto out;
     }
 
@@ -2414,6 +2424,10 @@ virDomainChrTargetTypeFromString(int devtype,
         target = virDomainChrChannelTargetTypeFromString(targetType);
         break;
 
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+        target = virDomainChrConsoleTargetTypeFromString(targetType);
+        /* Fall through */
+
     case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
     case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
     default:
@@ -2437,6 +2451,9 @@ virDomainChrTargetTypeToString(int deviceType,
     case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
         type = virDomainChrChannelTargetTypeToString(targetType);
         break;
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+        type = virDomainChrConsoleTargetTypeToString(targetType);
+        break;
     default:
         break;
     }
@@ -2445,7 +2462,8 @@ virDomainChrTargetTypeToString(int deviceType,
 }
 
 static int
-virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
+virDomainChrDefParseTargetXML(virCapsPtr caps,
+                              virDomainChrDefPtr def,
                               xmlNodePtr cur,
                               int flags ATTRIBUTE_UNUSED)
 {
@@ -2456,7 +2474,8 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
     const char *portStr = NULL;
 
     if ((def->targetType =
-        virDomainChrTargetTypeFromString(def->deviceType, targetType)) < 0) {
+        virDomainChrTargetTypeFromString(caps,
+                                         def->deviceType, targetType)) < 0) {
         goto error;
     }
 
@@ -2586,7 +2605,8 @@ error:
  *
  */
 static virDomainChrDefPtr
-virDomainChrDefParseXML(xmlNodePtr node,
+virDomainChrDefParseXML(virCapsPtr caps,
+                        xmlNodePtr node,
                         int flags) {
     xmlNodePtr cur;
     char *type = NULL;
@@ -2664,7 +2684,7 @@ virDomainChrDefParseXML(xmlNodePtr node,
                 if (protocol == NULL)
                     protocol = virXMLPropString(cur, "type");
             } else if (xmlStrEqual(cur->name, BAD_CAST "target")) {
-                if (virDomainChrDefParseTargetXML(def, cur, flags) < 0) {
+                if (virDomainChrDefParseTargetXML(caps, def, cur, flags) < 0) {
                     goto error;
                 }
             }
@@ -4515,7 +4535,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
         goto no_memory;
 
     for (i = 0 ; i < n ; i++) {
-        virDomainChrDefPtr chr = virDomainChrDefParseXML(nodes[i],
+        virDomainChrDefPtr chr = virDomainChrDefParseXML(caps,
+                                                         nodes[i],
                                                          flags);
         if (!chr)
             goto error;
@@ -4534,7 +4555,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
         goto no_memory;
 
     for (i = 0 ; i < n ; i++) {
-        virDomainChrDefPtr chr = virDomainChrDefParseXML(nodes[i],
+        virDomainChrDefPtr chr = virDomainChrDefParseXML(caps,
+                                                         nodes[i],
                                                          flags);
         if (!chr)
             goto error;
@@ -4545,7 +4567,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
     VIR_FREE(nodes);
 
     if ((node = virXPathNode("./devices/console[1]", ctxt)) != NULL) {
-        virDomainChrDefPtr chr = virDomainChrDefParseXML(node,
+        virDomainChrDefPtr chr = virDomainChrDefParseXML(caps,
+                                                         node,
                                                          flags);
         if (!chr)
             goto error;
@@ -4581,7 +4604,8 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
         goto no_memory;
 
     for (i = 0 ; i < n ; i++) {
-        virDomainChrDefPtr chr = virDomainChrDefParseXML(nodes[i],
+        virDomainChrDefPtr chr = virDomainChrDefParseXML(caps,
+                                                         nodes[i],
                                                          flags);
         if (!chr)
             goto error;
@@ -5831,8 +5855,17 @@ virDomainChrDefFormat(virBufferPtr buf,
         /* Nothing to format */
         break;
 
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+        virBufferVSprintf(buf,
+                          "      <target type='%s' port='%d'/>\n",
+                          virDomainChrTargetTypeToString(def->deviceType,
+                                                         def->targetType),
+                          def->target.port);
+        break;
+
     default:
-        virBufferVSprintf(buf, "      <target port='%d'/>\n", def->target.port);
+        virBufferVSprintf(buf, "      <target port='%d'/>\n",
+                          def->target.port);
         break;
     }
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 58f8964e887ed7e568a0f06d3e6c9d3dc7541277..9bd61ca154d95160eda08a965d39db1d944ebfe9 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -330,6 +330,14 @@ enum virDomainChrChannelTargetType {
     VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST,
 };
 
+enum virDomainChrConsoleTargetType {
+    VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL = 0,
+    VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN,
+    VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML,
+
+    VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST,
+};
+
 enum virDomainChrType {
     VIR_DOMAIN_CHR_TYPE_NULL,
     VIR_DOMAIN_CHR_TYPE_VC,
@@ -1143,6 +1151,7 @@ VIR_ENUM_DECL(virDomainFS)
 VIR_ENUM_DECL(virDomainNet)
 VIR_ENUM_DECL(virDomainChrDevice)
 VIR_ENUM_DECL(virDomainChrChannelTarget)
+VIR_ENUM_DECL(virDomainChrConsoleTarget)
 VIR_ENUM_DECL(virDomainChr)
 VIR_ENUM_DECL(virDomainSoundModel)
 VIR_ENUM_DECL(virDomainMemballoonModel)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 3703da32586436994e5458bda00c8510563bc18b..2c35a45a4593da55331afedf18a58e63abb0dce5 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1137,6 +1137,8 @@ virCapsPtr qemudCapsInit(virCapsPtr old_caps) {
     /* QEMU Requires an emulator in the XML */
     virCapabilitiesSetEmulatorRequired(caps);
 
+    caps->defaultConsoleTargetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
+
     return caps;
 
  no_memory:

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index ea40efbd3ea045ebceb67f35fcb6f2cd11558798..bef8c385a2c29772921d4c4d02e82c3c81bd77fc 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -97,6 +97,8 @@ virCapsPtr umlCapsInit(void) {
                                       NULL) == NULL)
         goto error;
 
+    caps->defaultConsoleTargetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML;
+
     return caps;
 
  error:

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index ae17c600f41438abdcc51158c1723f7aaa387ee0..67d0f4b9b5c8cee5b551f5b7c6b8587bc9ddb668 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2342,6 +2342,8 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
         }
     }
 
+    caps->defaultConsoleTargetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
+
     return caps;
 
  no_memory:

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a492231589fcd23ebdb8e115d49dba4559710230..fad5ce8dff43116698d956344bd3af25ec3c88c5 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -2367,6 +2367,7 @@ xenDaemonParseSxpr(virConnectPtr conn,
         if (!(def->console = xenDaemonParseSxprChar("pty", tty)))
             goto error;
         def->console->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE;
+        def->console->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
     }
     VIR_FREE(tty);
 

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 4230504f26d8a2651c0d2976c78746246d9ea8b8..20b828d5e9fe6939f855c0fc3a36b4d40194f626 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -1441,6 +1441,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
         if (!(def->console = xenDaemonParseSxprChar("pty", NULL)))
             goto cleanup;
         def->console->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE;
+        def->console->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN;
     }
 
     if (hvm) {

diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault
index 7a9a7b6fc6bde86295e3c6834b995a30a8fe4d9d..19d4e671ca68459cdda0e80c36a0817d54d1d747 100755 (executable)
--- a/tests/define-dev-segfault
+++ b/tests/define-dev-segfault
@@ -55,7 +55,7 @@ cat <<\EOF > D.xml || fail=1
       <target port='2'/>
     </parallel>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <sound model='pcspk'/>
     <sound model='es1370'/>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
index 611ddb8d7b53ca67a3911a7372036d5f76b78c68..9591c8722b5f3e21fa06686a05f4c876f97398a8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml
@@ -24,7 +24,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
index 5d249863414992e65989f9e19fba0224789caae4..cc0ab433c9fcf9c1f361f6583758558ea53d129a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml
@@ -26,7 +26,7 @@
     </serial>
     <console type='dev'>
       <source path='/dev/ttyS2'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
index 98bc4ef70f144f8be599b3f786281cb7ae4eaa56..3e60e9846d3dcc28b0c28b3b4dbf5b4c86068252 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml
@@ -26,7 +26,7 @@
     </serial>
     <console type='file'>
       <source path='/tmp/serial.log'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
index b121c5c72fe76b17f5d69fd48741bbc9534dfdd0..1d042f123a5c190326da20a72475fa6121610c31 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml
@@ -28,7 +28,7 @@
       <target port='1'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
index 611ddb8d7b53ca67a3911a7372036d5f76b78c68..9591c8722b5f3e21fa06686a05f4c876f97398a8 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml
@@ -24,7 +24,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
index 5aeceb0e8c42220e5ee62fa1e47e885c28409579..5bf6a08aac64637192891cd1a67837e78f2b7602 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml
@@ -28,7 +28,7 @@
     <console type='tcp'>
       <source mode='bind' host='127.0.0.1' service='9999'/>
       <protocol type='telnet'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
index 286417e18176082398a77bff88382d08a1359cca..304792e7ae8197ea06c22fba37721e3beb52ba5d 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml
@@ -28,7 +28,7 @@
     <console type='tcp'>
       <source mode='connect' host='127.0.0.1' service='9999'/>
       <protocol type='raw'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
index 2c447389d59569fbe8c7bb173f0c5cd26e86b1e3..e4fe4fd52923b4f510b3d27166a69a855de5fb7a 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml
@@ -28,7 +28,7 @@
     <console type='udp'>
       <source mode='bind' host='127.0.0.1' service='9999'/>
       <source mode='connect' host='127.0.0.1' service='9998'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
index 2c07e94a0a639869bf5210d0a4d600373f07dbf3..61dff3f819fb7f572c4f0efd22b38c7a10e10dbd 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml
@@ -26,7 +26,7 @@
     </serial>
     <console type='unix'>
       <source mode='connect' path='/tmp/serial.sock'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
index 5b39736d5bfabe27fa402454be947e57be704e90..36bd622861debefa29bd797715a1b92de1337dad 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml
@@ -24,7 +24,7 @@
       <target port='0'/>
     </serial>
     <console type='vc'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
index 611ddb8d7b53ca67a3911a7372036d5f76b78c68..9591c8722b5f3e21fa06686a05f4c876f97398a8 100644 (file)
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml
@@ -24,7 +24,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <memballoon model='virtio'/>
   </devices>

diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
index 14dc37cb113c08697784d23361c9a7932255b027..bfac0f416039c3bf76891af6aeec1154c09308d3 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml
@@ -28,7 +28,7 @@
       <target dev='vif6.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
index fb1217b72572e910d7a9956a536cd04a5ca54d80..6be4d5d97eefb019413cb4807c0e2458d8492388 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml
@@ -28,7 +28,7 @@
       <target dev='vif5.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
index f164c4d4c664c384d2bb87984b12aaa0c324e1a1..d7e305401330d41350f26b1c02d2b232be573782 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml
@@ -26,7 +26,7 @@
       <target dev='vif6.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
index 9eb116c9e7d04bf0f6d758e55153a251eec048e7..d9d7552b3bc5f6573bef80b503b02a9db45eda27 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
index 4c56a72eb55974a66fed95d067b721577ffdffe8..04824ba685477c19dabe71f07b9f23e273561ee5 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
index 4c8273f0fff14fbea39bfe707f34eb4503fd0028..3e935dbffd08f0e02fea31da5f53a8b781060c38 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
index 10cbc2d68ae02095eb8dc4d894c2eed5633a930f..8aa321492e19c94c249a0f45bd5e7048347cad31 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
index 6efe8dee7b9e0e624085e85899b663098ab830f4..3f501e7acc30082d1e2feddddffe63f036c6763b 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
index 2809867613ec89889c72f4f0eb34bc771ce58858..bd38a2541cbdad9673352d5274f7aaed76e3c2fb 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml
@@ -25,7 +25,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
index 5a6b4149609b854bd8dcb268ba2f845586ff17be..db010ad26d23c041a3655fd80c17655705b6fb2d 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
@@ -41,7 +41,7 @@
     </serial>
     <console type='file'>
       <source path='/tmp/serial.log'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
index f4964339146806f572ccac73941299f7a2576b7c..faeed773642981ba12241b5d77075c860003dcf4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='null'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
index 97d45288961c99ff483399f385b58f985b6f4b3d..0967ac7a624002351474e4770412744010cd53e8 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
@@ -41,7 +41,7 @@
     </serial>
     <console type='pipe'>
       <source path='/tmp/serial.pipe'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
index 06da049f7a0d9afcd6e4036b133d703066f7009a..3773d3b26d723904025236da159b08d040d99466 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
index 5f89a752e0402e13c6ed8aabaa337ec730a251dd..d46df09440ba3d90af7dcf9f88517bc8da7ce2f2 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='stdio'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
index e6cb3575218c89aa2bb6224a18b7a33d5bde936a..34f25ac0c2fce900be91e02f492b70e6c70ef5e5 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
@@ -43,7 +43,7 @@
     <console type='tcp'>
       <source mode='bind' host='localhost' service='9999'/>
       <protocol type='telnet'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
index 2eac19c60ce7cdd0b4b359f14deb6281df8eeff6..6c692145ddfdfc1c3d854cc3db1f9974fa6e17fb 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
@@ -43,7 +43,7 @@
     <console type='tcp'>
       <source mode='bind' host='localhost' service='9999'/>
       <protocol type='raw'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
index 9a3a0e2bfebd170d0a7991725b7331d02320b39d..bcc20ddcce09b1100d4feec9b3c4393c4b26371e 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
@@ -43,7 +43,7 @@
     <console type='udp'>
       <source mode='bind' host='localhost' service='9999'/>
       <source mode='connect' host='localhost' service='9998'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
index e026cf87f0b8e3535b2131a2f0ba3e94ae84db29..93f20fa26fc0c3063fe469f1ea466af87fdaeec6 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
@@ -41,7 +41,7 @@
     </serial>
     <console type='unix'>
       <source mode='bind' path='/tmp/serial.sock'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5901' autoport='no'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
index 717ec790870c0afbbae442dfdaad94df6ec07ac0..a1249baa4d2b46154365b33d0543ba1fdd30e22f 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml
@@ -27,7 +27,7 @@
       <target dev='vif6.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
index be77a82e51961bbace7accaaddf6a6e076669ca2..91fd6560682b06f69757d0265575f7eac7588814 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml
@@ -28,7 +28,7 @@
       <model type='e1000'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
index 07a08dbe609b76c14412ae7dbed918bf743cb520..a51955111a7e9ebe2ba1bfa568b20875ee426953 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml
@@ -27,7 +27,7 @@
       <target dev='vif6.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
index db34474f6ce1a3091ce90eba105df32ebff60cd3..5a8277551e2fa0991f2f3c78299d627940da916e 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
@@ -38,7 +38,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
index 40e12c014fb822fd0196aae491527fe6dfadf4d6..fe0ecb6baa7d87c5b6d9a3a1fea2d895c1c7e4a0 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <source>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
index eddf32f86264de9d5615c2f0b9a59b7453b23d6d..920c058275cab9c40e4f5edd28289b533f359f65 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml
@@ -20,7 +20,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
index 480327deb2306bcb1795234c348994bd33bdc466..6466192569d0f22864185084aae407a5da8b87f4 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
index 40302d0c051c080bfc1f934369467f7ef1ecbbbb..0914bc97dc5b5f8c9d230cfb0a7ff9702300b153 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
index 9a0ad1f4434c0a49c4ce9b2f102bb296c108a5ee..0657fbaf67e006173da70dafa74e6112fc019ae6 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
index 9a0ad1f4434c0a49c4ce9b2f102bb296c108a5ee..0657fbaf67e006173da70dafa74e6112fc019ae6 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
index 19c7ab8552e2b5ce5fe306dfceaa1bf469d2734a..766c78d71a2d56b5a977d49ac74cf6701f0fdcdb 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml
@@ -26,7 +26,7 @@
       <target dev='vif1.0'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes'/>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml
index 10cbc2d68ae02095eb8dc4d894c2eed5633a930f..8aa321492e19c94c249a0f45bd5e7048347cad31 100644 (file)
--- a/tests/sexpr2xmldata/sexpr2xml-pv.xml
+++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml
@@ -21,7 +21,7 @@
       <target dev='xvda' bus='xen'/>
     </disk>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
index 5b8fbb97bc6aaeae16ed3f508094c7e783688af9..42388825da29aa61a70106e6dd1ca78bd7b8a973 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
@@ -36,7 +36,7 @@
     </parallel>
     <console type='file'>
       <source path='[498076b2-02796c1a-ef5b-000ae484a6a3] virtMonServ1/serial1.file'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml
index 83e1ce93a89ba709a5186fb13b72b367614093c0..c9f00ebfd329149f3e5612abf4b5e95e4de9f93a 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-serial-device.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml
@@ -17,7 +17,7 @@
     </serial>
     <console type='dev'>
       <source path='/dev/ttyS0'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/vmx2xml-serial-file.xml
index 95816e02a623a59da3a42d02bc200040c61d657a..21b62639843a483f25f942b13292a1f45da4b9ee 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-serial-file.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml
@@ -17,7 +17,7 @@
     </serial>
     <console type='file'>
       <source path='[datastore] directory/serial0.file'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
index 38e69a605e9491d097bb091499ed6c9ff9d7f95d..cf8a797a7e0a1744eaac25fe9787f05b3757f9cb 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
+++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml
@@ -17,7 +17,7 @@
     </serial>
     <console type='pipe'>
       <source path='serial0.pipe'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
   </devices>
 </domain>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml
index a601ee20d1e50a6006d48cb33e07dceaedd00051..02ecaa2f6b2347b447ac9527ef21092eda4e48ec 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-file.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml
@@ -42,7 +42,7 @@
     </serial>
     <console type='file'>
       <source path='/tmp/serial.log'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml
index 94b403497df3ec2a7f31d9ebad795824bbf8f448..542b779e118f2e95a1a5b04c1b5462d1befd98aa 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-null.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml
@@ -40,7 +40,7 @@
       <target port='0'/>
     </serial>
     <console type='null'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
index 217806ad6cd6ac0ff94bb53bba2e655a9de9ca5d..61501685aff5aea19cb2cd1ce3876a3d5e518776 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml
@@ -42,7 +42,7 @@
     </serial>
     <console type='pipe'>
       <source path='/tmp/serial.pipe'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
index 45760874f825069301ec7a34c54cd3c49becbf9e..53e6d4faab84a1758697a64b9886adedb4c5ef28 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml
@@ -40,7 +40,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
index 8717799ec866c289a41b7016c3de338b6427774b..b54048102e5dde8afba8eb62226f2294853293a7 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml
@@ -40,7 +40,7 @@
       <target port='0'/>
     </serial>
     <console type='stdio'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
index 52c433e91ecc690c78ea521edc057509486f8424..31c5de832c6d78bb4cc2bc9601eaeff904737621 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
@@ -44,7 +44,7 @@
     <console type='tcp'>
       <source mode='bind' host='127.0.0.1' service='9999'/>
       <protocol type='telnet'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
index 062cf54b5aa1512234f3bf6726d9b30312962e27..3b2994af33b8f44aa701734b34e0c37a35c38b8c 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml
@@ -44,7 +44,7 @@
     <console type='tcp'>
       <source mode='connect' host='127.0.0.1' service='7777'/>
       <protocol type='raw'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
index 7871310a9646827837a2d57a5b4039d7f1935d66..66b3824694fd4a423caf985d0df1cb4984c7436f 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml
@@ -44,7 +44,7 @@
     <console type='udp'>
       <source mode='bind' host='0.0.0.0' service='99998'/>
       <source mode='connect' host='127.0.0.1' service='9999'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
index e517b33b5d050b4c7c4a10b2057245722b993d65..1ffe6be41e016d5f1cec1d8e8b76c8b631b8ea0d 100644 (file)
--- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml
+++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml
@@ -42,7 +42,7 @@
     </serial>
     <console type='unix'>
       <source mode='bind' path='/tmp/serial.sock'/>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml
index 9b1dd0174c7f33b14f640a99a48edde1be501394..41145108e11dde8d75efe2848165c56ed66c934b 100644 (file)
--- a/tests/xmconfigdata/test-no-source-cdrom.xml
+++ b/tests/xmconfigdata/test-no-source-cdrom.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>

diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml
index bb8308b1829ebab90e1109da046f3d4700e2c208..d709e6904e5f0a050bbeee015bd260b4fa792024 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-e1000.xml
+++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml
@@ -25,7 +25,7 @@
       <model type='e1000'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml
index 981457752bb972e0651ff7f517c5ce100fe12d62..b6c4739bca092d73f42e968208500efbaa7bf4d0 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-net-vifname.xml
+++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml
@@ -26,7 +26,7 @@
       <model type='e1000'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
index eb95fd43cf03ab2b52a0bb58c3a831ac8ff8feed..39325ea3a1559b0745146bdb7609f7d6f0ec61af 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml
@@ -24,7 +24,7 @@
       <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
index f359ba1e5560fd1b1b2d93390c2eeffd2429f6d2..40c79cb574833f86da053af39f8353a1ac930e21 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml
@@ -24,7 +24,7 @@
       <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
index eb95fd43cf03ab2b52a0bb58c3a831ac8ff8feed..39325ea3a1559b0745146bdb7609f7d6f0ec61af 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml
@@ -24,7 +24,7 @@
       <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
index f359ba1e5560fd1b1b2d93390c2eeffd2429f6d2..40c79cb574833f86da053af39f8353a1ac930e21 100644 (file)
--- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml
+++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml
@@ -24,7 +24,7 @@
       <script path='vif-bridge'/>
     </interface>
     <console type='pty'>
-      <target port='0'/>
+      <target type='xen' port='0'/>
     </console>
     <input type='mouse' bus='xen'/>
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'/>

diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml
index 09456d033d11e6ef0a0a442c1a77cb67cae5f7f4..74bc227cf2647169b68ecc2074548cb3664d4a7a 100644 (file)
--- a/tests/xmconfigdata/test-pci-devs.xml
+++ b/tests/xmconfigdata/test-pci-devs.xml
@@ -39,7 +39,7 @@
       <target port='0'/>
     </serial>
     <console type='pty'>
-      <target port='0'/>
+      <target type='serial' port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='-1' autoport='yes'/>