SHA256
1
0
forked from pool/libvirt

fix build broken by last patch added

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=814
This commit is contained in:
James Fehlig 2020-03-18 20:40:22 +00:00 committed by Git OBS Bridge
parent 770cfbf6c2
commit 07ddfb63d6

View File

@ -254,37 +254,6 @@ Index: libvirt-6.1.0/tests/qemuhotplugmock.c
+qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED) +qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED)
+{ +{
+} +}
Index: libvirt-6.1.0/tests/qemuhotplugtest.c
===================================================================
--- libvirt-6.1.0.orig/tests/qemuhotplugtest.c
+++ libvirt-6.1.0/tests/qemuhotplugtest.c
@@ -87,6 +87,8 @@ qemuHotplugCreateObjects(virDomainXMLOpt
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VNC);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_BLOCK);
if (qemuTestCapsCacheInsert(driver.qemuCapsCache, priv->qemuCaps) < 0)
return -1;
@@ -748,6 +750,17 @@ mymain(void)
"device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
"human-monitor-command", HMP(""));
+ DO_TEST_ATTACH("base-live", "disk-scsi-multipath", false, true,
+ "object-add", QMP_OK,
+ "human-monitor-command", HMP("OK\\r\\n"),
+ "device_add", QMP_OK);
+ DO_TEST_DETACH("base-live", "disk-scsi-multipath", true, true,
+ "device_del", QMP_OK,
+ "human-monitor-command", HMP(""));
+ DO_TEST_DETACH("base-live", "disk-scsi-multipath", false, false,
+ "device_del", QMP_DEVICE_DELETED("scsi0-0-0-0") QMP_OK,
+ "human-monitor-command", HMP(""));
+
DO_TEST_ATTACH("base-live", "qemu-agent", false, true,
"chardev-add", QMP_OK,
"device_add", QMP_OK);
Index: libvirt-6.1.0/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml Index: libvirt-6.1.0/tests/qemuhotplugtestdevices/qemuhotplug-disk-scsi-multipath.xml
=================================================================== ===================================================================
--- /dev/null --- /dev/null