On Tue, May 15, 2012 at 19:13:37 +0200, Marc-André Lureau wrote:
Generated with qemu-system-x86_64 -device ? -device
virtio-blk-pci,?
-device virtio-net-pci,? 2> tests/qemuhelpdata/qemu-1.1-device
This command line is actually incomplete. Libvirt uses the following:
qemu-system-x86_64 -device ? -device pci-assign,? -device
virtio-blk-pci,? -device virtio-net-pci,? -device scsi-disk,?
Anyway, as I said -rc0 is not the best source since this command will only
produce a single line (IIRC) and I needed the output of 1.1-rc2 for another
patch so I used that to fill qemu-1.1{,-device} files. -rc2 is also the first
one to fix that annoying -device something,? bug which means libvirt is able
to detect everything it cares about.
Thus, you can just drop this patch from your series and squash
diff --git i/tests/qemuhelptest.c w/tests/qemuhelptest.c
index 57d1859..46cc973 100644
--- i/tests/qemuhelptest.c
+++ w/tests/qemuhelptest.c
@@ -752,7 +752,8 @@ mymain(void)
QEMU_CAPS_SCSI_BLOCK,
QEMU_CAPS_SCSI_CD,
QEMU_CAPS_IDE_CD,
- QEMU_CAPS_NO_USER_CONFIG);
+ QEMU_CAPS_NO_USER_CONFIG,
+ QEMU_CAPS_HDA_MICRO);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
into 1/9 instead :-)
And I will take care of updating the files with 1.1 output once it's released.
Jirka