openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainWatchdogDef: Convert 'model' field to proper enum type 

Convert the field and adjust the XML parsers to use
virXMLPropEnum().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2023-05-02 13:43:38 +02:00
parent b691d249d1
commit a6eadf00d2
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/domain_conf.c
View File

@ -12065,21 +12065,14 @@ virDomainWatchdogDefParseXML(virDomainXMLOption *xmlopt,
unsigned int flags)
{
virDomainWatchdogDef *def;
g_autofree char *model = NULL;
g_autofree char *action = NULL;
def = g_new0(virDomainWatchdogDef, 1);
model = virXMLPropString(node, "model");
if (model == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("watchdog must contain model name"));
goto error;
}
def->model = virDomainWatchdogModelTypeFromString(model);
if (def->model < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown watchdog model '%1$s'"), model);
if (virXMLPropEnum(node, "model",
virDomainWatchdogModelTypeFromString,
VIR_XML_PROP_REQUIRED,
&def->model) < 0) {
goto error;
}

2
src/conf/domain_conf.h
View File

@ -1759,7 +1759,7 @@ typedef enum {
} virDomainWatchdogAction;
struct _virDomainWatchdogDef {
int model;
virDomainWatchdogModel model;
int action;
virDomainDeviceInfo info;
};

2
src/qemu/qemu_domain_address.c
View File

@ -927,7 +927,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
case VIR_DOMAIN_DEVICE_WATCHDOG:
/* only one model connects using PCI */
switch ((virDomainWatchdogModel) dev->data.watchdog->model) {
switch (dev->data.watchdog->model) {
case VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB:
return pciFlags;

2
src/qemu/qemu_validate.c
View File

@ -2251,7 +2251,7 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdogDef *dev,
return -1;
}
switch ((virDomainWatchdogModel) dev->model) {
switch (dev->model) {
case VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB:
if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {