159 lines
5.0 KiB
Diff
159 lines
5.0 KiB
Diff
|
|
From 9a47271fb6c855ec92e087d59d65f3cc0c684725 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "wangxinxin.wang@huawei.com" <wangxinxin.wang@huawei.com>
|
||
|
|
Date: Sun, 17 Mar 2024 15:04:09 +0800
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
Signed-off-by: Yuan Zhang <zhangyuan162@huawei.com>
|
||
|
|
---
|
||
|
|
hw/acpi/core.c | 4 ++++
|
||
|
|
hw/core/reset.c | 2 ++
|
||
|
|
system/main.c | 2 ++
|
||
|
|
system/runstate.c | 2 ++
|
||
|
|
system/vl.c | 6 ++++++
|
||
|
|
5 files changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
|
||
|
|
index ec5e127d17..b6241f70e9 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"
|
||
|
|
@@ -588,13 +589,16 @@ static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_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 d3263b613e..fa63bfedb7 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 */
|
||
|
|
@@ -75,6 +76,7 @@ void qemu_devices_reset(ShutdownCause reason)
|
||
|
|
{
|
||
|
|
QEMUResetEntry *re, *nre;
|
||
|
|
|
||
|
|
+ qemu_log("reset all devices\n");
|
||
|
|
/* reset all devices */
|
||
|
|
QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
|
||
|
|
if (reason == SHUTDOWN_CAUSE_SNAPSHOT_LOAD &&
|
||
|
|
diff --git a/system/main.c b/system/main.c
|
||
|
|
index 9b91d21ea8..28bb283ebf 100644
|
||
|
|
--- a/system/main.c
|
||
|
|
+++ b/system/main.c
|
||
|
|
@@ -23,6 +23,7 @@
|
||
|
|
*/
|
||
|
|
|
||
|
|
#include "qemu/osdep.h"
|
||
|
|
+#include "qemu/log.h"
|
||
|
|
#include "qemu-main.h"
|
||
|
|
#include "sysemu/sysemu.h"
|
||
|
|
|
||
|
|
@@ -34,6 +35,7 @@ int qemu_default_main(void)
|
||
|
|
{
|
||
|
|
int status;
|
||
|
|
|
||
|
|
+ qemu_log("qemu enter main_loop\n");
|
||
|
|
status = qemu_main_loop();
|
||
|
|
qemu_cleanup(status);
|
||
|
|
|
||
|
|
diff --git a/system/runstate.c b/system/runstate.c
|
||
|
|
index 62e6db8d42..538c645326 100644
|
||
|
|
--- a/system/runstate.c
|
||
|
|
+++ b/system/runstate.c
|
||
|
|
@@ -769,9 +769,11 @@ static bool main_loop_should_exit(int *status)
|
||
|
|
}
|
||
|
|
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/system/vl.c b/system/vl.c
|
||
|
|
index 2bcd9efb9a..165c3cae8a 100644
|
||
|
|
--- a/system/vl.c
|
||
|
|
+++ b/system/vl.c
|
||
|
|
@@ -26,6 +26,7 @@
|
||
|
|
#include "qemu/help-texts.h"
|
||
|
|
#include "qemu/datadir.h"
|
||
|
|
#include "qemu/units.h"
|
||
|
|
+#include "qemu/log.h"
|
||
|
|
#include "exec/cpu-common.h"
|
||
|
|
#include "exec/page-vary.h"
|
||
|
|
#include "hw/qdev-properties.h"
|
||
|
|
@@ -2633,6 +2634,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);
|
||
|
|
@@ -2778,6 +2780,7 @@ void qemu_init(int argc, char **argv)
|
||
|
|
|
||
|
|
qemu_init_subsystems();
|
||
|
|
|
||
|
|
+ qemu_log("qemu pid is %d, options parsing start\n", getpid());
|
||
|
|
/* first pass of option parsing */
|
||
|
|
optind = 1;
|
||
|
|
while (optind < argc) {
|
||
|
|
@@ -2997,6 +3000,7 @@ void qemu_init(int argc, char **argv)
|
||
|
|
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 == NULL) {
|
||
|
|
exit(1);
|
||
|
|
@@ -3714,6 +3718,7 @@ void qemu_init(int argc, char **argv)
|
||
|
|
*/
|
||
|
|
|
||
|
|
machine_class = MACHINE_GET_CLASS(current_machine);
|
||
|
|
+ qemu_log("configure accelerator %s start\n", machine_class->name);
|
||
|
|
if (!qtest_enabled() && machine_class->deprecation_reason) {
|
||
|
|
warn_report("Machine type '%s' is deprecated: %s",
|
||
|
|
machine_class->name, machine_class->deprecation_reason);
|
||
|
|
@@ -3732,6 +3737,7 @@ void qemu_init(int argc, char **argv)
|
||
|
|
*/
|
||
|
|
migration_object_init();
|
||
|
|
|
||
|
|
+ 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.27.0
|
||
|
|
|