From 03003499e7968b671f5bb4da07b36069a7f0d4f4 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 30 Jan 2008 16:38:18 +0000 Subject: [PATCH] Fix XML generation for Xen USB devices --- ChangeLog | 8 ++++++++ src/xend_internal.c | 4 ++-- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b1f49c089..94c0155c15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 30 11:35:25 EST 2008 Daniel P. Berrange + + * src/xend_internal.c: Fix SXPR -> XML conversion for USB + devices. + * tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr, + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr: Fix test + case SXPR to actually match what XenD produces for USB devices. + Wed Jan 30 07:54:25 CET 2008 Jim Meyering Arrange for "make syntax-check" to pass. diff --git a/src/xend_internal.c b/src/xend_internal.c index 814d16fda0..bbe5013467 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -1741,9 +1741,9 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, if (sexpr_lookup(node, "usbdevice")) { tmp = sexpr_node(node, "usbdevice"); if (tmp && *tmp) { - if (!strcmp(tmp, "usbtablet")) + if (!strcmp(tmp, "tablet")) virBufferAdd(&buf, " \n", 37); - else if (!strcmp(tmp, "usbmouse")) + else if (!strcmp(tmp, "mouse")) virBufferAdd(&buf, " \n", 36); } } diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr index a93488fcdb..da9ae6afa9 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr @@ -1 +1 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usbdevice usbmouse)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usbdevice mouse)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr index 002103cfc4..058166fabc 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr @@ -1 +1 @@ -(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice usbtablet)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu))))