qemu: End job even if exiting monitor after OpenGraphics(FD) fails

Signed-off-by: N Luyao Huang <lhuang@redhat.com>

qemu: End job even if exiting monitor after OpenGraphics(FD) fails
Signed-off-by: N Luyao Huang <lhuang@redhat.com>
91c9e4d9 · Luyao Huang · Martin Kletzander · 224456fc · 91c9e4d9
隐藏空白更改
内联并排

Showing with 2 addition and 6 deletion

src/qemu/qemu_driver.c src/qemu/qemu_driver.c +2 -6

未找到文件。
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -17265,10 +17265,8 @@ qemuDomainOpenGraphics(virDomainPtr dom,
    qemuDomainObjEnterMonitor(driver, vm);
    ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd",
                                  (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0);
-    if (qemuDomainObjExitMonitor(driver, vm) < 0) {
+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
        ret = -1;
-        goto cleanup;
-    }
    qemuDomainObjEndJob(driver, vm);

 cleanup:
@@ -17337,10 +17335,8 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom,
    qemuDomainObjEnterMonitor(driver, vm);
    ret = qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphicsfd",
                                  (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH));
-    if (qemuDomainObjExitMonitor(driver, vm) < 0) {
+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
        ret = -1;
-        goto cleanup;
-    }
    qemuDomainObjEndJob(driver, vm);
    if (ret < 0)
        goto cleanup;