mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-21 19:02:25 +00:00
qemu: Move entry points close together
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
parent
e74d87c43b
commit
cc132636fc
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user