External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Move entry points close together

Browse Source 
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-02-04 19:38:46 +01:00
parent e74d87c43b
commit cc132636fc
1 changed files with 71 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/qemu/qemu_tpm.c
View File

@ -842,68 +842,6 @@ qemuExtTPMEmulatorSetupCgroup(const char *swtpmStateDir,
}
int
qemuExtTPMInitPaths(virQEMUDriver *driver,
virDomainDef *def)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
size_t i;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
return qemuTPMEmulatorInitPaths(def->tpms[i],
cfg->swtpmStorageDir,
cfg->swtpmLogDir,
def->name,
def->uuid);
}
return 0;
}
int
qemuExtTPMPrepareHost(virQEMUDriver *driver,
virDomainDef *def)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autofree char *shortName = virDomainDefGetShortName(def);
size_t i;
if (!shortName)
return -1;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
return qemuTPMEmulatorPrepareHost(def->tpms[i], cfg->swtpmLogDir,
cfg->swtpm_user,
cfg->swtpm_group,
cfg->swtpmStateDir, cfg->user,
shortName);
}
return 0;
}
void
qemuExtTPMCleanupHost(virDomainDef *def)
{
size_t i;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
qemuTPMEmulatorCleanupHost(def->tpms[i]);
}
}
/**
* qemuTPMEmulatorStart:
* @driver: QEMU driver
@ -1010,6 +948,77 @@ qemuTPMEmulatorStart(virQEMUDriver *driver,
}
/* ---------------------
* Module entry points
* ---------------------
*
* These are the public functions that will be called by other parts
* of the QEMU driver.
*/
int
qemuExtTPMInitPaths(virQEMUDriver *driver,
virDomainDef *def)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
size_t i;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
return qemuTPMEmulatorInitPaths(def->tpms[i],
cfg->swtpmStorageDir,
cfg->swtpmLogDir,
def->name,
def->uuid);
}
return 0;
}
int
qemuExtTPMPrepareHost(virQEMUDriver *driver,
virDomainDef *def)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autofree char *shortName = virDomainDefGetShortName(def);
size_t i;
if (!shortName)
return -1;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
return qemuTPMEmulatorPrepareHost(def->tpms[i], cfg->swtpmLogDir,
cfg->swtpm_user,
cfg->swtpm_group,
cfg->swtpmStateDir, cfg->user,
shortName);
}
return 0;
}
void
qemuExtTPMCleanupHost(virDomainDef *def)
{
size_t i;
for (i = 0; i < def->ntpms; i++) {
if (def->tpms[i]->type != VIR_DOMAIN_TPM_TYPE_EMULATOR)
continue;
qemuTPMEmulatorCleanupHost(def->tpms[i]);
}
}
int
qemuExtTPMStart(virQEMUDriver *driver,
virDomainObj *vm,