On 12/04/2015 12:26 PM, Daniel P. Berrange wrote:
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 <berrange(a)redhat.com>
---
src/qemu/qemu_process.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index b35fc69..e974989 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4091,16 +4091,18 @@ 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",
Maybe put a space between hostname: and %s?
ACK.
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 +4112,7 @@ qemuLogOperation(virDomainObjPtr vm,
}
cleanup:
+ VIR_FREE(hostname);
VIR_FREE(timestamp);
}