[libvirt PATCH v5 11/32] qemu: remove unused 'mode' param from qemuDomainLogContextNew()
The only use of this function always passes
QEMU_DOMAIN_LOG_CONTEXT_MODE_START. The other enum values are never used
anywhere in the code. Remove them.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain.c | 26 +++++++++++---------------
src/qemu/qemu_domain.h | 9 +--------
src/qemu/qemu_process.c | 3 +--
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 15fb3d5b1a..4c882840b2 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6878,8 +6878,7 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver,
qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver,
- virDomainObj *vm,
- qemuDomainLogContextMode mode)
+ virDomainObj *vm)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
qemuDomainLogContext *ctxt =
QEMU_DOMAIN_LOG_CONTEXT(g_object_new(QEMU_TYPE_DOMAIN_LOG_CONTEXT, NULL));
@@ -6920,25 +6919,22 @@ qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver
*driver,
/* For unprivileged startup we must truncate the file since
* we can't rely on logrotate. We don't use O_TRUNC since
* it is better for SELinux policy if we truncate afterwards */
- if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START &&
- !driver->privileged &&
+ if (!driver->privileged &&
ftruncate(ctxt->writefd, 0) < 0) {
virReportSystemError(errno, _("failed to truncate %s"),
ctxt->path);
goto error;
}
- if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START) {
- if ((ctxt->readfd = open(ctxt->path, O_RDONLY)) < 0) {
- virReportSystemError(errno, _("failed to open logfile %s"),
- ctxt->path);
- goto error;
- }
- if (virSetCloseExec(ctxt->readfd) < 0) {
- virReportSystemError(errno, _("failed to set close-on-exec flag on
%s"),
- ctxt->path);
- goto error;
- }
+ if ((ctxt->readfd = open(ctxt->path, O_RDONLY)) < 0) {
+ virReportSystemError(errno, _("failed to open logfile %s"),
+ ctxt->path);
+ goto error;
+ }
+ if (virSetCloseExec(ctxt->readfd) < 0) {
+ virReportSystemError(errno, _("failed to set close-on-exec flag on
%s"),
+ ctxt->path);
+ goto error;
}
if ((ctxt->pos = lseek(ctxt->writefd, 0, SEEK_END)) < 0) {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index c0bf646680..e39419e7af 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -659,15 +659,8 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver,
virDomainNetDef *net,
qemuDomainLogContext *logCtxt);
-typedef enum {
- QEMU_DOMAIN_LOG_CONTEXT_MODE_START,
- QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH,
- QEMU_DOMAIN_LOG_CONTEXT_MODE_STOP,
-} qemuDomainLogContextMode;
-
qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver,
- virDomainObj *vm,
- qemuDomainLogContextMode mode);
+ virDomainObj *vm);
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 d4499c6f84..039624c87b 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7669,8 +7669,7 @@ qemuProcessLaunch(virConnectPtr conn,
hookData.cfg = cfg;
VIR_DEBUG("Creating domain log file");
- if (!(logCtxt = qemuDomainLogContextNew(driver, vm,
- QEMU_DOMAIN_LOG_CONTEXT_MODE_START))) {
+ if (!(logCtxt = qemuDomainLogContextNew(driver, vm))) {
virLastErrorPrefixMessage("%s", _("can't connect to
virtlogd"));
goto cleanup;
}
--
2.39.1