From 91c9e4d92099dab178de9f204f0fdb91028f071a Mon Sep 17 00:00:00 2001 From: Luyao Huang Date: Tue, 30 Jun 2015 11:35:13 +0800 Subject: [PATCH] qemu: End job even if exiting monitor after OpenGraphics(FD) fails Signed-off-by: Luyao Huang --- src/qemu/qemu_driver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3c8ccd21f6..1a2f8a27a9 100644 --- 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; -- GitLab