* [PULL v2 00/35] Monitor patches for 2023-02-03
@ 2023-02-04 7:21 Markus Armbruster
2023-02-04 7:21 ` [PULL v2 04/35] monitor: Drop unnecessary includes Markus Armbruster
2023-02-04 14:52 ` [PULL v2 00/35] Monitor patches for 2023-02-03 Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Markus Armbruster @ 2023-02-04 7:21 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
The following changes since commit deabea6e88f7c4c3c12a36ee30051c6209561165:
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-02-02 10:10:07 +0000)
are available in the Git repository at:
https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2023-02-03-v2
for you to fetch changes up to 864a3fa439276148b6d7abcf2d43ee8dbe4c4062:
monitor: Rename misc.c to hmp-target.c (2023-02-04 07:56:54 +0100)
----------------------------------------------------------------
Monitor patches for 2023-02-03
----------------------------------------------------------------
Markus Armbruster (35):
MAINTAINERS: Cover userfaultfd
MAINTAINERS: Cover include/sysemu/accel-blocker.h
MAINTAINERS: Cover tpm.c again
monitor: Drop unnecessary includes
audio: Move HMP commands from monitor/ to audio/
char: Move HMP commands from monitor/ to chardev/
char: Factor out qmp_add_client() parts and move to chardev/
hmp: Drop redundant argument check from add_completion_option()
readline: Extract readline_add_completion_of() from monitor
hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h
trace: Move HMP commands from monitor/ to trace/
machine: Move QMP commands from monitor/ to hw/core/
machine: Move HMP commands from monitor/ to hw/core/
qom: Move HMP commands from monitor/ to qom/
block: Factor out hmp_change_medium(), and move to block/monitor/
rocker: Move HMP commands from monitor to hw/net/rocker/
hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma()
net: Move HMP commands from monitor to net/
net: Move hmp_info_network() to net-hmp-cmds.c
migration: Move HMP commands from monitor/ to migration/
migration: Move the QMP command from monitor/ to migration/
virtio: Move HMP commands from monitor/ to hw/virtio/
tpm: Move HMP commands from monitor/ to softmmu/
runstate: Move HMP commands from monitor/ to softmmu/
stats: Move QMP commands from monitor/ to stats/
stats: Move HMP commands from monitor/ to stats/
acpi: Move the QMP command from monitor/ to hw/acpi/
qdev: Move HMP command completion from monitor to softmmu/
monitor: Split file descriptor passing stuff off misc.c
monitor: Move monitor_putc() next to monitor_puts & external linkage
monitor: Move target-dependent HMP commands to hmp-cmds-target.c
monitor: Move remaining HMP commands from misc.c to hmp-cmds.c
monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c
monitor: Loosen coupling between misc.c and monitor.c slightly
monitor: Rename misc.c to hmp-target.c
MAINTAINERS | 14 +-
meson.build | 1 +
include/monitor/hmp-target.h | 6 +
include/monitor/hmp.h | 27 +
include/monitor/monitor.h | 1 +
include/monitor/qmp-helpers.h | 3 +
include/net/net.h | 4 +-
include/qemu/readline.h | 2 +
include/{monitor => sysemu}/stats.h | 0
monitor/monitor-internal.h | 1 -
accel/kvm/kvm-all.c | 2 +-
audio/audio-hmp-cmds.c | 83 ++
block/monitor/block-hmp-cmds.c | 21 +
chardev/char-hmp-cmds.c | 220 ++++
chardev/char.c | 20 +
hw/acpi/acpi-qmp-cmds.c | 30 +
hw/core/machine-hmp-cmds.c | 208 ++++
hw/core/machine-qmp-cmds.c | 144 +++
hw/net/rocker/rocker-hmp-cmds.c | 316 +++++
hw/virtio/virtio-hmp-cmds.c | 321 +++++
migration/migration-hmp-cmds.c | 807 +++++++++++++
migration/migration.c | 30 +
monitor/fds.c | 468 ++++++++
monitor/hmp-cmds-target.c | 380 ++++++
monitor/hmp-cmds.c | 2181 +++-------------------------------
monitor/hmp-target.c | 178 +++
monitor/hmp.c | 16 +-
monitor/misc.c | 1906 -----------------------------
monitor/monitor.c | 29 +-
monitor/qmp-cmds-control.c | 1 -
monitor/qmp-cmds.c | 355 +-----
net/net-hmp-cmds.c | 170 +++
net/net.c | 28 +-
qom/qom-hmp-cmds.c | 67 ++
softmmu/qdev-monitor.c | 82 ++
softmmu/runstate-hmp-cmds.c | 82 ++
softmmu/tpm-hmp-cmds.c | 65 +
stats/stats-hmp-cmds.c | 247 ++++
stats/stats-qmp-cmds.c | 162 +++
storage-daemon/qemu-storage-daemon.c | 4 +-
trace/trace-hmp-cmds.c | 148 +++
util/readline.c | 8 +
audio/meson.build | 1 +
chardev/meson.build | 6 +-
hmp-commands.hx | 4 +-
hw/acpi/meson.build | 1 +
hw/net/meson.build | 1 +
hw/virtio/meson.build | 1 +
migration/meson.build | 1 +
monitor/meson.build | 4 +-
net/meson.build | 1 +
softmmu/meson.build | 2 +
stats/meson.build | 1 +
trace/meson.build | 1 +
54 files changed, 4577 insertions(+), 4285 deletions(-)
rename include/{monitor => sysemu}/stats.h (100%)
create mode 100644 audio/audio-hmp-cmds.c
create mode 100644 chardev/char-hmp-cmds.c
create mode 100644 hw/acpi/acpi-qmp-cmds.c
create mode 100644 hw/net/rocker/rocker-hmp-cmds.c
create mode 100644 hw/virtio/virtio-hmp-cmds.c
create mode 100644 migration/migration-hmp-cmds.c
create mode 100644 monitor/fds.c
create mode 100644 monitor/hmp-cmds-target.c
create mode 100644 monitor/hmp-target.c
delete mode 100644 monitor/misc.c
create mode 100644 net/net-hmp-cmds.c
create mode 100644 softmmu/runstate-hmp-cmds.c
create mode 100644 softmmu/tpm-hmp-cmds.c
create mode 100644 stats/stats-hmp-cmds.c
create mode 100644 stats/stats-qmp-cmds.c
create mode 100644 trace/trace-hmp-cmds.c
create mode 100644 stats/meson.build
--
2.39.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL v2 04/35] monitor: Drop unnecessary includes
2023-02-04 7:21 [PULL v2 00/35] Monitor patches for 2023-02-03 Markus Armbruster
@ 2023-02-04 7:21 ` Markus Armbruster
2023-02-04 14:52 ` [PULL v2 00/35] Monitor patches for 2023-02-03 Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2023-02-04 7:21 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Stefan Berger
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230124121946.1139465-2-armbru@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
---
monitor/hmp-cmds.c | 4 ----
monitor/hmp.c | 2 --
monitor/misc.c | 14 ++------------
monitor/qmp-cmds-control.c | 1 -
monitor/qmp-cmds.c | 8 --------
5 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 1dba973092..de1a96d48c 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -18,17 +18,14 @@
#include "net/net.h"
#include "net/eth.h"
#include "chardev/char.h"
-#include "sysemu/block-backend.h"
#include "sysemu/runstate.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
-#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/clone-visitor.h"
-#include "qapi/opts-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-char.h"
@@ -42,7 +39,6 @@
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qapi-visit-virtio.h"
#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h"
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 43fd69f984..e5d914b1f5 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -27,7 +27,6 @@
#include "hw/qdev-core.h"
#include "monitor-internal.h"
#include "monitor/hmp.h"
-#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qnum.h"
#include "qemu/config-file.h"
@@ -37,7 +36,6 @@
#include "qemu/option.h"
#include "qemu/units.h"
#include "sysemu/block-backend.h"
-#include "sysemu/runstate.h"
#include "trace.h"
static void monitor_command_cb(void *opaque, const char *cmdline,
diff --git a/monitor/misc.c b/monitor/misc.c
index 053af4045e..6fc8bfef13 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -25,27 +25,20 @@
#include "qemu/osdep.h"
#include "monitor-internal.h"
#include "monitor/qdev.h"
-#include "hw/pci/pci.h"
-#include "sysemu/watchdog.h"
#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
#include "ui/qemu-spice.h"
-#include "qemu/config-file.h"
#include "qemu/ctype.h"
#include "audio/audio.h"
#include "disas/disas.h"
-#include "qemu/timer.h"
#include "qemu/log.h"
#include "sysemu/hw_accel.h"
#include "sysemu/runstate.h"
-#include "authz/list.h"
-#include "qapi/util.h"
#include "sysemu/sysemu.h"
#include "sysemu/device_tree.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qstring.h"
#include "qom/object_interfaces.h"
#include "trace/control.h"
#include "monitor/hmp-target.h"
@@ -53,10 +46,8 @@
#ifdef CONFIG_TRACE_SIMPLE
#include "trace/simple.h"
#endif
-#include "exec/memory.h"
-#include "exec/exec-all.h"
-#include "qemu/option.h"
-#include "qemu/thread.h"
+#include "exec/address-spaces.h"
+#include "exec/ioport.h"
#include "block/qapi.h"
#include "block/block-hmp-cmds.h"
#include "qapi/qapi-commands-char.h"
@@ -69,7 +60,6 @@
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-init-commands.h"
#include "qapi/error.h"
-#include "qapi/qmp-event.h"
#include "qemu/cutils.h"
#if defined(TARGET_S390X)
diff --git a/monitor/qmp-cmds-control.c b/monitor/qmp-cmds-control.c
index 6e581713a3..f21506efa5 100644
--- a/monitor/qmp-cmds-control.c
+++ b/monitor/qmp-cmds-control.c
@@ -30,7 +30,6 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-introspect.h"
-#include "qapi/qapi-emit-events.h"
#include "qapi/qapi-introspect.h"
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index bf22a8c5a6..743849c0b5 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -14,29 +14,21 @@
*/
#include "qemu/osdep.h"
-#include "block/blockjob.h"
-#include "qemu/cutils.h"
-#include "qemu/option.h"
#include "monitor/monitor.h"
#include "monitor/qmp-helpers.h"
#include "sysemu/sysemu.h"
-#include "qemu/config-file.h"
-#include "qemu/uuid.h"
#include "chardev/char.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/runstate-action.h"
-#include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-acpi.h"
-#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/type-helpers.h"
-#include "exec/ramlist.h"
#include "hw/mem/memory-device.h"
#include "hw/acpi/acpi_dev_interface.h"
#include "hw/intc/intc.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL v2 00/35] Monitor patches for 2023-02-03
2023-02-04 7:21 [PULL v2 00/35] Monitor patches for 2023-02-03 Markus Armbruster
2023-02-04 7:21 ` [PULL v2 04/35] monitor: Drop unnecessary includes Markus Armbruster
@ 2023-02-04 14:52 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2023-02-04 14:52 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
On Sat, 4 Feb 2023 at 07:21, Markus Armbruster <armbru@redhat.com> wrote:
>
> The following changes since commit deabea6e88f7c4c3c12a36ee30051c6209561165:
>
> Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging (2023-02-02 10:10:07 +0000)
>
> are available in the Git repository at:
>
> https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2023-02-03-v2
>
> for you to fetch changes up to 864a3fa439276148b6d7abcf2d43ee8dbe4c4062:
>
> monitor: Rename misc.c to hmp-target.c (2023-02-04 07:56:54 +0100)
>
> ----------------------------------------------------------------
> Monitor patches for 2023-02-03
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/8.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-04 14:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-04 7:21 [PULL v2 00/35] Monitor patches for 2023-02-03 Markus Armbruster
2023-02-04 7:21 ` [PULL v2 04/35] monitor: Drop unnecessary includes Markus Armbruster
2023-02-04 14:52 ` [PULL v2 00/35] Monitor patches for 2023-02-03 Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).