Enable blockdev mode and convert the expected commands to the modern
equivalents in preparation for removing the old-style hotplug code
paths.
Signed-off-by: Peter Krempa
---
tests/qemuhotplugtest.c | 75 ---
.../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +-
...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 +-
...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +-
...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +-
...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +-
.../qemuhotplug-base-live+cdrom-scsi.xml | 2 +-
.../qemuhotplug-base-live+cdrom-usb.xml | 2 +-
...uhotplug-base-live+disk-scsi-multipath.xml | 2 +-
...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 2 +-
.../qemuhotplug-base-live+disk-scsi.xml | 2 +-
.../qemuhotplug-base-live+disk-usb.xml| 2 +-
.../qemuhotplug-base-live+disk-virtio.xml | 2 +-
...thout-scsi-controller-live+disk-scsi-2.xml | 2 +-
14 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index c938c8dc4c..5edcf3d989 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -73,6 +73,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
virQEMUCapsInitQMPBasicArch(priv->qemuCaps);
+virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW);
@@ -670,7 +671,6 @@ mymain(void)
#define QMP_OK "{\"return\": {}}"
-#define HMP(msg)"{\"return\": \"" msg "\"}"
#define QMP_DEVICE_DELETED(dev) \
"{" \
@@ -707,31 +707,37 @@ mymain(void)
"chardev-remove", QMP_OK, "query-fdsets", "{\"return\":
[]}");
DO_TEST_ATTACH("base-live", "disk-virtio", false, true,
- "human-monitor-command", HMP("OK\\r\\n"),
+ "blockdev-add", QMP_OK,
+ "blockdev-add", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-live", "disk-virtio", true, true,
"device_del", QMP_OK);
DO_TEST_DETACH("base-live", "disk-virtio", false, false,
"device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK,
- "human-monitor-command", HMP(""));
+ "blockdev-del", QMP_OK,
+ "blockdev-del", QMP_OK);
DO_TEST_ATTACH("base-live", "disk-usb", false, true,
- "human-monitor-command", HMP("OK\\r\\n"),
+ "blockdev-add", QMP_OK,
+ "blockdev-add", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-live", "disk-usb", true, true,
"device_del", QMP_OK);
DO_TEST_DETACH("base-live", "disk-usb", false, false,
"device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK,
- "human-monitor-command", HMP(""));
+ "blockdev-del", QMP_OK,
+ "blockdev-del", QMP_OK);
DO_TEST_ATTACH("base-live", "disk-scsi", false, true,
- "human-monitor-command", HMP("OK\\r\\n"),
+ "blockdev-add", QMP_OK,
+ "blockdev-add", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-live", "disk-scsi", true, true,
"device_del", QMP_OK);
DO_TEST_DETACH("base-live", "disk-scsi", false, false,
"device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK,
- "human-monitor-command", HMP(""));
+ "blockdev-del", QMP_OK,
+ "blockdev-del", QMP_OK);
DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false,
true,
/* Four controllers added */
@@ -739,24 +745,27 @@ mymain(void)
"device_add", QMP_OK,
"device_add", QMP_OK,
"device_add", QMP_OK,
- "human-monitor-command", HMP("OK\\r\\n"),
- /* Disk added */
+ "blockdev-add", QMP_OK,
+ "blockdev-add", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", true, true,
"device_del", QMP_OK);
DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false,
false,
"device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
- "human-monitor-command", HMP(""));
+ "blockdev-del", QMP_OK,
+ "blockdev-del", QMP_OK);
DO_TEST_ATTACH("base-live", "disk-scsi-multipath", false, true,
"object-add", QMP_OK,
- "human-monitor-command", HMP("OK\\r\\n"),
+ "blockdev-add", QMP_OK,
+ "blockdev-add", QMP_OK,
"device_add", QMP_OK);
