nvram: generate it's path in qemuDomainDefPostParse

The postParse callback is the correct place to generate default values
that should be present in offline XML.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

src/qemu/qemu_domain.c

@@ -1398,6 +1398,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
                        void *opaque)
 {
     virQEMUDriverPtr driver = opaque;
+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
     virQEMUCapsPtr qemuCaps = NULL;
     int ret = -1;
 
@@ -1413,6 +1414,15 @@ qemuDomainDefPostParse(virDomainDefPtr def,
         return ret;
     }
 
+    if (def->os.loader &&
+        def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH &&
+        def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON &&
+        !def->os.loader->nvram) {
+        if (virAsprintf(&def->os.loader->nvram, "%s/%s_VARS.fd",
+                        cfg->nvramDir, def->name) < 0)
+            goto cleanup;
+    }
+
     /* check for emulator and create a default one if needed */
     if (!def->emulator &&
         !(def->emulator = virDomainDefGetDefaultEmulator(def, caps)))

src/qemu/qemu_process.c

@@ -3931,54 +3931,20 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver,
 
 static int
 qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-                 virCapsPtr caps,
+                 virDomainObjPtr vm)
-                 virDomainObjPtr vm,
-                 bool migrated)
 {
     int ret = -1;
     int srcFD = -1;
     int dstFD = -1;
     virDomainLoaderDefPtr loader = vm->def->os.loader;
-    bool generated = false;
     bool created = false;
-
+    const char *master_nvram_path;
-    /* Unless domain has RO loader of pflash type, we have
-     * nothing to do here.  If the loader is RW then it's not
-     * using split code and vars feature, so no nvram file needs
-     * to be created. */
-    if (!loader || loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH ||
-        loader->readonly != VIR_TRISTATE_SWITCH_ON)
-        return 0;
-
-    /* If the nvram path is configured already, there's nothing
-     * we need to do. Unless we are starting the destination side
-     * of migration in which case nvram is configured in the
-     * domain XML but the file doesn't exist yet. Moreover, after
-     * the migration is completed, qemu will invoke a
-     * synchronization write into the nvram file so we don't have
-     * to take care about transmitting the real data on the other
-     * side. */
-    if (loader->nvram && !migrated)
-        return 0;
-
-    /* Autogenerate nvram path if needed.*/
-    if (!loader->nvram) {
-        if (virAsprintf(&loader->nvram,
-                        "%s/%s_VARS.fd",
-                        cfg->nvramDir, vm->def->name) < 0)
-            goto cleanup;
-
-        generated = true;
-
-        if (vm->persistent &&
-            virDomainSaveConfig(cfg->configDir, caps, vm->def) < 0)
-            goto cleanup;
-    }
-
-    if (!virFileExists(loader->nvram)) {
-        const char *master_nvram_path = loader->templt;
     ssize_t r;
 
+    if (!loader || !loader->nvram || virFileExists(loader->nvram))
+        return 0;
+
+    master_nvram_path = loader->templt;
     if (!loader->templt) {
         size_t i;
         for (i = 0; i < cfg->nloader; i++) {
@@ -4044,7 +4010,6 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
                              loader->nvram);
         goto cleanup;
     }
-    }
 
     ret = 0;
  cleanup:
@@ -4053,8 +4018,6 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
     if (ret < 0) {
         if (created)
             unlink(loader->nvram);
-        if (generated)
-            VIR_FREE(loader->nvram);
     }
 
     VIR_FORCE_CLOSE(srcFD);
@@ -4474,13 +4437,6 @@ qemuProcessInit(virQEMUDriverPtr driver,
     if (qemuProcessStartValidate(vm->def, priv->qemuCaps, migration, snap) < 0)
         goto cleanup;
 
-    /* Some things, paths, ... are generated here and we want them to persist.
-     * Fill them in prior to setting the domain def as transient. */
-    VIR_DEBUG("Generating paths");
-
-    if (qemuPrepareNVRAM(cfg, caps, vm, migration) < 0)
-        goto stop;
-
     /* Do this upfront, so any part of the startup process can add
      * runtime state to vm->def that won't be persisted. This let's us
      * report implicit runtime defaults in the XML, like vnc listen/socket
@@ -4489,6 +4445,9 @@ qemuProcessInit(virQEMUDriverPtr driver,
     if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm, true) < 0)
         goto stop;
 
+    if (qemuPrepareNVRAM(cfg, vm) < 0)
+        goto stop;
+
     vm->def->id = qemuDriverAllocateID(driver);
     qemuDomainSetFakeReboot(driver, vm, false);
     virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP);