aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Denemark <jdenemar@redhat.com>2012-06-05 15:34:09 +0200
committerJiri Denemark <jdenemar@redhat.com>2012-06-05 15:44:40 +0200
commitae953f51342469d77fde4a10b08d8d7d4c1994cc (patch)
tree3b4b72d7fcd439b9728e80809244928261ab1136 /tests/qemuhelpdata
parentvirsh: Back out if the argument for vol-create-as is malformed (diff)
downloadlibvirt-ae953f51342469d77fde4a10b08d8d7d4c1994cc.tar.gz
libvirt-ae953f51342469d77fde4a10b08d8d7d4c1994cc.tar.bz2
libvirt-ae953f51342469d77fde4a10b08d8d7d4c1994cc.zip
tests: Refresh qemu-1.1.0 data
QEMU 1.1.0 has been officially released. With 1.1.0 QEMU went back to three-digits version even for the initial release and I renamed the data files to match this fact. They were generated with qemu-system-x86_64 -help >tests/qemuhelpdata/qemu-1.1.0 qemu-system-x86_64 \ -device ? \ -device pci-assign,? \ -device virtio-blk-pci,? \ -device virtio-net-pci,? \ -device scsi-disk,? 2>tests/qemuhelpdata/qemu-1.1.0-device
Diffstat (limited to 'tests/qemuhelpdata')
-rw-r--r--tests/qemuhelpdata/qemu-1.1.0 (renamed from tests/qemuhelpdata/qemu-1.1)2
-rw-r--r--tests/qemuhelpdata/qemu-1.1.0-device (renamed from tests/qemuhelpdata/qemu-1.1-device)2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemuhelpdata/qemu-1.1 b/tests/qemuhelpdata/qemu-1.1.0
index 79bc8bae8..761eb672a 100644
--- a/tests/qemuhelpdata/qemu-1.1
+++ b/tests/qemuhelpdata/qemu-1.1.0
@@ -1,4 +1,4 @@
-QEMU emulator version 1.0.92, Copyright (c) 2003-2008 Fabrice Bellard
+QEMU emulator version 1.1.0, Copyright (c) 2003-2008 Fabrice Bellard
usage: qemu-system-x86_64 [options] [disk_image]
'disk_image' is a raw hard disk image for IDE hard disk 0
diff --git a/tests/qemuhelpdata/qemu-1.1-device b/tests/qemuhelpdata/qemu-1.1.0-device
index 64aacba86..abbf85049 100644
--- a/tests/qemuhelpdata/qemu-1.1-device
+++ b/tests/qemuhelpdata/qemu-1.1.0-device
@@ -101,11 +101,11 @@ virtio-blk-pci.opt_io_size=uint32
virtio-blk-pci.bootindex=int32
virtio-blk-pci.discard_granularity=uint32
virtio-blk-pci.serial=string
+virtio-blk-pci.scsi=on/off
virtio-blk-pci.ioeventfd=on/off
virtio-blk-pci.vectors=uint32
virtio-blk-pci.indirect_desc=on/off
virtio-blk-pci.event_idx=on/off
-virtio-blk-pci.scsi=on/off
virtio-blk-pci.addr=pci-devfn
virtio-blk-pci.romfile=string
virtio-blk-pci.rombar=uint32