mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
virDomainSmartcardDef: Declare 'type' as virDomainSmartcardType
Use 'virXMLPropEnum' to parse it and fix all switch statements which didn't include the VIR_DOMAIN_SMARTCARD_TYPE_LAST case. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
3c819a6ce8
commit
43d48eebf9
@ -2884,6 +2884,7 @@ void virDomainSmartcardDefFree(virDomainSmartcardDef *def)
|
||||
virObjectUnref(def->data.passthru);
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@ -11602,7 +11603,6 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt,
|
||||
unsigned int flags)
|
||||
{
|
||||
g_autoptr(virDomainSmartcardDef) def = NULL;
|
||||
g_autofree char *mode = NULL;
|
||||
g_autofree char *type = NULL;
|
||||
g_autofree xmlNodePtr *certificates = NULL;
|
||||
int n = 0;
|
||||
@ -11611,18 +11611,9 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt,
|
||||
ctxt->node = node;
|
||||
def = g_new0(virDomainSmartcardDef, 1);
|
||||
|
||||
mode = virXMLPropString(node, "mode");
|
||||
if (mode == NULL) {
|
||||
virReportError(VIR_ERR_XML_ERROR, "%s",
|
||||
_("missing smartcard device mode"));
|
||||
if (virXMLPropEnum(node, "mode", virDomainSmartcardTypeFromString,
|
||||
VIR_XML_PROP_REQUIRED, &def->type) < 0)
|
||||
return NULL;
|
||||
}
|
||||
if ((def->type = virDomainSmartcardTypeFromString(mode)) < 0) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("unknown smartcard device mode: %s"),
|
||||
mode);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
switch (def->type) {
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_HOST:
|
||||
@ -11687,9 +11678,9 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *xmlopt,
|
||||
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||||
_("unknown smartcard mode"));
|
||||
virReportEnumRangeError(virDomainSmartcardType, def->type);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -25406,9 +25397,9 @@ virDomainSmartcardDefFormat(virBuffer *buf,
|
||||
virDomainChrSourceDefFormat(&childBuf, def->data.passthru, flags);
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("unexpected smartcard type %d"), def->type);
|
||||
virReportEnumRangeError(virDomainSmartcardType, def->type);
|
||||
return -1;
|
||||
}
|
||||
virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
|
||||
|
@ -1320,7 +1320,7 @@ typedef enum {
|
||||
#define VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE "/etc/pki/nssdb"
|
||||
|
||||
struct _virDomainSmartcardDef {
|
||||
int type; /* virDomainSmartcardType */
|
||||
virDomainSmartcardType type;
|
||||
union {
|
||||
/* no extra data for 'host' */
|
||||
struct {
|
||||
|
@ -9146,6 +9146,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManager,
|
||||
smartcard->info.alias);
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportEnumRangeError(virDomainSmartcardType, smartcard->type);
|
||||
return -1;
|
||||
|
@ -2117,6 +2117,7 @@ qemuValidateDomainSmartcardDef(const virDomainSmartcardDef *def,
|
||||
return -1;
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportEnumRangeError(virDomainSmartcardType, def->type);
|
||||
return -1;
|
||||
|
@ -2696,10 +2696,9 @@ virSecuritySELinuxRestoreSecuritySmartcardCallback(virDomainDef *def,
|
||||
return virSecuritySELinuxRestoreChardevLabel(mgr, def,
|
||||
dev->data.passthru, false);
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("unknown smartcard type %d"),
|
||||
dev->type);
|
||||
virReportEnumRangeError(virDomainSmartcardType, dev->type);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -3103,10 +3102,9 @@ virSecuritySELinuxSetSecuritySmartcardCallback(virDomainDef *def,
|
||||
return virSecuritySELinuxSetChardevLabel(mgr, def,
|
||||
dev->data.passthru, false);
|
||||
|
||||
case VIR_DOMAIN_SMARTCARD_TYPE_LAST:
|
||||
default:
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("unknown smartcard type %d"),
|
||||
dev->type);
|
||||
virReportEnumRangeError(virDomainSmartcardType, dev->type);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user