From 8d8a7e7db26c44f0765c428f669926d33944b269 Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Thu, 21 Jan 2021 13:51:34 -0500 Subject: [PATCH] hyperv: use g_auto for WsXmlDocH in hypervDomainAttachVirtualDisk Signed-off-by: Matt Coleman Reviewed-by: Laine Stump --- src/hyperv/hyperv_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 2c0e9e0614..b81cedf426 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -496,9 +496,8 @@ hypervDomainAttachVirtualDisk(virDomainPtr domain, Msvm_ResourceAllocationSettingData *controller, const char *hostname) { - int result = -1; g_autofree char *parentInstanceID = NULL; - WsXmlDocH response = NULL; + g_auto(WsXmlDocH) response = NULL; VIR_DEBUG("Now attaching disk image '%s' with address %d to bus %d of type %d", disk->src->path, disk->info.addr.drive.unit, disk->info.addr.drive.controller, disk->bus); @@ -513,17 +512,12 @@ hypervDomainAttachVirtualDisk(virDomainPtr domain, parentInstanceID = hypervGetInstanceIDFromXMLResponse(response); if (!parentInstanceID) - goto cleanup; + return -1; if (hypervDomainAddVirtualHardDisk(domain, disk, hostname, parentInstanceID) < 0) - goto cleanup; + return -1; - result = 0; - - cleanup: - ws_xml_destroy_doc(response); - - return result; + return 0; }