]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemuPrepareNVRAM: Switch to VIR_AUTOCLOSE
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 11 Feb 2022 08:28:11 +0000 (09:28 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 11 Feb 2022 12:59:45 +0000 (13:59 +0100)
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>
src/qemu/qemu_process.c

index 036d95924ccfe8627eaa4db7a53fe664d3812921..0ba9343b2a033f289081391668a74525682e8bdd 100644 (file)
@@ -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;
 }