External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: inline code for filling in per-VM NVRAM path

Browse Source 
Before creating a NVRAM path, the qemuDomainNVRAMPathGenerate
method checks whether the config is using the old style
firmware approach. This check is redundant in one of the two
callers. By inlining the check into the other caller, it makes
it clearer to understand that the NVRAM path filling is done
conditionally.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-02-04 14:30:38 +00:00
parent dd163b6c98
commit 08101bde5d
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_domain.c
View File

@ -4451,7 +4451,9 @@ qemuDomainDefPostParse(virDomainDef *def,
def->os.machine = g_strdup(machine);
}
qemuDomainNVRAMPathGenerate(cfg, def);
if (virDomainDefHasOldStyleROUEFI(def) &&
!def->os.loader->nvram)
qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0)
return -1;
@ -10987,16 +10989,6 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
}
void
qemuDomainNVRAMPathGenerate(virQEMUDriverConfig *cfg,
virDomainDef *def)
{
if (virDomainDefHasOldStyleROUEFI(def) &&
!def->os.loader->nvram)
qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
}
virDomainEventSuspendedDetailType
qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason)
{

4
src/qemu/qemu_domain.h
View File

@ -983,10 +983,6 @@ qemuDomainNVRAMPathFormat(virQEMUDriverConfig *cfg,
virDomainDef *def,
char **path);
void
qemuDomainNVRAMPathGenerate(virQEMUDriverConfig *cfg,
virDomainDef *def);
virDomainEventSuspendedDetailType
qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason);

7
src/qemu/qemu_firmware.c
View File

@ -1139,11 +1139,12 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
VIR_FREE(def->os.loader->templt);
def->os.loader->templt = g_strdup(flash->nvram_template.filename);
qemuDomainNVRAMPathGenerate(cfg, def);
qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram);
VIR_DEBUG("decided on firmware '%s' varstore template '%s'",
VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'",
def->os.loader->path,
def->os.loader->templt);
def->os.loader->templt,
def->os.loader->nvram);
break;
case QEMU_FIRMWARE_DEVICE_KERNEL: