Skip to content

monitor: Remove need of per-target handlers

Philippe Mathieu-Daudé qemu-devel 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest32 patches 4 repliesIn review
  2. v327 patches 12 repliesSuperseded
  3. v227 patches 31 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v110 patches8 repliesSuperseded

Changes in v4 from the cover letter

- Rebased

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/32monitor/hmp: : Include missing 'exec/target_long.h' headerinclude/monitor/hmp-target.h+1 -10 replies
2/32target/sparc/monitor: Dump all registers as 32-bittarget/sparc/monitor.c+7 -70 replies
3/32monitor: Remove MonitorDef::type field and MD_TLONG / MD_I32include/monitor/hmp-target.h monitor/hmp-target.c target/i386/monitor.c +2 more+21 -350 replies
4/32monitor: Extract completion declarations to 'monitor/hmp-completion.h'MAINTAINERS chardev/char-hmp-cmds.c include/monitor/hmp-completion.h +9 more+51 -210 replies
5/32stubs: Rename monitor* -> qmp* filesMAINTAINERS stubs/meson.build stubs/qmp-arm-gic.c +7 more+14 -80 replies
6/32monitor/meson: Use SPICE with migration HMP commandsmigration/meson.build monitor/meson.build+3 -30 replies
7/32monitor: Restrict monitor_set_cpu() method scopeinclude/monitor/monitor.h monitor/monitor-internal.h+1 -10 replies
8/32monitor: Make 'info via' a generic commandMAINTAINERS hmp-commands-info.hx hw/misc/meson.build +1 more+18 -30 replies
9/32monitor: Make Xen emulation commands generic oneshmp-commands.hx hw/i386/kvm/xen-stubs.c+12 -20 replies
10/32system: Expose 'arch_init.h' as 'qemu/base-arch-defs.h'hw/pci/pci.c include/qemu/base-arch-defs.h system/arch_init.c +2 more+12 -60 replies
11/32monitor: Introduce HMPCommand::arch_bitmask fieldmonitor/hmp-target.c monitor/hmp.c monitor/monitor-internal.h+15 -10 replies
12/32hw/s390x: Reduce 'monitor/monitor.h' inclusionshw/s390x/s390-skeys.c hw/s390x/s390-stattrib.c include/hw/s390x/storage-attributes.h +2 more+9 -70 replies
13/32monitor: Do not check TARGET_S390X to build s390x commandsMAINTAINERS hmp-commands-info.hx hmp-commands.hx +4 more+28 -130 replies
14/32monitor: Do not check TARGET_I386 to build target/i386/ commandsMAINTAINERS hmp-commands-info.hx hmp-commands.hx +2 more+17 -70 replies
15/32monitor: Do not check TARGET_I386 to build 'info sgx' commandMAINTAINERS hmp-commands-info.hx hw/i386/meson.build +2 more+19 -70 replies
16/32monitor: Do not check TARGET_I386 to build 'info sev' commandMAINTAINERS hmp-commands-info.hx stubs/hmp-cmd-info_sev.c +2 more+19 -70 replies
17/32monitor: Do not check TARGET_I386/RISCV to build 'info mem' commandhmp-commands-info.hx stubs/hmp-cmd-info_mem.c stubs/meson.build+14 -21 reply
18/32monitor: Do not check multiple TARGET_* to build 'info tlb' commandhmp-commands-info.hx stubs/hmp-cmd-info_tlb.c stubs/meson.build+15 -30 replies
19/32cpus: Introduce SysemuCPUOps::monitor_get_register() hookinclude/hw/core/sysemu-cpu-ops.h monitor/hmp-target.c+16 -30 replies
20/32target/riscv: Register target_get_monitor_def in SysemuCPUOpstarget/riscv/cpu.c target/riscv/internals.h target/riscv/monitor.c+11 -41 reply
21/32monitor: Remove target_get_monitor_def()include/monitor/hmp-target.h monitor/hmp-target.c stubs/meson.build +1 more+3 -420 replies
22/32monitor: Have MonitorDef::get_value() always return int64_t typeinclude/monitor/hmp-target.h target/i386/monitor.c+9 -80 replies
23/32monitor: Reduce target-specific methods furthermonitor/hmp-target.c monitor/hmp.c monitor/monitor-internal.h+36 -340 replies
24/32monitor: Remove 'monitor/hmp-target.h' headerMAINTAINERS hw/i386/sgx-stub.c hw/i386/sgx.c +16 more+12 -590 replies
25/32monitor: Forward-declare the MonitorDef typeinclude/monitor/hmp.h include/qemu/typedefs.h+4 -30 replies
26/32cpus: Introduce SysemuCPUOps::monitor_defs hookinclude/hw/core/sysemu-cpu-ops.h monitor/hmp.c+12 -20 replies
27/32target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defstarget/i386/cpu.c target/i386/monitor.c+29 -300 replies
28/32target/m68k: Replace target_monitor_defs -> SysemuCPUOps::monitor_defstarget/m68k/cpu.c target/m68k/monitor.c+18 -210 replies
29/32target/sparc: Replace target_monitor_defs -> SysemuCPUOps::monitor_defstarget/sparc/cpu.c target/sparc/monitor.c+19 -180 replies
30/32monitor: Remove target_monitor_defs()include/monitor/hmp.h monitor/hmp.c stubs/meson.build +1 more+1 -110 replies
31/32monitor: Merge hmp-target.c code within hmp-cmds.cMAINTAINERS monitor/hmp-cmds.c monitor/hmp-target.c +1 more+40 -780 replies
32/32monitor: Remove hmp_info_pic() left-over declarationinclude/monitor/hmp.h+0 -11 reply

Reviews trailers per patch

All 32 patches have a Reviewed-by or Acked-by.

PatchPierrick BouvierThomas HuthRichard HendersonDavid WoodhouseCornelia HuckEric FarmanDr. David Alan GilbertAlistair Francis
1/32R-b R-b
2/32R-b
3/32R-b
4/32R-b
5/32R-b A-b
6/32R-b
7/32R-b
8/32R-b
9/32R-b A-b
10/32R-b
11/32R-b
12/32R-b A-b R-b
13/32R-b A-b R-b
14/32R-b
15/32R-b
16/32R-b
17/32R-b A-b
18/32R-b
19/32R-b
20/32R-b A-b
21/32R-b
22/32R-b R-b
23/32R-b R-b R-b
24/32R-b R-b R-b
25/32R-b
26/32R-b
27/32R-b
28/32R-b
29/32R-b
30/32R-b
31/32R-b
32/32R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 8 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/32] monitor: Remove need of per-target handlers

Missing review: 32

Since v3:
- Rebased

Since v2:
- Addressed rth review comments

Changes needed for the single binary (and heterogeneous emulation).

Convert target_monitor_defs() and target_monitor_defs() to SysemuCPUOps fields, adapting the 4 targets using these 'legacy' code.

Instead of filtering the commands per target / device at build time, add a new field to HMPCommand to filter them at runtime, allowing to compile the command array once.

Philippe Mathieu-Daudé (32):
monitor/hmp: : Include missing 'exec/target_long.h' header target/sparc/monitor: Dump all registers as 32-bit
monitor: Remove MonitorDef::type field and MD_TLONG / MD_I32
monitor: Extract completion declarations to 'monitor/hmp-completion.h'
stubs: Rename monitor* -> qmp* files
monitor/meson: Use SPICE with migration HMP commands
monitor: Restrict monitor_set_cpu() method scope
monitor: Make 'info via' a generic command
monitor: Make Xen emulation commands generic ones
system: Expose 'arch_init.h' as 'qemu/base-arch-defs.h'
monitor: Introduce HMPCommand::arch_bitmask field hw/s390x: Reduce 'monitor/monitor.h' inclusions
monitor: Do not check TARGET_S390X to build s390x commands
monitor: Do not check TARGET_I386 to build target/i386/ commands
monitor: Do not check TARGET_I386 to build 'info sgx' command
monitor: Do not check TARGET_I386 to build 'info sev' command
monitor: Do not check TARGET_I386/RISCV to build 'info mem' command
monitor: Do not check multiple TARGET_* to build 'info tlb' command
cpus: Introduce SysemuCPUOps::monitor_get_register() hook target/riscv: Register target_get_monitor_def in SysemuCPUOps
monitor: Remove target_get_monitor_def()
monitor: Have MonitorDef::get_value() always return int64_t type
monitor: Reduce target-specific methods further
monitor: Remove 'monitor/hmp-target.h' header
monitor: Forward-declare the MonitorDef type
cpus: Introduce SysemuCPUOps::monitor_defs hook target/i386: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs target/m68k: Replace target_monitor_defs -> SysemuCPUOps::monitor_defs target/sparc: Replace target_monitor_defs ->
SysemuCPUOps::monitor_defs
monitor: Remove target_monitor_defs()
monitor: Merge hmp-target.c code within hmp-cmds.c
monitor: Remove hmp_info_pic() left-over declaration

 MAINTAINERS                                   |  16 ++-
 include/hw/core/sysemu-cpu-ops.h              |  14 ++
 include/hw/s390x/storage-attributes.h         |   4 -
 include/hw/s390x/storage-keys.h               |   3 -
 include/monitor/hmp-completion.h              |  40 ++++++
 include/monitor/hmp-target.h                  |  50 -------
 include/monitor/hmp.h                         |  43 +++---
 include/monitor/monitor.h                     |   1 -
 .../qemu/base-arch-defs.h                     |  10 +-
 include/qemu/typedefs.h                       |   1 +
 monitor/monitor-internal.h                    |  13 +-
 target/riscv/internals.h                      |   3 +
 chardev/char-hmp-cmds.c                       |   1 +
 hw/i386/kvm/xen-stubs.c                       |  12 ++
 hw/i386/sgx-hmp-stub.c                        |  16 +++
 hw/i386/sgx-stub.c                            |   6 -
 hw/i386/sgx.c                                 |   1 -
 hw/misc/mos6522-stub.c                        |  16 +++
 hw/pci/pci.c                                  |   2 +-
 hw/s390x/s390-skeys.c                         |   2 +
 hw/s390x/s390-stattrib.c                      |   2 +
 migration/migration-hmp-cmds.c                |   1 +
 monitor/hmp-cmds.c                            |  41 +++++-
 monitor/hmp-target.c                          | 124 ------------------
 monitor/hmp.c                                 |  45 ++++++-
 net/net-hmp-cmds.c                            |   1 +
 qom/qom-hmp-cmds.c                            |   1 +
 stubs/hmp-cmd-info_mem.c                      |  12 ++
 stubs/hmp-cmd-info_sev.c                      |  16 +++
 stubs/hmp-cmd-info_tlb.c                      |  12 ++
 stubs/hmp-cmds-hw-s390x.c                     |  15 +++
 stubs/hmp-cmds-target-i386.c                  |  13 ++
 stubs/{monitor-arm-gic.c => qmp-arm-gic.c}    |   0
 ...or-cpu-s390x-kvm.c => qmp-cpu-s390x-kvm.c} |   0
 .../{monitor-cpu-s390x.c => qmp-cpu-s390x.c}  |   0
 stubs/{monitor-cpu.c => qmp-cpu.c}            |   0
 stubs/{monitor-i386-rtc.c => qmp-i386-rtc.c}  |   0
 stubs/{monitor-i386-sev.c => qmp-i386-sev.c}  |   0
 stubs/{monitor-i386-sgx.c => qmp-i386-sgx.c}  |   0
 stubs/{monitor-i386-xen.c => qmp-i386-xen.c}  |   0
 stubs/target-get-monitor-def.c                |  29 ----
 stubs/target-monitor-defs.c                   |   7 -
 system/arch_init.c                            |   2 +-
 system/qdev-monitor.c                         |   3 +-
 system/runstate-hmp-cmds.c                    |   1 +
 system/vl.c                                   |   2 +-
 target/i386/cpu-apic.c                        |   1 -
 target/i386/cpu.c                             |  29 ++++
 target/i386/monitor.c                         |  26 ----
 target/i386/sev-system-stub.c                 |   6 -
 target/i386/sev.c                             |   1 -
 target/m68k/cpu.c                             |  18 +++
 target/m68k/monitor.c                         |  22 ----
 target/ppc/monitor.c                          |   2 -
 target/riscv/cpu.c                            |   1 +
 target/riscv/monitor.c                        |  12 +-
 target/sh4/monitor.c                          |   1 -
 target/sparc/cpu.c                            |  19 +++
 target/sparc/monitor.c                        |  19 ---
 target/xtensa/monitor.c                       |   1 -
 trace/trace-hmp-cmds.c                        |   1 +
 ui/ui-hmp-cmds.c                              |   1 +
 hmp-commands-info.hx                          |  26 ++--
 hmp-commands.hx                               |  13 +-
 hw/i386/meson.build                           |   1 +
 hw/misc/meson.build                           |   1 +
 migration/meson.build                         |   2 +-
 monitor/meson.build                           |   5 +-
 stubs/meson.build                             |  23 ++--
 69 files changed, 425 insertions(+), 387 deletions(-)
 create mode 100644 include/monitor/hmp-completion.h
 delete mode 100644 include/monitor/hmp-target.h
 rename system/arch_init.h => include/qemu/base-arch-defs.h (92%)
 create mode 100644 hw/i386/sgx-hmp-stub.c
 create mode 100644 hw/misc/mos6522-stub.c
 delete mode 100644 monitor/hmp-target.c
 create mode 100644 stubs/hmp-cmd-info_mem.c
 create mode 100644 stubs/hmp-cmd-info_sev.c
 create mode 100644 stubs/hmp-cmd-info_tlb.c
 create mode 100644 stubs/hmp-cmds-hw-s390x.c
 create mode 100644 stubs/hmp-cmds-target-i386.c
 rename stubs/{monitor-arm-gic.c => qmp-arm-gic.c} (100%)
 rename stubs/{monitor-cpu-s390x-kvm.c => qmp-cpu-s390x-kvm.c} (100%)
 rename stubs/{monitor-cpu-s390x.c => qmp-cpu-s390x.c} (100%)
 rename stubs/{monitor-cpu.c => qmp-cpu.c} (100%)
 rename stubs/{monitor-i386-rtc.c => qmp-i386-rtc.c} (100%)
 rename stubs/{monitor-i386-sev.c => qmp-i386-sev.c} (100%)
 rename stubs/{monitor-i386-sgx.c => qmp-i386-sgx.c} (100%)
 rename stubs/{monitor-i386-xen.c => qmp-i386-xen.c} (100%)
 delete mode 100644 stubs/target-get-monitor-def.c
 delete mode 100644 stubs/target-monitor-defs.c
Signature · 1 line
2.53.0