External/libvirt
1
0
Fork 0
Code

qemu: Extend QEMU with tpm-spapr support

Browse Source 
Extend QEMU with tpm-spapr support. Assign a device address to the
vTPM device model.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Stefan Berger 2020-02-05 13:35:48 -05:00 committed by Ján Tomko
parent 20d9340268
commit 12fcdede80
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_command.c
View File

@ -9064,15 +9064,19 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd,
static char * static char *
qemuBuildTPMDevStr(const virDomainDef *def) qemuBuildTPMDevStr(const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{ {
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
const virDomainTPMDef *tpm = def->tpm; virDomainTPMDef *tpm = def->tpm;
const char *model = virDomainTPMModelTypeToString(tpm->model); const char *model = virDomainTPMModelTypeToString(tpm->model);
virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s", virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s",
model, tpm->info.alias, tpm->info.alias); model, tpm->info.alias, tpm->info.alias);
if (qemuBuildDeviceAddressStr(&buf, def, &tpm->info, qemuCaps) < 0)
return NULL;
return virBufferContentAndReset(&buf); return virBufferContentAndReset(&buf);
} }
@ -9162,7 +9166,8 @@ qemuBuildTPMBackendStr(const virDomainDef *def,
static int static int
qemuBuildTPMCommandLine(virCommandPtr cmd, qemuBuildTPMCommandLine(virCommandPtr cmd,
const virDomainDef *def) const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{ {
char *optstr; char *optstr;
g_autofree char *chardev = NULL; g_autofree char *chardev = NULL;
@ -9202,7 +9207,7 @@ qemuBuildTPMCommandLine(virCommandPtr cmd,
VIR_FREE(fdset); VIR_FREE(fdset);
} }
if (!(optstr = qemuBuildTPMDevStr(def))) if (!(optstr = qemuBuildTPMDevStr(def, qemuCaps)))
return -1; return -1;
virCommandAddArgList(cmd, "-device", optstr, NULL); virCommandAddArgList(cmd, "-device", optstr, NULL);
@ -9918,7 +9923,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
chardevStdioLogd) < 0) chardevStdioLogd) < 0)
return NULL; return NULL;
if (qemuBuildTPMCommandLine(cmd, def) < 0) if (qemuBuildTPMCommandLine(cmd, def, qemuCaps) < 0)
return NULL; return NULL;
if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0) if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0)

2
src/qemu/qemu_domain.c
View File

@ -7798,6 +7798,8 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
flag = QEMU_CAPS_DEVICE_TPM_CRB; flag = QEMU_CAPS_DEVICE_TPM_CRB;
break; break;
case VIR_DOMAIN_TPM_MODEL_SPAPR: case VIR_DOMAIN_TPM_MODEL_SPAPR:
flag = QEMU_CAPS_DEVICE_TPM_SPAPR;
break;
case VIR_DOMAIN_TPM_MODEL_LAST: case VIR_DOMAIN_TPM_MODEL_LAST:
default: default:
virReportEnumRangeError(virDomainTPMModel, tpm->model); virReportEnumRangeError(virDomainTPMModel, tpm->model);

9
src/qemu/qemu_domain_address.c
View File

@ -35,6 +35,7 @@ VIR_LOG_INIT("qemu.qemu_domain_address");
#define VIO_ADDR_SCSI 0x2000ul #define VIO_ADDR_SCSI 0x2000ul
#define VIO_ADDR_SERIAL 0x30000000ul #define VIO_ADDR_SERIAL 0x30000000ul
#define VIO_ADDR_NVRAM 0x3000ul #define VIO_ADDR_NVRAM 0x3000ul
#define VIO_ADDR_TPM 0x4000ul
/** /**
@ -267,6 +268,14 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
return -1; return -1;
} }
if (def->tpm) {
if (qemuDomainIsPSeries(def))
def->tpm->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
if (qemuDomainAssignSpaprVIOAddress(def, &def->tpm->info,
VIO_ADDR_TPM) < 0)
return -1;
}
/* No other devices are currently supported on spapr-vio */ /* No other devices are currently supported on spapr-vio */
return 0; return 0;