[PATCH 4/4] tests: Reflect changed channelTargetDir
In the previous commit, the channelTargetDir was changed. But
since we override this path in qemuTestDriverInit() (so that it's
stable and independent of user running tests), reflect the new
location there too.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml | 2 +-
.../qemuhotplug-base-live+qemu-agent-detach.xml | 2 +-
.../qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml | 2 +-
tests/testutilsqemu.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml
b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml
index 7871de59c4..dd4feae855 100644
--- a/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-qemu-agent-detach.xml
@@ -1,5 +1,5 @@
<channel type='unix'>
- <source mode='bind'
path='/var/lib/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
+ <source mode='bind'
path='/var/run/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
<target type='virtio' name='org.qemu.guest_agent.0'/>
<address type='virtio-serial' controller='0' bus='0'
port='1'/>
</channel>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
index bf2afb67d9..cfa7509485 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml
@@ -39,7 +39,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<channel type='unix'>
- <source mode='bind'
path='/var/lib/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
+ <source mode='bind'
path='/var/run/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
<target type='virtio' name='org.qemu.guest_agent.0'/>
<alias name='channel0'/>
<address type='virtio-serial' controller='0' bus='0'
port='1'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
index 00191a9cb8..eb543dbaf4 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
@@ -42,7 +42,7 @@
<address type='pci' domain='0x0000' bus='0x00'
slot='0x04' function='0x0'/>
</controller>
<channel type='unix'>
- <source mode='bind'
path='/var/lib/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
+ <source mode='bind'
path='/var/run/libvirt/qemu/channel/7-hotplug/org.qemu.guest_agent.0'/>
<target type='virtio' name='org.qemu.guest_agent.0'/>
<alias name='channel0'/>
<address type='virtio-serial' controller='0' bus='0'
port='1'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 46e3dff010..2dd63adc3f 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -461,7 +461,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
VIR_FREE(cfg->libDir);
cfg->libDir = g_strdup("/var/lib/libvirt/qemu");
VIR_FREE(cfg->channelTargetDir);
- cfg->channelTargetDir = g_strdup("/var/lib/libvirt/qemu/channel");
+ cfg->channelTargetDir = g_strdup("/var/run/libvirt/qemu/channel");
VIR_FREE(cfg->memoryBackingDir);
cfg->memoryBackingDir = g_strdup("/var/lib/libvirt/qemu/ram");
VIR_FREE(cfg->nvramDir);
--
2.41.0