From 45c7b9e636a2baf6ca9d138cad1f05943f4c56b7 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 4 Dec 2015 17:25:22 +0000 Subject: [PATCH] qemu: include hostname in QEMU log files Often when debugging bug reports one is given a copy of the file from /var/log/libvirt/qemu/$NAME.log along with other supporting files. In a number of cases I've been given sets of files which were from different machines. Including the hostname in the QEMU log file will help identify when the bug reporter is providing bad information. Signed-off-by: Daniel P. Berrange --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b35fc69753..4201962646 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4091,16 +4091,19 @@ qemuLogOperation(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); const char *package = virQEMUCapsGetPackage(priv->qemuCaps); + char *hostname = virGetHostname(); if ((timestamp = virTimeStringNow()) == NULL) goto cleanup; - if (qemuDomainLogContextWrite(logCtxt, "%s: %s %s, qemu version: %d.%d.%d%s\n", + if (qemuDomainLogContextWrite(logCtxt, + "%s: %s %s, qemu version: %d.%d.%d%s, hostname: %s\n", timestamp, msg, VIR_LOG_VERSION_STRING, (qemuVersion / 1000000) % 1000, (qemuVersion / 1000) % 1000, qemuVersion % 1000, - package ? package : "") < 0) + package ? package : "", + hostname ? hostname : "") < 0) goto cleanup; if (cmd) { @@ -4110,6 +4113,7 @@ qemuLogOperation(virDomainObjPtr vm, } cleanup: + VIR_FREE(hostname); VIR_FREE(timestamp); } -- GitLab