[libvirt] [PATCH] Add test for legacy <console ... tty=""> syntax
* tests/qemuxml2argvtest.c: Test legacy syntax for QEMU argument generation * tests/qemuxml2argvdata/qemuxml2argv-console-legacy.(xml|args): Add test data --- .../qemuxml2argv-console-legacy.args | 1 + .../qemuxml2argv-console-legacy.xml | 29 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args new file mode 100644 index 0000000..fd42462 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial pty -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml new file mode 100644 index 0000000..68d86ba --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-legacy.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty' tty='/dev/pts/8'> + <source path='/dev/pts/8'/> + <target port='0'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c948379..233b3ae 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -268,6 +268,7 @@ mymain(int argc, char **argv) DO_TEST("serial-many", 0); DO_TEST("parallel-tcp", 0); DO_TEST("console-compat", 0); + DO_TEST("console-legacy", 0); DO_TEST("channel-guestfwd", QEMUD_CMD_FLAG_CHARDEV); -- 1.6.5.2
On Mon, Nov 23, 2009 at 01:48:30PM +0000, Matthew Booth wrote:
* tests/qemuxml2argvtest.c: Test legacy syntax for QEMU argument generation * tests/qemuxml2argvdata/qemuxml2argv-console-legacy.(xml|args): Add test data
This test doesn't seem to test anything we're not already testing ? Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On 25/11/09 11:25, Daniel P. Berrange wrote:
On Mon, Nov 23, 2009 at 01:48:30PM +0000, Matthew Booth wrote:
* tests/qemuxml2argvtest.c: Test legacy syntax for QEMU argument generation * tests/qemuxml2argvdata/qemuxml2argv-console-legacy.(xml|args): Add test data
This test doesn't seem to test anything we're not already testing ?
Where's it currently tested? I couldn't see it. I also ran a make check with this test in place before and after the recent tty= fix. It failed before and succeeded afterwards. That said, I'm not entirely sure what the console-compat test is testing. Is it possible that the test was supposed to be in there? Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490
On Wed, Nov 25, 2009 at 11:27:48AM +0000, Matthew Booth wrote:
On 25/11/09 11:25, Daniel P. Berrange wrote:
On Mon, Nov 23, 2009 at 01:48:30PM +0000, Matthew Booth wrote:
* tests/qemuxml2argvtest.c: Test legacy syntax for QEMU argument generation * tests/qemuxml2argvdata/qemuxml2argv-console-legacy.(xml|args): Add test data
This test doesn't seem to test anything we're not already testing ?
Where's it currently tested? I couldn't see it. I also ran a make check with this test in place before and after the recent tty= fix. It failed before and succeeded afterwards.
That said, I'm not entirely sure what the console-compat test is testing. Is it possible that the test was supposed to be in there?
Since you have both <serial> and <console> elements there, <console> is ignored. Essentially <console> is just a pointer to the first serial port. <console> would only have been looked at if you hadn't had the <serial> tag there, in which case it would have been copied to the serial tag Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
participants (2)
-
Daniel P. Berrange -
Matthew Booth