[PATCH 18/31] qemuhotplugtest: Assert QEMU_CAPS_SET_ACTION
With modern qemu we use 'set-action' instead of 'watchdog-set-action'.
Switch to it so that later qemuhotplugtest can be switched to use real
capabilities.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuhotplugtest.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 819d9215e7..5f69afc7d4 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -89,6 +89,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_BLOCK);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_KBD);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_NETDEV_VHOST_VDPA);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SET_ACTION);
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0)
return -1;
@@ -899,13 +900,13 @@ mymain(void)
);
DO_TEST_ATTACH("base-live", "watchdog", false, true,
- "watchdog-set-action", QMP_OK,
+ "set-action", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-live", "watchdog-full", false, false,
"device_del", QMP_DEVICE_DELETED("watchdog0")
QMP_OK);
DO_TEST_ATTACH("base-live", "watchdog-user-alias", false, true,
- "watchdog-set-action", QMP_OK,
+ "set-action", QMP_OK,
"device_add", QMP_OK);
DO_TEST_DETACH("base-live", "watchdog-user-alias-full", false,
false,
"device_del",
QMP_DEVICE_DELETED("ua-UserWatchdog") QMP_OK);
--
2.39.2