Add [vcpu] index support for hmp command "info lapic", which is useful when debugging ipi and so on. Current behavior is not changed when the parameter isn't specified.
Signed-off-by: Yi Wang <wang.y...@zte.com.cn> Signed-off-by: Yun Liu <liu.y...@zte.com.cn> --- hmp-commands-info.hx | 6 +++--- target/i386/monitor.c | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index d9df238..c534b03 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -115,9 +115,9 @@ ETEXI #if defined(TARGET_I386) { .name = "lapic", - .args_type = "", - .params = "", - .help = "show local apic state", + .args_type = "vcpu:i?", + .params = "[vcpu]", + .help = "show local apic state (vcpu: vCPU to read, default is 0)", .cmd = hmp_info_local_apic, }, #endif diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 77ead60..813005e 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -632,8 +632,14 @@ const MonitorDef *target_monitor_defs(void) void hmp_info_local_apic(Monitor *mon, const QDict *qdict) { - CPUState *cs = mon_get_cpu(); + CPUState *cs; + if (qdict_haskey(qdict, "vcpu")) { + int index = qdict_get_try_int(qdict, "vcpu", 0); + cs = qemu_get_cpu(index); + } else { + cs = mon_get_cpu(); + } if (!cs) { monitor_printf(mon, "No CPU available\n"); return; -- 1.8.3.1