[libvirt PATCH v4 12/31] Generalize qemuDomainLogContextNew()
Allow to specify a basename for the log file so that
qemuDomainLogContextNew() can be used to create log contexts for
secondary loggers.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/qemu/qemu_domain.c | 5 +++--
src/qemu/qemu_domain.h | 3 ++-
src/qemu/qemu_process.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b01f035718..8961efa804 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6791,7 +6791,8 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver,
qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver,
- virDomainObj *vm)
+ virDomainObj *vm,
+ const char *basename)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
qemuDomainLogContext *ctxt =
QEMU_DOMAIN_LOG_CONTEXT(g_object_new(QEMU_TYPE_DOMAIN_LOG_CONTEXT, NULL));
@@ -6800,7 +6801,7 @@ qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver
*driver,
ctxt->writefd = -1;
ctxt->readfd = -1;
- ctxt->path = g_strdup_printf("%s/%s.log", cfg->logDir,
vm->def->name);
+ ctxt->path = g_strdup_printf("%s/%s.log", cfg->logDir, basename);
if (cfg->stdioLogD) {
ctxt->manager = virLogManagerNew(driver->privileged);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 37482a59f3..2a01c7e631 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -658,7 +658,8 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver,
qemuDomainLogContext *logCtxt);
qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver,
- virDomainObj *vm);
+ virDomainObj *vm,
+ const char *basename);
int qemuDomainLogContextWrite(qemuDomainLogContext *ctxt,
const char *fmt, ...) G_GNUC_PRINTF(2, 3);
ssize_t qemuDomainLogContextRead(qemuDomainLogContext *ctxt,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index fb3369b6a5..a2118c4f09 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7683,7 +7683,7 @@ qemuProcessLaunch(virConnectPtr conn,
hookData.cfg = cfg;
VIR_DEBUG("Creating domain log file");
- if (!(logCtxt = qemuDomainLogContextNew(driver, vm))) {
+ if (!(logCtxt = qemuDomainLogContextNew(driver, vm, vm->def->name))) {
virLastErrorPrefixMessage("%s", _("can't connect to
virtlogd"));
goto cleanup;
}
--
2.39.0