External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virDomainMemballoonDef: Change type of model to virDomainMemballoonModel

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-27 17:04:34 +02:00 committed by Ján Tomko
parent 38180f87f5
commit dcf5d641ec
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -13532,6 +13532,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOption *xmlopt,
g_autofree char *model = NULL; g_autofree char *model = NULL;
g_autofree char *freepage_reporting = NULL; g_autofree char *freepage_reporting = NULL;
g_autofree char *deflate = NULL; g_autofree char *deflate = NULL;
int model_value;
def = g_new0(virDomainMemballoonDef, 1); def = g_new0(virDomainMemballoonDef, 1);
@ -13542,11 +13543,12 @@ virDomainMemballoonDefParseXML(virDomainXMLOption *xmlopt,
goto error; goto error;
} }
if ((def->model = virDomainMemballoonModelTypeFromString(model)) < 0) { if ((model_value = virDomainMemballoonModelTypeFromString(model)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown memory balloon model '%s'"), model); _("unknown memory balloon model '%s'"), model);
goto error; goto error;
} }
def->model = model_value;
if ((deflate = virXMLPropString(node, "autodeflate"))) { if ((deflate = virXMLPropString(node, "autodeflate"))) {
int value; int value;

2
src/conf/domain_conf.h
View File

@ -1924,7 +1924,7 @@ typedef enum {
} virDomainMemballoonModel; } virDomainMemballoonModel;
struct _virDomainMemballoonDef { struct _virDomainMemballoonDef {
int model; virDomainMemballoonModel model;
virDomainDeviceInfo info; virDomainDeviceInfo info;
int period; /* seconds between collections */ int period; /* seconds between collections */
virTristateSwitch autodeflate; virTristateSwitch autodeflate;

8
src/libxl/libxl_conf.c
View File

@ -740,9 +740,7 @@ libxlMakeDomBuildInfo(virDomainDef *def,
/* only the 'xen' balloon device model is supported */ /* only the 'xen' balloon device model is supported */
if (def->memballoon) { if (def->memballoon) {
int model = def->memballoon->model; switch (def->memballoon->model) {
switch ((virDomainMemballoonModel)model) {
case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: case VIR_DOMAIN_MEMBALLOON_MODEL_XEN:
break; break;
case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO: case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO:
@ -750,7 +748,7 @@ libxlMakeDomBuildInfo(virDomainDef *def,
case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_NON_TRANSITIONAL: case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_NON_TRANSITIONAL:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported balloon device model '%s'"), _("unsupported balloon device model '%s'"),
virDomainMemballoonModelTypeToString(model)); virDomainMemballoonModelTypeToString(def->memballoon->model));
return -1; return -1;
case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: case VIR_DOMAIN_MEMBALLOON_MODEL_NONE:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -759,7 +757,7 @@ libxlMakeDomBuildInfo(virDomainDef *def,
return -1; return -1;
case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: case VIR_DOMAIN_MEMBALLOON_MODEL_LAST:
default: default:
virReportEnumRangeError(virDomainMemballoonModel, model); virReportEnumRangeError(virDomainMemballoonModel, def->memballoon->model);
return -1; return -1;
} }
} }

2
src/qemu/qemu_domain_address.c
View File

@ -882,7 +882,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
} }
case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_MEMBALLOON:
switch ((virDomainMemballoonModel) dev->data.memballoon->model) { switch (dev->data.memballoon->model) {
case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_TRANSITIONAL: case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_TRANSITIONAL:
/* Transitional devices only work in conventional PCI slots */ /* Transitional devices only work in conventional PCI slots */
return pciFlags; return pciFlags;

2
src/qemu/qemu_monitor.c
View File

@ -1030,7 +1030,7 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon,
switch (balloon->info.type) { switch (balloon->info.type) {
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
switch ((virDomainMemballoonModel) balloon->model) { switch (balloon->model) {
case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO: case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO:
name = "virtio-balloon-pci"; name = "virtio-balloon-pci";
break; break;