diff options
| author |   Cole Robinson <crobinso@redhat.com> | 2010-07-22 13:56:21 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2010-07-28 16:47:59 -0400 |
| commit | 6b24755235f47b38e5185d94f4cccd96538587dc (patch) | |
| tree | 32e068e6cac50d3f1dc36b8899be6dd59e8ea710 /tests | |
| parent | domain conf: char: Add an explicit targetType field (diff) | |
| download | libvirt-6b24755235f47b38e5185d94f4cccd96538587dc.tar.gz libvirt-6b24755235f47b38e5185d94f4cccd96538587dc.tar.bz2 libvirt-6b24755235f47b38e5185d94f4cccd96538587dc.zip | |
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>
Diffstat (limited to 'tests')
63 files changed, 63 insertions, 63 deletions
diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault index 7a9a7b6fc..19d4e671c 100755 --- 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 611ddb8d7..9591c8722 100644 --- 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 5d2498634..cc0ab433c 100644 --- 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 98bc4ef70..3e60e9846 100644 --- 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 b121c5c72..1d042f123 100644 --- 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 611ddb8d7..9591c8722 100644 --- 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 5aeceb0e8..5bf6a08aa 100644 --- 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 286417e18..304792e7a 100644 --- 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 2c447389d..e4fe4fd52 100644 --- 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 2c07e94a0..61dff3f81 100644 --- 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 5b39736d5..36bd62286 100644 --- 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 611ddb8d7..9591c8722 100644 --- 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 14dc37cb1..bfac0f416 100644 --- 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 fb1217b72..6be4d5d97 100644 --- 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 f164c4d4c..d7e305401 100644 --- 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 9eb116c9e..d9d7552b3 100644 --- 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 4c56a72eb..04824ba68 100644 --- 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 4c8273f0f..3e935dbff 100644 --- 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 10cbc2d68..8aa321492 100644 --- 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 6efe8dee7..3f501e7ac 100644 --- 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 280986761..bd38a2541 100644 --- 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 5a6b41496..db010ad26 100644 --- 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 f49643391..faeed7736 100644 --- 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 97d452889..0967ac7a6 100644 --- 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 06da049f7..3773d3b26 100644 --- 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 5f89a752e..d46df0944 100644 --- 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 e6cb35752..34f25ac0c 100644 --- 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 2eac19c60..6c692145d 100644 --- 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 9a3a0e2bf..bcc20ddcc 100644 --- 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 e026cf87f..93f20fa26 100644 --- 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 717ec7908..a1249baa4 100644 --- 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 be77a82e5..91fd65606 100644 --- 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 07a08dbe6..a51955111 100644 --- 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 db34474f6..5a8277551 100644 --- 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 40e12c014..fe0ecb6ba 100644 --- 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 eddf32f86..920c05827 100644 --- 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 480327deb..646619256 100644 --- 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 40302d0c0..0914bc97d 100644 --- 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 9a0ad1f44..0657fbaf6 100644 --- 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 9a0ad1f44..0657fbaf6 100644 --- 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 19c7ab855..766c78d71 100644 --- 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 10cbc2d68..8aa321492 100644 --- 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 5b8fbb97b..42388825d 100644 --- 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 83e1ce93a..c9f00ebfd 100644 --- 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 95816e02a..21b626398 100644 --- 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 38e69a605..cf8a797a7 100644 --- 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 a601ee20d..02ecaa2f6 100644 --- 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 94b403497..542b779e1 100644 --- 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 217806ad6..61501685a 100644 --- 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 45760874f..53e6d4faa 100644 --- 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 8717799ec..b54048102 100644 --- 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 52c433e91..31c5de832 100644 --- 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 062cf54b5..3b2994af3 100644 --- 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 7871310a9..66b382469 100644 --- 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 e517b33b5..1ffe6be41 100644 --- 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 9b1dd0174..41145108e 100644 --- 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 bb8308b18..d709e6904 100644 --- 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 981457752..b6c4739bc 100644 --- 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 eb95fd43c..39325ea3a 100644 --- 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 f359ba1e5..40c79cb57 100644 --- 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 eb95fd43c..39325ea3a 100644 --- 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 f359ba1e5..40c79cb57 100644 --- 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 09456d033..74bc227cf 100644 --- 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'/> |