External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: refactor cpu and hypervisor feature parser/formatter

Browse Source 
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jim Fehlig 2020-04-15 21:48:42 -06:00
parent 9529e0077a
commit 9cb8bc6ff1
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libxl/xen_common.c
View File

@ -493,15 +493,12 @@ xenParsePCIList(virConfPtr conf, virDomainDefPtr def)
static int static int
xenParseCPUFeatures(virConfPtr conf, xenParseCPU(virConfPtr conf,
virDomainDefPtr def, virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
unsigned long count = 0; unsigned long count = 0;
g_autofree char *cpus = NULL; g_autofree char *cpus = NULL;
g_autofree char *tsc_mode = NULL;
int val = 0;
virDomainTimerDefPtr timer;
if (xenConfigGetULong(conf, "vcpus", &count, 1) < 0) if (xenConfigGetULong(conf, "vcpus", &count, 1) < 0)
return -1; return -1;
@ -526,6 +523,17 @@ xenParseCPUFeatures(virConfPtr conf,
if (cpus && (virBitmapParse(cpus, &def->cpumask, 4096) < 0)) if (cpus && (virBitmapParse(cpus, &def->cpumask, 4096) < 0))
return -1; return -1;
return 0;
}
static int
xenParseHypervisorFeatures(virConfPtr conf, virDomainDefPtr def)
{
g_autofree char *tsc_mode = NULL;
virDomainTimerDefPtr timer;
int val = 0;
if (xenConfigGetString(conf, "tsc_mode", &tsc_mode, NULL) < 0) if (xenConfigGetString(conf, "tsc_mode", &tsc_mode, NULL) < 0)
return -1; return -1;
@ -552,27 +560,26 @@ xenParseCPUFeatures(virConfPtr conf,
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
if (xenConfigGetBool(conf, "pae", &val, 1) < 0) if (xenConfigGetBool(conf, "pae", &val, 1) < 0)
return -1; return -1;
else if (val) else if (val)
def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON;
if (xenConfigGetBool(conf, "acpi", &val, 1) < 0) if (xenConfigGetBool(conf, "acpi", &val, 1) < 0)
return -1; return -1;
else if (val) else if (val)
def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
if (xenConfigGetBool(conf, "apic", &val, 1) < 0) if (xenConfigGetBool(conf, "apic", &val, 1) < 0)
return -1; return -1;
else if (val) else if (val)
def->features[VIR_DOMAIN_FEATURE_APIC] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_APIC] = VIR_TRISTATE_SWITCH_ON;
if (xenConfigGetBool(conf, "hap", &val, 1) < 0) if (xenConfigGetBool(conf, "hap", &val, 1) < 0)
return -1; return -1;
else if (!val) else if (!val)
def->features[VIR_DOMAIN_FEATURE_HAP] = VIR_TRISTATE_SWITCH_OFF; def->features[VIR_DOMAIN_FEATURE_HAP] = VIR_TRISTATE_SWITCH_OFF;
if (xenConfigGetBool(conf, "viridian", &val, 0) < 0) if (xenConfigGetBool(conf, "viridian", &val, 0) < 0)
return -1; return -1;
else if (val) else if (val)
def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] = VIR_TRISTATE_SWITCH_ON;
@ -1483,7 +1490,10 @@ xenParseConfigCommon(virConfPtr conf,
if (xenParseEventsActions(conf, def) < 0) if (xenParseEventsActions(conf, def) < 0)
return -1; return -1;
if (xenParseCPUFeatures(conf, def, xmlopt) < 0) if (xenParseCPU(conf, def, xmlopt) < 0)
return -1;
if (xenParseHypervisorFeatures(conf, def) < 0)
return -1; return -1;
if (xenParseTimeOffset(conf, def) < 0) if (xenParseTimeOffset(conf, def) < 0)
@ -2115,7 +2125,7 @@ xenFormatCPUAllocation(virConfPtr conf, virDomainDefPtr def)
static int static int
xenFormatCPUFeatures(virConfPtr conf, virDomainDefPtr def) xenFormatHypervisorFeatures(virConfPtr conf, virDomainDefPtr def)
{ {
size_t i; size_t i;
bool hvm = !!(def->os.type == VIR_DOMAIN_OSTYPE_HVM); bool hvm = !!(def->os.type == VIR_DOMAIN_OSTYPE_HVM);
@ -2423,7 +2433,7 @@ xenFormatConfigCommon(virConfPtr conf,
if (xenFormatCPUAllocation(conf, def) < 0) if (xenFormatCPUAllocation(conf, def) < 0)
return -1; return -1;
if (xenFormatCPUFeatures(conf, def) < 0) if (xenFormatHypervisorFeatures(conf, def) < 0)
return -1; return -1;
if (xenFormatTimeOffset(conf, def) < 0) if (xenFormatTimeOffset(conf, def) < 0)