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

qemu: Make qemuTPMEmulatorCreateStorage() take a virDomainTPMDef*

Browse Source 
This matches how qemuTPMEmulatorDeleteStorage() expects to be
called.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-02-04 17:26:23 +01:00
parent b12779dc80
commit a9763e8e38
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_tpm.c
View File

@ -101,7 +101,7 @@ qemuTPMCreateEmulatorLogPath(const char *logDir,
/** /**
* qemuTPMEmulatorCreateStorage: * qemuTPMEmulatorCreateStorage:
* @storagepath: directory for swtpm's persistent state * @tpm: TPM definition for an emulator type
* @created: a pointer to a bool that will be set to true if the * @created: a pointer to a bool that will be set to true if the
* storage was created because it did not exist yet * storage was created because it did not exist yet
* @swtpm_user: The uid that needs to be able to access the directory * @swtpm_user: The uid that needs to be able to access the directory
@ -112,11 +112,12 @@ qemuTPMCreateEmulatorLogPath(const char *logDir,
* Adapt ownership of the directory and all swtpm's state files there. * Adapt ownership of the directory and all swtpm's state files there.
*/ */
static int static int
qemuTPMEmulatorCreateStorage(const char *storagepath, qemuTPMEmulatorCreateStorage(virDomainTPMDef *tpm,
bool *created, bool *created,
uid_t swtpm_user, uid_t swtpm_user,
gid_t swtpm_group) gid_t swtpm_group)
{ {
const char *storagepath = tpm->data.emulator.storagepath;
g_autofree char *swtpmStorageDir = g_path_get_dirname(storagepath); g_autofree char *swtpmStorageDir = g_path_get_dirname(storagepath);
/* allow others to cd into this dir */ /* allow others to cd into this dir */
@ -672,8 +673,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
if (!swtpm) if (!swtpm)
return NULL; return NULL;
if (qemuTPMEmulatorCreateStorage(tpm->data.emulator.storagepath, if (qemuTPMEmulatorCreateStorage(tpm, &created, swtpm_user, swtpm_group) < 0)
&created, swtpm_user, swtpm_group) < 0)
return NULL; return NULL;
if (tpm->data.emulator.hassecretuuid) if (tpm->data.emulator.hassecretuuid)