]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
tests: Refresh qemu-1.1.0 data
authorJiri Denemark <jdenemar@redhat.com>
Tue, 5 Jun 2012 13:34:09 +0000 (15:34 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Tue, 5 Jun 2012 13:44:40 +0000 (15:44 +0200)
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

tests/qemuhelpdata/qemu-1.1.0 [moved from tests/qemuhelpdata/qemu-1.1 with 99% similarity]
tests/qemuhelpdata/qemu-1.1.0-device [moved from tests/qemuhelpdata/qemu-1.1-device with 100% similarity]
tests/qemuhelptest.c

similarity index 99%
rename from tests/qemuhelpdata/qemu-1.1
rename to tests/qemuhelpdata/qemu-1.1.0
index 79bc8bae88d1bf1502c655c3d0cb6b45dfa1f9a3..761eb672aa9935874ae1ae3b4b7d410d67ff092d 100644 (file)
@@ -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
similarity index 100%
rename from tests/qemuhelpdata/qemu-1.1-device
rename to tests/qemuhelpdata/qemu-1.1.0-device
index 64aacba86e65dadfcf74c2eecc19a883b410f27f..abbf850496cb34dc2968a5f9c2dcc5f106cb1d96 100644 (file)
@@ -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
index 46cc9731eba2290ecacf585ff5d91ed9bcbc8a09..b7192c07768a05224f841efc12e84ed24f1bcedf 100644 (file)
@@ -678,7 +678,7 @@ mymain(void)
             QEMU_CAPS_SCSI_BLOCK,
             QEMU_CAPS_SCSI_CD,
             QEMU_CAPS_IDE_CD);
-    DO_TEST("qemu-1.1", 1000092, 0, 0,
+    DO_TEST("qemu-1.1.0", 1001000, 0, 0,
             QEMU_CAPS_VNC_COLON,
             QEMU_CAPS_NO_REBOOT,
             QEMU_CAPS_DRIVE,