提交 37c0ac26 编写于 作者: D Daniel P. Berrange

qemu: remove writing to QEMU log file for rename operation

The rename operation only works on inactive virtual machines,
but it none the less writes to the log file used by the QEMU
processes. This log file is not intended to provide a general
purpose audit trail of operations performed on VMs. The audit
subsystem has recording of important operations. If we want
to extend that to cover all significant public APIs that is
a valid thing to consider, but we shouldn't arbitrarily log
specific APIs into the QEMU log file in the meantime.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 37ed4224
...@@ -19917,10 +19917,6 @@ static int qemuDomainRename(virDomainPtr dom, ...@@ -19917,10 +19917,6 @@ static int qemuDomainRename(virDomainPtr dom,
virObjectEventPtr event_new = NULL; virObjectEventPtr event_new = NULL;
virObjectEventPtr event_old = NULL; virObjectEventPtr event_old = NULL;
int ret = -1; int ret = -1;
int logfile = -1;
char ebuf[1024];
char *timestamp;
char *rename_log_msg = NULL;
char *new_dom_name = NULL; char *new_dom_name = NULL;
char *old_dom_name = NULL; char *old_dom_name = NULL;
char *old_dom_cfg_file = NULL; char *old_dom_cfg_file = NULL;
...@@ -19986,11 +19982,6 @@ static int qemuDomainRename(virDomainPtr dom, ...@@ -19986,11 +19982,6 @@ static int qemuDomainRename(virDomainPtr dom,
if (VIR_STRDUP(new_dom_name, new_name) < 0) if (VIR_STRDUP(new_dom_name, new_name) < 0)
goto endjob; goto endjob;
if (virAsprintf(&rename_log_msg, ": domain %s has been renamed to %s\n",
vm->def->name, new_name) < 0) {
goto endjob;
}
if (!(old_dom_cfg_file = virDomainConfigFile(cfg->configDir, if (!(old_dom_cfg_file = virDomainConfigFile(cfg->configDir,
vm->def->name))) { vm->def->name))) {
goto endjob; goto endjob;
...@@ -19999,9 +19990,6 @@ static int qemuDomainRename(virDomainPtr dom, ...@@ -19999,9 +19990,6 @@ static int qemuDomainRename(virDomainPtr dom,
if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0) if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0)
goto endjob; goto endjob;
if ((logfile = qemuDomainCreateLog(driver, vm, true)) < 0)
goto rollback;
event_old = virDomainEventLifecycleNewFromObj(vm, event_old = virDomainEventLifecycleNewFromObj(vm,
VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED,
VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); VIR_DOMAIN_EVENT_UNDEFINED_RENAMED);
...@@ -20029,17 +20017,6 @@ static int qemuDomainRename(virDomainPtr dom, ...@@ -20029,17 +20017,6 @@ static int qemuDomainRename(virDomainPtr dom,
VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED_RENAMED); VIR_DOMAIN_EVENT_DEFINED_RENAMED);
/* Write message to the log. */
if ((timestamp = virTimeStringNow()) != NULL) {
if (safewrite(logfile, timestamp, strlen(timestamp)) < 0 ||
safewrite(logfile, rename_log_msg,
strlen(rename_log_msg)) < 0) {
VIR_WARN("Unable to write timestamp to logfile: %s",
virStrerror(errno, ebuf, sizeof(ebuf)));
}
VIR_FREE(timestamp);
}
/* Success, domain has been renamed. */ /* Success, domain has been renamed. */
ret = 0; ret = 0;
...@@ -20047,15 +20024,10 @@ static int qemuDomainRename(virDomainPtr dom, ...@@ -20047,15 +20024,10 @@ static int qemuDomainRename(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm); qemuDomainObjEndJob(driver, vm);
cleanup: cleanup:
if (VIR_CLOSE(logfile) < 0) {
VIR_WARN("Unable to close logfile: %s",
virStrerror(errno, ebuf, sizeof(ebuf)));
}
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
VIR_FREE(old_dom_cfg_file); VIR_FREE(old_dom_cfg_file);
VIR_FREE(old_dom_name); VIR_FREE(old_dom_name);
VIR_FREE(new_dom_name); VIR_FREE(new_dom_name);
VIR_FREE(rename_log_msg);
qemuDomainEventQueue(driver, event_old); qemuDomainEventQueue(driver, event_old);
qemuDomainEventQueue(driver, event_new); qemuDomainEventQueue(driver, event_new);
virObjectUnref(cfg); virObjectUnref(cfg);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册