提交 45c7b9e6 编写于 作者: D Daniel P. Berrange

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: NDaniel P. Berrange <berrange@redhat.com>
上级 bf02b123
...@@ -4091,16 +4091,19 @@ qemuLogOperation(virDomainObjPtr vm, ...@@ -4091,16 +4091,19 @@ qemuLogOperation(virDomainObjPtr vm,
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps);
const char *package = virQEMUCapsGetPackage(priv->qemuCaps); const char *package = virQEMUCapsGetPackage(priv->qemuCaps);
char *hostname = virGetHostname();
if ((timestamp = virTimeStringNow()) == NULL) if ((timestamp = virTimeStringNow()) == NULL)
goto cleanup; 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, timestamp, msg, VIR_LOG_VERSION_STRING,
(qemuVersion / 1000000) % 1000, (qemuVersion / 1000000) % 1000,
(qemuVersion / 1000) % 1000, (qemuVersion / 1000) % 1000,
qemuVersion % 1000, qemuVersion % 1000,
package ? package : "") < 0) package ? package : "",
hostname ? hostname : "") < 0)
goto cleanup; goto cleanup;
if (cmd) { if (cmd) {
...@@ -4110,6 +4113,7 @@ qemuLogOperation(virDomainObjPtr vm, ...@@ -4110,6 +4113,7 @@ qemuLogOperation(virDomainObjPtr vm,
} }
cleanup: cleanup:
VIR_FREE(hostname);
VIR_FREE(timestamp); VIR_FREE(timestamp);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册