diff options
| author |   Daniel P. Berrange <berrange@redhat.com> | 2009-12-14 19:32:32 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2010-01-18 13:55:56 +0000 |
| commit | 42ce352c131939069ecd0ad781f24cde26f456cd (patch) | |
| tree | 8bae687aae032082023955d0c01dd10ddb5f3872 /tests | |
| parent | Convert USB disks over to -device (diff) | |
| download | libvirt-42ce352c131939069ecd0ad781f24cde26f456cd.tar.gz libvirt-42ce352c131939069ecd0ad781f24cde26f456cd.tar.bz2 libvirt-42ce352c131939069ecd0ad781f24cde26f456cd.zip | |
Convert USB hostdevices over to -device
The old syntax was
-usbdevice host:PRODUCT:VENDOR
Or
-usbdevice host:BUS.DEV
The new syntax is
-device usb-host,product=PRODUCT,vendor=VENDOR
Or
-device usb-host,hostbus=BUS,hostaddr=DEV
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args | 1 | ||||
| -rw-r--r-- | tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml | 27 | ||||
| -rw-r--r-- | tests/qemuxml2argvtest.c | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args new file mode 100644 index 000000000..70f48c4c1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.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 -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -device usb-host,hostbus=014,hostaddr=006,id=hostusb0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml new file mode 100644 index 000000000..61bb2a2b2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml @@ -0,0 +1,27 @@ +<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> + <hostdev mode='subsystem' type='usb' managed='no'> + <source> + <address bus='14' device='6'/> + </source> + </hostdev> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8c88a7921..2042e2a75 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -299,6 +299,7 @@ mymain(int argc, char **argv) DO_TEST("hostdev-usb-product", 0); DO_TEST("hostdev-usb-address", 0); + DO_TEST("hostdev-usb-address-device", QEMUD_CMD_FLAG_DEVICE); DO_TEST("hostdev-pci-address", QEMUD_CMD_FLAG_PCIDEVICE); DO_TEST_FULL("restore-v1", QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO, "stdio"); |