NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Use virXMLPropEnum more when parsing TPM

Browse Source 
When parsing a TPM device plenty of virXMLPropString() +
enum2int() combos are used. These can be replaced with
virXMLPropEnum().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Michal Privoznik 2022-07-18 09:00:40 +02:00
parent c8992f6d97
commit e31fc5bb2a
4 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/conf/domain_conf.c
View File

@ -10364,9 +10364,6 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
int nnodes; int nnodes;
size_t i; size_t i;
g_autofree char *path = NULL; g_autofree char *path = NULL;
g_autofree char *model = NULL;
g_autofree char *backend = NULL;
g_autofree char *version = NULL;
g_autofree char *secretuuid = NULL; g_autofree char *secretuuid = NULL;
g_autofree char *persistent_state = NULL; g_autofree char *persistent_state = NULL;
g_autofree xmlNodePtr *backends = NULL; g_autofree xmlNodePtr *backends = NULL;
@ -10375,13 +10372,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
def = g_new0(virDomainTPMDef, 1); def = g_new0(virDomainTPMDef, 1);
model = virXMLPropString(node, "model"); if (virXMLPropEnum(node, "model",
if (model != NULL && virDomainTPMModelTypeFromString,
(def->model = virDomainTPMModelTypeFromString(model)) <= 0) { VIR_XML_PROP_NONZERO,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, &def->model) < 0)
_("Unknown TPM frontend model '%s'"), model);
goto error; goto error;
}
ctxt->node = node; ctxt->node = node;
@ -10400,18 +10395,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
goto error; goto error;
} }
if (!(backend = virXMLPropString(backends[0], "type"))) { if (virXMLPropEnum(backends[0], "type",
virReportError(VIR_ERR_XML_ERROR, "%s", virDomainTPMBackendTypeFromString,
_("missing TPM device backend type")); VIR_XML_PROP_REQUIRED,
&def->type) < 0)
goto error; goto error;
}
if ((def->type = virDomainTPMBackendTypeFromString(backend)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown TPM backend type '%s'"),
backend);
goto error;
}
switch (def->type) { switch (def->type) {
case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
@ -10424,14 +10412,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
def->data.passthrough.source->data.file.path = g_steal_pointer(&path); def->data.passthrough.source->data.file.path = g_steal_pointer(&path);
break; break;
case VIR_DOMAIN_TPM_TYPE_EMULATOR: case VIR_DOMAIN_TPM_TYPE_EMULATOR:
version = virXMLPropString(backends[0], "version"); if (virXMLPropEnum(backends[0], "version",
if (version && virDomainTPMVersionTypeFromString,
(def->data.emulator.version = virDomainTPMVersionTypeFromString(version)) <= 0) { VIR_XML_PROP_NONZERO,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, &def->data.emulator.version) < 0)
_("Unsupported TPM version '%s'"),
version);
goto error; goto error;
}
if (!(def->data.emulator.source = virDomainChrSourceDefNew(xmlopt))) if (!(def->data.emulator.source = virDomainChrSourceDefNew(xmlopt)))
goto error; goto error;

6
src/conf/domain_conf.h
View File

@ -1436,15 +1436,15 @@ typedef enum {
#define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0" #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0"
struct _virDomainTPMDef { struct _virDomainTPMDef {
int type; /* virDomainTPMBackendType */ virDomainTPMModel model;
virDomainTPMBackendType type;
virDomainDeviceInfo info; virDomainDeviceInfo info;
int model; /* virDomainTPMModel */
union { union {
struct { struct {
virDomainChrSourceDef *source; virDomainChrSourceDef *source;
} passthrough; } passthrough;
struct { struct {
int version; /* virDomainTPMVersion */ virDomainTPMVersion version;
virDomainChrSourceDef *source; virDomainChrSourceDef *source;
char *storagepath; char *storagepath;
char *logfile; char *logfile;

2
src/qemu/qemu_command.c
View File

@ -9860,7 +9860,7 @@ qemuBuildTPMCommandLine(virCommand *cmd,
g_autoptr(qemuFDPass) passtpm = NULL; g_autoptr(qemuFDPass) passtpm = NULL;
g_autoptr(qemuFDPass) passcancel = NULL; g_autoptr(qemuFDPass) passcancel = NULL;
switch ((virDomainTPMBackendType) tpm->type) { switch (tpm->type) {
case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: {
VIR_AUTOCLOSE fdtpm = -1; VIR_AUTOCLOSE fdtpm = -1;
VIR_AUTOCLOSE fdcancel = -1; VIR_AUTOCLOSE fdcancel = -1;

2
src/qemu/qemu_domain.c
View File

@ -11753,7 +11753,7 @@ qemuDomainDeviceBackendChardevForeachOne(virDomainDeviceDef *dev,
return cb(dev, dev->data.rng->source.chardev, opaque); return cb(dev, dev->data.rng->source.chardev, opaque);
case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_TPM:
switch ((virDomainTPMBackendType) dev->data.tpm->type) { switch (dev->data.tpm->type) {
case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
return cb(dev, dev->data.tpm->data.passthrough.source, opaque); return cb(dev, dev->data.tpm->data.passthrough.source, opaque);