From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 11 Feb 2022 08:28:11 +0000 (+0100)
Subject: qemuPrepareNVRAM: Switch to VIR_AUTOCLOSE
X-Git-Tag: v8.1.0-rc1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ddb3bf0e1a9beef5957a8251b32d07260879335;p=thirdparty%2Flibvirt.git

qemuPrepareNVRAM: Switch to VIR_AUTOCLOSE

Nothing inside the qemuPrepareNVRAM function relies on @srcFD
being closed early and nothing closes it early. It's okay then to
close it automatically when leaving the function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 036d95924c..0ba9343b2a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4463,7 +4463,7 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     int ret = -1;
-    int srcFD = -1;
+    VIR_AUTOCLOSE srcFD = -1;
     virDomainLoaderDef *loader = vm->def->os.loader;
     const char *master_nvram_path;
     struct qemuPrepareNVRAMHelperData data;
@@ -4511,7 +4511,6 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
 
     ret = 0;
  cleanup:
-    VIR_FORCE_CLOSE(srcFD);
     return ret;
 }