158 lines
5.1 KiB
Diff
158 lines
5.1 KiB
Diff
From afbf800fa1f5e104a5edf116db4956289990ebe1 Mon Sep 17 00:00:00 2001
|
|
From: "wangxinxin.wang@huawei.com" <wangxinxin.wang@huawei.com>
|
|
Date: Thu, 22 Jun 2017 08:30:04 +0800
|
|
Subject: [PATCH 3/3] feature: Add logs for vm start and destroy
|
|
|
|
Add QEMU_LOG for vm start and destroy
|
|
|
|
Signed-off-by: miaoyubo <miaoyubo@huawei.com>
|
|
Signed-off-by: Jingyi Wang <wangjingyi11@huawei.com>
|
|
---
|
|
hw/acpi/core.c | 4 ++++
|
|
hw/core/reset.c | 2 ++
|
|
softmmu/main.c | 2 ++
|
|
softmmu/runstate.c | 2 ++
|
|
softmmu/vl.c | 6 ++++++
|
|
5 files changed, 16 insertions(+)
|
|
|
|
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
|
|
index 1e004d0078..eb631caa91 100644
|
|
--- a/hw/acpi/core.c
|
|
+++ b/hw/acpi/core.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "hw/acpi/acpi.h"
|
|
#include "hw/nvram/fw_cfg.h"
|
|
#include "qemu/config-file.h"
|
|
+#include "qemu/log.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/opts-visitor.h"
|
|
#include "qapi/qapi-events-run-state.h"
|
|
@@ -560,13 +561,16 @@ static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val)
|
|
uint16_t sus_typ = (val >> 10) & 7;
|
|
switch (sus_typ) {
|
|
case 0: /* soft power off */
|
|
+ qemu_log("VM will be soft power off\n");
|
|
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
|
|
break;
|
|
case 1:
|
|
+ qemu_log("VM will be suspend state\n");
|
|
qemu_system_suspend_request();
|
|
break;
|
|
default:
|
|
if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */
|
|
+ qemu_log("VM will be S4 state\n");
|
|
qapi_event_send_suspend_disk();
|
|
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
|
|
}
|
|
diff --git a/hw/core/reset.c b/hw/core/reset.c
|
|
index 9c477f2bf5..e923723d38 100644
|
|
--- a/hw/core/reset.c
|
|
+++ b/hw/core/reset.c
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/queue.h"
|
|
+#include "qemu/log.h"
|
|
#include "sysemu/reset.h"
|
|
|
|
/* reset/shutdown handler */
|
|
@@ -64,6 +65,7 @@ void qemu_devices_reset(void)
|
|
{
|
|
QEMUResetEntry *re, *nre;
|
|
|
|
+ qemu_log("reset all devices\n");
|
|
/* reset all devices */
|
|
QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
|
|
re->func(re->opaque);
|
|
diff --git a/softmmu/main.c b/softmmu/main.c
|
|
index 639c67ff48..0acb41bd30 100644
|
|
--- a/softmmu/main.c
|
|
+++ b/softmmu/main.c
|
|
@@ -23,6 +23,7 @@
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
+#include "qemu/log.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu/sysemu.h"
|
|
|
|
@@ -47,6 +48,7 @@ int main(int argc, char **argv)
|
|
int main(int argc, char **argv, char **envp)
|
|
{
|
|
qemu_init(argc, argv, envp);
|
|
+ qemu_log("qemu enter main_loop\n");
|
|
qemu_main_loop();
|
|
qemu_cleanup();
|
|
|
|
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
|
|
index 5736d908db..52fc3b7d6f 100644
|
|
--- a/softmmu/runstate.c
|
|
+++ b/softmmu/runstate.c
|
|
@@ -708,9 +708,11 @@ static bool main_loop_should_exit(void)
|
|
}
|
|
if (qemu_powerdown_requested()) {
|
|
qemu_system_powerdown();
|
|
+ qemu_log("domain is power down by outside operation\n");
|
|
}
|
|
if (qemu_vmstop_requested(&r)) {
|
|
vm_stop(r);
|
|
+ qemu_log("domain is stopped by outside operation\n");
|
|
}
|
|
return false;
|
|
}
|
|
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
|
index d9e4c619d3..d8996f3d6e 100644
|
|
--- a/softmmu/vl.c
|
|
+++ b/softmmu/vl.c
|
|
@@ -26,6 +26,7 @@
|
|
#include "qemu-common.h"
|
|
#include "qemu/datadir.h"
|
|
#include "qemu/units.h"
|
|
+#include "qemu/log.h"
|
|
#include "exec/cpu-common.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "qapi/compat-policy.h"
|
|
@@ -2680,6 +2681,7 @@ static void qemu_create_cli_devices(void)
|
|
}
|
|
|
|
/* init generic devices */
|
|
+ qemu_log("device init start\n");
|
|
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE);
|
|
qemu_opts_foreach(qemu_find_opts("device"),
|
|
device_init_func, NULL, &error_fatal);
|
|
@@ -2819,6 +2821,7 @@ void qemu_init(int argc, char **argv, char **envp)
|
|
|
|
qemu_init_subsystems();
|
|
|
|
+ qemu_log("qemu pid is %d, options parsing start\n", getpid());
|
|
/* first pass of option parsing */
|
|
optind = 1;
|
|
while (optind < argc) {
|
|
@@ -3027,6 +3030,7 @@ void qemu_init(int argc, char **argv, char **envp)
|
|
exit(0);
|
|
break;
|
|
case QEMU_OPTION_m:
|
|
+ qemu_log("memory options parse start\n");
|
|
opts = qemu_opts_parse_noisily(qemu_find_opts("memory"),
|
|
optarg, true);
|
|
if (!opts) {
|
|
@@ -3744,6 +3748,7 @@ void qemu_init(int argc, char **argv, char **envp)
|
|
*/
|
|
|
|
machine_class = MACHINE_GET_CLASS(current_machine);
|
|
+ qemu_log("configure accelerator %s start\n", machine_class->name);
|
|
if (!qtest_enabled() && machine_class->deprecation_reason) {
|
|
error_report("Machine type '%s' is deprecated: %s",
|
|
machine_class->name, machine_class->deprecation_reason);
|
|
@@ -3757,6 +3762,7 @@ void qemu_init(int argc, char **argv, char **envp)
|
|
|
|
qemu_create_late_backends();
|
|
|
|
+ qemu_log("machine init start\n");
|
|
/* parse features once if machine provides default cpu_type */
|
|
current_machine->cpu_type = machine_class->default_cpu_type;
|
|
if (cpu_option) {
|
|
--
|
|
2.30.0
|
|
|