From 00b81636c557c01e808b5abf2f1ae26295804c60 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 3 Sep 2012 16:52:27 +0200 Subject: [PATCH] qemu: Don't update graphic definitions on password change failure When the password change failed we updated the graphic definition anyways, which is not desired. --- src/qemu/qemu_hotplug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1251d6bc09..a8a904c24f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1517,6 +1517,8 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, VIR_DOMAIN_GRAPHICS_TYPE_VNC, &dev->data.vnc.auth, driver->vncPassword); + if (ret < 0) + return ret; /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.vnc.auth.passwd); @@ -1576,6 +1578,9 @@ qemuDomainChangeGraphics(struct qemud_driver *driver, &dev->data.spice.auth, driver->spicePassword); + if (ret < 0) + return ret; + /* Steal the new dev's char * reference */ VIR_FREE(olddev->data.spice.auth.passwd); olddev->data.spice.auth.passwd = dev->data.spice.auth.passwd;