From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 4 Jun 2018 09:21:51 +0000 (+0200)
Subject: tests: qemucapabilities: Reset command sequence before second probe
X-Git-Tag: v4.5.0-rc1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=215167042ac2a9ee8c37098b525da3c6f9fb8b34;p=thirdparty%2Flibvirt.git

tests: qemucapabilities: Reset command sequence before second probe

The test data for capabilities is obtained from two consecutive qemu
runs when the regular monitor object will be reset. Do the same for the
test monitor object which is not disposed between runs by calling
qemuMonitorResetCommandID.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 5a42a35c11..6981e973a6 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -24,6 +24,8 @@
 #include "qemumonitortestutils.h"
 #define __QEMU_CAPSPRIV_H_ALLOW__
 #include "qemu/qemu_capspriv.h"
+#define __QEMU_MONITOR_PRIV_H_ALLOW__
+#include "qemu/qemu_monitor_priv.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
@@ -62,6 +64,7 @@ testQemuCaps(const void *opaque)
         goto cleanup;
 
     if (virQEMUCapsGet(capsActual, QEMU_CAPS_KVM)) {
+        qemuMonitorResetCommandID(qemuMonitorTestGetMonitor(mon));
         if (virQEMUCapsInitQMPMonitorTCG(capsActual,
                                          qemuMonitorTestGetMonitor(mon)) < 0)
             goto cleanup;