External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix XML generation for Xen USB devices

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-01-30 16:38:18 +00:00
parent 51dd1d9e38
commit 03003499e7
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Jan 30 11:35:25 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* 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 <meyering@redhat.com> Wed Jan 30 07:54:25 CET 2008 Jim Meyering <meyering@redhat.com>
Arrange for "make syntax-check" to pass. Arrange for "make syntax-check" to pass.

4
src/xend_internal.c
View File

@ -1741,9 +1741,9 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root,
if (sexpr_lookup(node, "usbdevice")) { if (sexpr_lookup(node, "usbdevice")) {
tmp = sexpr_node(node, "usbdevice"); tmp = sexpr_node(node, "usbdevice");
if (tmp && *tmp) { if (tmp && *tmp) {
if (!strcmp(tmp, "usbtablet")) if (!strcmp(tmp, "tablet"))
virBufferAdd(&buf, " <input type='tablet' bus='usb'/>\n", 37); virBufferAdd(&buf, " <input type='tablet' bus='usb'/>\n", 37);
else if (!strcmp(tmp, "usbmouse")) else if (!strcmp(tmp, "mouse"))
virBufferAdd(&buf, " <input type='mouse' bus='usb'/>\n", 36); virBufferAdd(&buf, " <input type='mouse' bus='usb'/>\n", 36);
} }
} }

2
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr
View File

@ -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))))

2
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr
View File

@ -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))))