|
 |
fbe740 |
From 09776b6ac6421a03fe2ff72eb6146a9ca0119259 Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <09776b6ac6421a03fe2ff72eb6146a9ca0119259@dist-git>
|
|
|
fbe740 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
Date: Thu, 16 Jan 2020 10:03:52 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemuDomainSaveImageStartVM: Use g_autoptr() for virCommand
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
fbe740 |
|
|
|
fbe740 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1718707
|
|
|
fbe740 |
|
|
|
fbe740 |
(cherry picked from commit 82e127e34350dc0ed908611a3b2a4fbd78ad9903)
|
|
|
fbe740 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
Message-Id: <5d41d06ee27842659082e67dd6abf40c3c59ae5d.1579165329.git.mprivozn@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_driver.c | 3 +--
|
|
|
fbe740 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
fbe740 |
index 9de5bc6a32..e1c0550b9a 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_driver.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_driver.c
|
|
|
fbe740 |
@@ -6804,7 +6804,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
|
|
|
fbe740 |
bool restored = false;
|
|
|
fbe740 |
virObjectEventPtr event;
|
|
|
fbe740 |
VIR_AUTOCLOSE intermediatefd = -1;
|
|
|
fbe740 |
- virCommandPtr cmd = NULL;
|
|
|
fbe740 |
+ g_autoptr(virCommand) cmd = NULL;
|
|
|
fbe740 |
g_autofree char *errbuf = NULL;
|
|
|
fbe740 |
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
|
|
fbe740 |
virQEMUSaveHeaderPtr header = &data->header;
|
|
|
fbe740 |
@@ -6920,7 +6920,6 @@ qemuDomainSaveImageStartVM(virConnectPtr conn,
|
|
|
fbe740 |
|
|
|
fbe740 |
cleanup:
|
|
|
fbe740 |
virObjectUnref(cookie);
|
|
|
fbe740 |
- virCommandFree(cmd);
|
|
|
fbe740 |
if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0)
|
|
|
fbe740 |
VIR_WARN("failed to restore save state label on %s", path);
|
|
|
fbe740 |
return ret;
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.0
|
|
|
fbe740 |
|