static int
qemuDomainSetupLoader(virDomainObjPtr vm,
- const struct qemuDomainCreateDeviceData *data)
+ char ***paths)
{
virDomainLoaderDefPtr loader = vm->def->os.loader;
if (loader) {
switch ((virDomainLoader) loader->type) {
case VIR_DOMAIN_LOADER_TYPE_ROM:
- if (qemuDomainCreateDevice(loader->path, data, false) < 0)
+ if (virStringListAdd(paths, loader->path) < 0)
return -1;
break;
case VIR_DOMAIN_LOADER_TYPE_PFLASH:
- if (qemuDomainCreateDevice(loader->path, data, false) < 0)
+ if (virStringListAdd(paths, loader->path) < 0)
return -1;
if (loader->nvram &&
- qemuDomainCreateDevice(loader->nvram, data, false) < 0)
+ virStringListAdd(paths, loader->nvram) < 0)
return -1;
break;
if (qemuDomainSetupAllRNGs(vm, &paths) < 0)
return -1;
+ if (qemuDomainSetupLoader(vm, &paths) < 0)
+ return -1;
+
if (qemuNamespaceMknodPaths(vm, (const char **) paths) < 0)
return -1;
if (qemuDomainSetupDev(mgr, vm, devPath) < 0)
goto cleanup;
- if (qemuDomainSetupLoader(vm, &data) < 0)
- goto cleanup;
-
if (qemuDomainSetupLaunchSecurity(vm, &data) < 0)
goto cleanup;