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

xenParseHypervisorFeatures: Fix memory leak

Browse Source 
Fixes:b523e22521afe733165869c9e1ae18e88536acd6
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-19 13:54:11 +02:00 committed by Laine Stump
parent 8e98c90f90
commit 4eb7c62198
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libxl/xen_common.c
View File

@ -543,14 +543,15 @@ xenParseCPU(virConf *conf,
static int static int
xenParseHypervisorFeatures(virConf *conf, virDomainDef *def) xenParseHypervisorFeatures(virConf *conf, virDomainDef *def)
{ {
g_autofree char *strval = NULL; g_autofree char *tscmode = NULL;
g_autofree char *passthrough = NULL;
virDomainTimerDef *timer; virDomainTimerDef *timer;
int val = 0; int val = 0;
if (xenConfigGetString(conf, "tsc_mode", &strval, NULL) < 0) if (xenConfigGetString(conf, "tsc_mode", &tscmode, NULL) < 0)
return -1; return -1;
if (strval) { if (tscmode) {
VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1); VIR_EXPAND_N(def->clock.timers, def->clock.ntimers, 1);
timer = g_new0(virDomainTimerDef, 1); timer = g_new0(virDomainTimerDef, 1);
@ -559,37 +560,38 @@ xenParseHypervisorFeatures(virConf *conf, virDomainDef *def)
timer->tickpolicy = -1; timer->tickpolicy = -1;
timer->mode = VIR_DOMAIN_TIMER_MODE_AUTO; timer->mode = VIR_DOMAIN_TIMER_MODE_AUTO;
timer->track = -1; timer->track = -1;
if (STREQ_NULLABLE(strval, "always_emulate")) if (STREQ_NULLABLE(tscmode, "always_emulate"))
timer->mode = VIR_DOMAIN_TIMER_MODE_EMULATE; timer->mode = VIR_DOMAIN_TIMER_MODE_EMULATE;
else if (STREQ_NULLABLE(strval, "native")) else if (STREQ_NULLABLE(tscmode, "native"))
timer->mode = VIR_DOMAIN_TIMER_MODE_NATIVE; timer->mode = VIR_DOMAIN_TIMER_MODE_NATIVE;
else if (STREQ_NULLABLE(strval, "native_paravirt")) else if (STREQ_NULLABLE(tscmode, "native_paravirt"))
timer->mode = VIR_DOMAIN_TIMER_MODE_PARAVIRT; timer->mode = VIR_DOMAIN_TIMER_MODE_PARAVIRT;
def->clock.timers[def->clock.ntimers - 1] = timer; def->clock.timers[def->clock.ntimers - 1] = timer;
VIR_FREE(tscmode);
} }
if (xenConfigGetString(conf, "passthrough", &strval, NULL) < 0) if (xenConfigGetString(conf, "passthrough", &passthrough, NULL) < 0)
return -1; return -1;
if (strval) { if (passthrough) {
if (STREQ(strval, "disabled")) { if (STREQ(passthrough, "disabled")) {
def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_OFF; def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_OFF;
def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_OFF; def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_OFF;
} else if (STREQ(strval, "enabled")) { } else if (STREQ(passthrough, "enabled")) {
def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON;
def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON; def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON;
} else if (STREQ(strval, "sync_pt")) { } else if (STREQ(passthrough, "sync_pt")) {
def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON;
def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON; def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON;
def->xen_passthrough_mode = VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT; def->xen_passthrough_mode = VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SYNC_PT;
} else if (STREQ(strval, "share_pt")) { } else if (STREQ(passthrough, "share_pt")) {
def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_XEN] = VIR_TRISTATE_SWITCH_ON;
def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON; def->xen_features[VIR_DOMAIN_XEN_PASSTHROUGH] = VIR_TRISTATE_SWITCH_ON;
def->xen_passthrough_mode = VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT; def->xen_passthrough_mode = VIR_DOMAIN_XEN_PASSTHROUGH_MODE_SHARE_PT;
} else { } else {
virReportError(VIR_ERR_CONF_SYNTAX, virReportError(VIR_ERR_CONF_SYNTAX,
_("Invalid passthrough mode %s"), strval); _("Invalid passthrough mode %s"), passthrough);
} }
} }