From e08479efcac3575fdb11d374fd4aa4f0cde6775d Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 27 Apr 2016 14:40:23 +0200 Subject: [PATCH] qemu: perf: Don't ignore perf setup if allocation fails Reject the VM startup if the perf event structure can't be allocated. --- src/qemu/qemu_process.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4a7c141b93..4dd0fc37f9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5410,12 +5410,12 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuSetupCgroup(driver, vm, nnicindexes, nicindexes) < 0) goto cleanup; - priv->perf = virPerfNew(); - if (priv->perf) { - for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { - if (vm->def->perf->events[i] == VIR_TRISTATE_BOOL_YES) - virPerfEventEnable(priv->perf, i, vm->pid); - } + if (!(priv->perf = virPerfNew())) + goto cleanup; + + for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { + if (vm->def->perf->events[i] == VIR_TRISTATE_BOOL_YES) + virPerfEventEnable(priv->perf, i, vm->pid); } /* This must be done after cgroup placement to avoid resetting CPU