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

perf: reenable perf events when libvirtd restart

Browse Source 
When libvirtd daemon restart, this patch will reenable those perf
events previously enabled.

Signed-off-by: Qiaowei Ren <qiaowei.ren@intel.com>
Message-id: 1459171833-26416-7-git-send-email-qiaowei.ren@intel.com
This commit is contained in:
Qiaowei Ren 2016-03-28 21:30:31 +08:00 committed by Daniel P. Berrange
parent afe833e9bd
commit bf9bc04683
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/qemu/qemu_process.c
View File

@ -3419,6 +3419,34 @@ qemuProcessUpdateDevices(virQEMUDriverPtr driver,
return ret; return ret;
} }
static int
qemuDomainPerfRestart(virDomainObjPtr vm)
{
size_t i;
virDomainDefPtr def = vm->def;
qemuDomainObjPrivatePtr priv = vm->privateData;
virPerfFree(priv->perf);
priv->perf = virPerfNew();
if (!priv->perf)
return -1;
for (i = 0; i < VIR_PERF_EVENT_LAST; i++) {
if (def->perf->events[i] &&
def->perf->events[i] == VIR_TRISTATE_BOOL_YES) {
if (virPerfEventEnable(priv->perf, i, vm->pid))
goto cleanup;
}
}
return 0;
cleanup:
virPerfFree(priv->perf);
return -1;
}
struct qemuProcessReconnectData { struct qemuProcessReconnectData {
virConnectPtr conn; virConnectPtr conn;
virQEMUDriverPtr driver; virQEMUDriverPtr driver;
@ -3495,6 +3523,9 @@ qemuProcessReconnect(void *opaque)
if (qemuConnectCgroup(driver, obj) < 0) if (qemuConnectCgroup(driver, obj) < 0)
goto error; goto error;
if (qemuDomainPerfRestart(obj) < 0)
goto error;
/* XXX: Need to change as long as lock is introduced for /* XXX: Need to change as long as lock is introduced for
* qemu_driver->sharedDevices. * qemu_driver->sharedDevices.
*/ */
@ -6090,6 +6121,9 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0) if (virSecurityManagerGenLabel(driver->securityManager, vm->def) < 0)
goto error; goto error;
if (qemuDomainPerfRestart(vm) < 0)
goto error;
VIR_DEBUG("Creating domain log file"); VIR_DEBUG("Creating domain log file");
if (!(logCtxt = qemuDomainLogContextNew(driver, vm, if (!(logCtxt = qemuDomainLogContextNew(driver, vm,
QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH))) QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH)))