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 --- Pushed as trivial. tests/qemuhelpdata/{qemu-1.1 => qemu-1.1.0} | 2 +- tests/qemuhelpdata/{qemu-1.1-device => qemu-1.1.0-device} | 2 +- tests/qemuhelptest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename tests/qemuhelpdata/{qemu-1.1 => qemu-1.1.0} (99%) rename tests/qemuhelpdata/{qemu-1.1-device => qemu-1.1.0-device} (100%) diff --git a/tests/qemuhelpdata/qemu-1.1 b/tests/qemuhelpdata/qemu-1.1.0 similarity index 99% rename from tests/qemuhelpdata/qemu-1.1 rename to tests/qemuhelpdata/qemu-1.1.0 index 79bc8ba..761eb67 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 similarity index 100% rename from tests/qemuhelpdata/qemu-1.1-device rename to tests/qemuhelpdata/qemu-1.1.0-device index 64aacba..abbf850 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 diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 46cc973..b7192c0 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -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, -- 1.7.10.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list