From: Erik Skultety <eskultet@redhat.com>
Date: Mon, 18 Jun 2018 07:20:12 +0000 (+0200)
Subject: qemu: sev: Use EnterMonitor instead of EnterMonitorAsync
X-Git-Tag: v4.5.0-rc1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54c54b56f4648f682a7a4401352b8abc25e2be9c;p=thirdparty%2Flibvirt.git

qemu: sev: Use EnterMonitor instead of EnterMonitorAsync

Since it's being called with QEMU_ASYNC_JOB_NONE which is what
qemuDomainObjEnterMonitor is going to use with the internal helper,
let's use that one instead.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3abbe41895..0c790c14bb 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -21518,9 +21518,7 @@ qemuDomainGetSEVMeasurement(virQEMUDriverPtr driver,
     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
         return -1;
 
-    if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
-        goto endjob;
-
+    qemuDomainObjEnterMonitor(driver, vm);
     tmp = qemuMonitorGetSEVMeasurement(QEMU_DOMAIN_PRIVATE(vm)->mon);
     if (tmp == NULL)
         goto endjob;