* [PULL 0/4] Monitor patches for 2026-05-05
@ 2026-05-05 12:34 Markus Armbruster
2026-05-05 12:34 ` [PULL 1/4] hmp*hx: Move info docs Markus Armbruster
` (5 more replies)
0 siblings, 6 replies; 11+ messages in thread
From: Markus Armbruster @ 2026-05-05 12:34 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha
The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
are available in the Git repository at:
https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
----------------------------------------------------------------
Monitor patches for 2026-05-05
----------------------------------------------------------------
AlanoSong@163.com (1):
monitor: Add `clear` command
Dr. David Alan Gilbert (3):
hmp*hx: Move info docs
hxtool: Split srst/erst add checks
hxtool: Error on missing docs
include/monitor/hmp.h | 1 +
monitor/hmp-cmds.c | 11 +++++++++++
hmp-commands-info.hx | 9 +--------
hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
5 files changed, 80 insertions(+), 21 deletions(-)
--
2.54.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PULL 1/4] hmp*hx: Move info docs
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
@ 2026-05-05 12:34 ` Markus Armbruster
2026-05-05 12:35 ` [PULL 2/4] hxtool: Split srst/erst add checks Markus Armbruster
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Markus Armbruster @ 2026-05-05 12:34 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, Dr. David Alan Gilbert, Marc-André Lureau
From: "Dr. David Alan Gilbert" <dave@treblig.org>
Move the docs for the info subcommand from the separate hx
into the top level file next to the 'info' command itself.
That makes every command in the top level file have a RST section.
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20260504174914.122607-2-dave@treblig.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hmp-commands-info.hx | 9 +--------
hmp-commands.hx | 27 +++++++++++++++++----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 74c741f80e..964eed004c 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -8,14 +8,7 @@ HXCOMM
HXCOMM In this file, generally SRST fragments should have two extra
HXCOMM spaces of indent, so that the documentation list item for "info foo"
HXCOMM appears inside the documentation list item for the top level
-HXCOMM "info" documentation entry. The exception is the first SRST
-HXCOMM fragment that defines that top level entry.
-
-SRST
-``info`` *subcommand*
- Show various information about the system state.
-
-ERST
+HXCOMM "info" documentation entry.
{
.name = "version",
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 5cc4788f12..f4a6eeda93 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1814,16 +1814,6 @@ SRST
command.
ERST
- {
- .name = "info",
- .args_type = "item:s?",
- .params = "[subcommand]",
- .help = "show various information about the system state",
- .cmd = hmp_info_help,
- .sub_table = hmp_info_cmds,
- .flags = "p",
- },
-
#if defined(CONFIG_FDT)
{
.name = "dumpdtb",
@@ -1867,3 +1857,20 @@ SRST
List event channels in the guest
ERST
#endif
+
+HXCOMM *** MUST BE LAST ENTRY **
+ {
+ .name = "info",
+ .args_type = "item:s?",
+ .params = "[subcommand]",
+ .help = "show various information about the system state",
+ .cmd = hmp_info_help,
+ .sub_table = hmp_info_cmds,
+ .flags = "p",
+ },
+
+SRST
+``info`` *subcommand*
+ Show various information about the system state.
+ERST
+HXCOMM *** MUST BE LAST ENTRY **
--
2.54.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 2/4] hxtool: Split srst/erst add checks
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
2026-05-05 12:34 ` [PULL 1/4] hmp*hx: Move info docs Markus Armbruster
@ 2026-05-05 12:35 ` Markus Armbruster
2026-05-05 12:35 ` [PULL 3/4] hxtool: Error on missing docs Markus Armbruster
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Markus Armbruster @ 2026-05-05 12:35 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, Dr. David Alan Gilbert, Thomas Huth
From: "Dr. David Alan Gilbert" <dave@treblig.org>
Split the SRST/ERST case and add some checks.
This is mainly to make it easier to add some checks in following
patches.
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20260504174914.122607-3-dave@treblig.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/hxtool | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/scripts/hxtool b/scripts/hxtool
index 80516b9437..51dc841479 100755
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -2,15 +2,29 @@
hxtoh()
{
- flag=1
+ in_rst=0
while read -r str; do
case $str in
HXCOMM*)
;;
- SRST*|ERST*) flag=$(($flag^1))
+ SRST*)
+ if [ $in_rst -eq 1 ]
+ then
+ echo "Error: SRST inside another RST" >&2
+ exit 1
+ fi
+ in_rst=1
+ ;;
+ ERST*)
+ if [ $in_rst -eq 0 ]
+ then
+ echo "Error: ERST already outside RST" >&2
+ exit 1
+ fi
+ in_rst=0
;;
*)
- test $flag -eq 1 && printf "%s\n" "$str"
+ test $in_rst -eq 0 && printf "%s\n" "$str"
;;
esac
done
--
2.54.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 3/4] hxtool: Error on missing docs
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
2026-05-05 12:34 ` [PULL 1/4] hmp*hx: Move info docs Markus Armbruster
2026-05-05 12:35 ` [PULL 2/4] hxtool: Split srst/erst add checks Markus Armbruster
@ 2026-05-05 12:35 ` Markus Armbruster
2026-05-05 12:35 ` [PULL 4/4] monitor: Add `clear` command Markus Armbruster
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Markus Armbruster @ 2026-05-05 12:35 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, Dr. David Alan Gilbert
From: "Dr. David Alan Gilbert" <dave@treblig.org>
Error if a '.name' is seen after another '.name' without an intervening
SRST, this normally indicates missing or misplaced docs.
We can't check DEF (as used in command line options) because those
often have multiple DEF per doc.
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
With the two minor tidy ups from Thomas's review
Message-ID: <20260504174914.122607-4-dave@treblig.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/hxtool | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/scripts/hxtool b/scripts/hxtool
index 51dc841479..617a694eaf 100755
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -1,8 +1,15 @@
#!/bin/sh
+print_if_not_rst()
+{
+ test $in_rst -eq 0 && printf "%s\n" "$str"
+}
+
hxtoh()
{
in_rst=0
+ # .name for HMP
+ seen_name=0
while read -r str; do
case $str in
HXCOMM*)
@@ -13,6 +20,8 @@ hxtoh()
echo "Error: SRST inside another RST" >&2
exit 1
fi
+ # consume the name
+ seen_name=0
in_rst=1
;;
ERST*)
@@ -23,8 +32,18 @@ hxtoh()
fi
in_rst=0
;;
+ # Note the space at the start - we need to exclude something.name
+ ( .name*)
+ if [ $seen_name -eq 1 ]
+ then
+ echo "Error: Seen another .name, maybe missing docs?" >&2
+ exit 1
+ fi
+ seen_name=1
+ print_if_not_rst
+ ;;
*)
- test $in_rst -eq 0 && printf "%s\n" "$str"
+ print_if_not_rst
;;
esac
done
--
2.54.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PULL 4/4] monitor: Add `clear` command
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
` (2 preceding siblings ...)
2026-05-05 12:35 ` [PULL 3/4] hxtool: Error on missing docs Markus Armbruster
@ 2026-05-05 12:35 ` Markus Armbruster
2026-05-05 12:58 ` [PULL 0/4] Monitor patches for 2026-05-05 Philippe Mathieu-Daudé
2026-05-05 18:26 ` Stefan Hajnoczi
5 siblings, 0 replies; 11+ messages in thread
From: Markus Armbruster @ 2026-05-05 12:35 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, AlanoSong@163.com, Dr. David Alan Gilbert
From: "AlanoSong@163.com" <AlanoSong@163.com>
The monitor screen can be cluttered after executing commands
like `info qtree`. It is useful to have a command to clear
current screen, just like linux `clear` command do.
This patch has been tested under monitors using stdio, vc,
tcp socket, unix socket and serial interfaces.
Signed-off-by: Alano Song <AlanoSong@163.com>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Message-ID: <20260504174914.122607-5-dave@treblig.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/monitor/hmp.h | 1 +
monitor/hmp-cmds.c | 11 +++++++++++
hmp-commands.hx | 14 ++++++++++++++
3 files changed, 26 insertions(+)
diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index e222bea60c..9b66458d21 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -165,6 +165,7 @@ void hmp_trace_event(Monitor *mon, const QDict *qdict);
void hmp_trace_file(Monitor *mon, const QDict *qdict);
void hmp_info_trace_events(Monitor *mon, const QDict *qdict);
void hmp_help(Monitor *mon, const QDict *qdict);
+void hmp_clear(Monitor *mon, const QDict *qdict);
void hmp_info_help(Monitor *mon, const QDict *qdict);
void hmp_info_sync_profile(Monitor *mon, const QDict *qdict);
void hmp_info_history(Monitor *mon, const QDict *qdict);
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index afa7b709a6..1b44d07c18 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -219,6 +219,17 @@ void hmp_help(Monitor *mon, const QDict *qdict)
hmp_help_cmd(mon, qdict_get_try_str(qdict, "name"));
}
+void hmp_clear(Monitor *mon, const QDict *qdict)
+{
+ /*
+ * Send an ANSI escape sequence:
+ * "\x1b[H" - move cursor to top-left
+ * "\x1b[2J" - clear visible screen
+ * "\x1b[3J" - clear scrollback
+ */
+ monitor_printf(mon, "\x1b[H\x1b[2J\x1b[3J");
+}
+
void hmp_info_help(Monitor *mon, const QDict *qdict)
{
hmp_help_cmd(mon, "info");
diff --git a/hmp-commands.hx b/hmp-commands.hx
index f4a6eeda93..b806ec5635 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -20,6 +20,20 @@ SRST
Show the help for all commands or just for command *cmd*.
ERST
+ {
+ .name = "clear",
+ .args_type = "",
+ .params = "",
+ .help = "clear the monitor screen",
+ .cmd = hmp_clear,
+ .flags = "p",
+ },
+
+SRST
+``clear``
+ Clear the monitor screen.
+ERST
+
{
.name = "commit",
.args_type = "device:B",
--
2.54.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
` (3 preceding siblings ...)
2026-05-05 12:35 ` [PULL 4/4] monitor: Add `clear` command Markus Armbruster
@ 2026-05-05 12:58 ` Philippe Mathieu-Daudé
2026-05-05 14:00 ` Stefan Hajnoczi
2026-05-05 18:26 ` Stefan Hajnoczi
5 siblings, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-05-05 12:58 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: stefanha
On 5/5/26 14:34, Markus Armbruster wrote:
> The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
>
> Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
>
> are available in the Git repository at:
>
> https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
>
> for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
>
> monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
>
> ----------------------------------------------------------------
> Monitor patches for 2026-05-05
>
> ----------------------------------------------------------------
> AlanoSong@163.com (1):
> monitor: Add `clear` command
>
> Dr. David Alan Gilbert (3):
> hmp*hx: Move info docs
> hxtool: Split srst/erst add checks
> hxtool: Error on missing docs
>
> include/monitor/hmp.h | 1 +
> monitor/hmp-cmds.c | 11 +++++++++++
> hmp-commands-info.hx | 9 +--------
> hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
> scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
> 5 files changed, 80 insertions(+), 21 deletions(-)
>
Obviously this conflicts with the PR I'm waiting since 10 days to post:
$ git merge pull-monitor-2026-05-05
Auto-merging hmp-commands-info.hx
Auto-merging hmp-commands.hx
CONFLICT (content): Merge conflict in hmp-commands.hx
Auto-merging include/monitor/hmp.h
Auto-merging monitor/hmp-cmds.c
Automatic merge failed; fix conflicts and then commit the result.
Sigh.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-05 12:58 ` [PULL 0/4] Monitor patches for 2026-05-05 Philippe Mathieu-Daudé
@ 2026-05-05 14:00 ` Stefan Hajnoczi
2026-05-05 14:40 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 11+ messages in thread
From: Stefan Hajnoczi @ 2026-05-05 14:00 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Markus Armbruster, qemu-devel, stefanha
On Tue, May 5, 2026 at 8:59 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 5/5/26 14:34, Markus Armbruster wrote:
> > The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
> >
> > Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
> >
> > are available in the Git repository at:
> >
> > https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
> >
> > for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
> >
> > monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
> >
> > ----------------------------------------------------------------
> > Monitor patches for 2026-05-05
> >
> > ----------------------------------------------------------------
> > AlanoSong@163.com (1):
> > monitor: Add `clear` command
> >
> > Dr. David Alan Gilbert (3):
> > hmp*hx: Move info docs
> > hxtool: Split srst/erst add checks
> > hxtool: Error on missing docs
> >
> > include/monitor/hmp.h | 1 +
> > monitor/hmp-cmds.c | 11 +++++++++++
> > hmp-commands-info.hx | 9 +--------
> > hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
> > scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
> > 5 files changed, 80 insertions(+), 21 deletions(-)
> >
>
> Obviously this conflicts with the PR I'm waiting since 10 days to post:
>
> $ git merge pull-monitor-2026-05-05
> Auto-merging hmp-commands-info.hx
> Auto-merging hmp-commands.hx
> CONFLICT (content): Merge conflict in hmp-commands.hx
> Auto-merging include/monitor/hmp.h
> Auto-merging monitor/hmp-cmds.c
> Automatic merge failed; fix conflicts and then commit the result.
>
> Sigh.
Hi,
What is blocking you from sending your PR and who can do something about it?
Stefan
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-05 14:00 ` Stefan Hajnoczi
@ 2026-05-05 14:40 ` Philippe Mathieu-Daudé
2026-05-06 6:14 ` Markus Armbruster
0 siblings, 1 reply; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-05-05 14:40 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: Markus Armbruster, qemu-devel, stefanha
Hi Stefan,
On 5/5/26 16:00, Stefan Hajnoczi wrote:
> On Tue, May 5, 2026 at 8:59 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> On 5/5/26 14:34, Markus Armbruster wrote:
>>> The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
>>>
>>> Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
>>>
>>> are available in the Git repository at:
>>>
>>> https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
>>>
>>> for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
>>>
>>> monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
>>>
>>> ----------------------------------------------------------------
>>> Monitor patches for 2026-05-05
>>>
>>> ----------------------------------------------------------------
>>> AlanoSong@163.com (1):
>>> monitor: Add `clear` command
>>>
>>> Dr. David Alan Gilbert (3):
>>> hmp*hx: Move info docs
>>> hxtool: Split srst/erst add checks
>>> hxtool: Error on missing docs
>>>
>>> include/monitor/hmp.h | 1 +
>>> monitor/hmp-cmds.c | 11 +++++++++++
>>> hmp-commands-info.hx | 9 +--------
>>> hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
>>> scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
>>> 5 files changed, 80 insertions(+), 21 deletions(-)
>>>
>>
>> Obviously this conflicts with the PR I'm waiting since 10 days to post:
>>
>> $ git merge pull-monitor-2026-05-05
>> Auto-merging hmp-commands-info.hx
>> Auto-merging hmp-commands.hx
>> CONFLICT (content): Merge conflict in hmp-commands.hx
>> Auto-merging include/monitor/hmp.h
>> Auto-merging monitor/hmp-cmds.c
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>> Sigh.
>
> Hi,
> What is blocking you from sending your PR and who can do something about it?
Sorry, this comment was for Markus. I understood he wanted to have a
look on patches related to monitor I was going to pull:
https://lore.kernel.org/qemu-devel/d434b8b1-e79c-40c7-984d-1164543c7069@linaro.org/
More than 1 week passed so I think we are good. Do not hold on Markus
pull-monitor-2026-05-05 tag, I'll wait it gets merged then fix the
conflicts and post mine.
Thanks,
Phil.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
` (4 preceding siblings ...)
2026-05-05 12:58 ` [PULL 0/4] Monitor patches for 2026-05-05 Philippe Mathieu-Daudé
@ 2026-05-05 18:26 ` Stefan Hajnoczi
5 siblings, 0 replies; 11+ messages in thread
From: Stefan Hajnoczi @ 2026-05-05 18:26 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, stefanha
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/11.1 for any user-visible changes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-05 14:40 ` Philippe Mathieu-Daudé
@ 2026-05-06 6:14 ` Markus Armbruster
2026-05-06 13:58 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 11+ messages in thread
From: Markus Armbruster @ 2026-05-06 6:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Stefan Hajnoczi, qemu-devel, stefanha
Philippe Mathieu-Daudé <philmd@linaro.org> writes:
> Hi Stefan,
>
> On 5/5/26 16:00, Stefan Hajnoczi wrote:
>> On Tue, May 5, 2026 at 8:59 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>>
>>> On 5/5/26 14:34, Markus Armbruster wrote:
>>>> The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
>>>>
>>>> Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>> https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
>>>>
>>>> for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
>>>>
>>>> monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
>>>>
>>>> ----------------------------------------------------------------
>>>> Monitor patches for 2026-05-05
>>>>
>>>> ----------------------------------------------------------------
>>>> AlanoSong@163.com (1):
>>>> monitor: Add `clear` command
>>>>
>>>> Dr. David Alan Gilbert (3):
>>>> hmp*hx: Move info docs
>>>> hxtool: Split srst/erst add checks
>>>> hxtool: Error on missing docs
>>>>
>>>> include/monitor/hmp.h | 1 +
>>>> monitor/hmp-cmds.c | 11 +++++++++++
>>>> hmp-commands-info.hx | 9 +--------
>>>> hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
>>>> scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
>>>> 5 files changed, 80 insertions(+), 21 deletions(-)
>>>>
>>>
>>> Obviously this conflicts with the PR I'm waiting since 10 days to post:
>>>
>>> $ git merge pull-monitor-2026-05-05
>>> Auto-merging hmp-commands-info.hx
>>> Auto-merging hmp-commands.hx
>>> CONFLICT (content): Merge conflict in hmp-commands.hx
>>> Auto-merging include/monitor/hmp.h
>>> Auto-merging monitor/hmp-cmds.c
>>> Automatic merge failed; fix conflicts and then commit the result.
>>>
>>> Sigh.
I'm sorry.
>> Hi,
>> What is blocking you from sending your PR and who can do something about it?
>
> Sorry, this comment was for Markus. I understood he wanted to have a
> look on patches related to monitor I was going to pull:
> https://lore.kernel.org/qemu-devel/d434b8b1-e79c-40c7-984d-1164543c7069@linaro.org/
Yes, I'd like to have a look. But I'm under water, so what I like
doesn't matter. I'll have to rely on the review of others here.
> More than 1 week passed so I think we are good. Do not hold on Markus
> pull-monitor-2026-05-05 tag, I'll wait it gets merged then fix the
> conflicts and post mine.
Go right ahead.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PULL 0/4] Monitor patches for 2026-05-05
2026-05-06 6:14 ` Markus Armbruster
@ 2026-05-06 13:58 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 11+ messages in thread
From: Philippe Mathieu-Daudé @ 2026-05-06 13:58 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Stefan Hajnoczi, qemu-devel, stefanha
On 6/5/26 08:14, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@linaro.org> writes:
>
>> Hi Stefan,
>>
>> On 5/5/26 16:00, Stefan Hajnoczi wrote:
>>> On Tue, May 5, 2026 at 8:59 AM Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>>>
>>>> On 5/5/26 14:34, Markus Armbruster wrote:
>>>>> The following changes since commit ac0cc20ad2fe0b8df2e5d9458e90a095ac711ab1:
>>>>>
>>>>> Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2026-05-01 14:41:49 -0400)
>>>>>
>>>>> are available in the Git repository at:
>>>>>
>>>>> https://repo.or.cz/qemu/armbru.git tags/pull-monitor-2026-05-05
>>>>>
>>>>> for you to fetch changes up to ea017f67ce1ca34c7503b6f23f48b433585d37ac:
>>>>>
>>>>> monitor: Add `clear` command (2026-05-05 13:53:03 +0200)
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> Monitor patches for 2026-05-05
>>>>>
>>>>> ----------------------------------------------------------------
>>>>> AlanoSong@163.com (1):
>>>>> monitor: Add `clear` command
>>>>>
>>>>> Dr. David Alan Gilbert (3):
>>>>> hmp*hx: Move info docs
>>>>> hxtool: Split srst/erst add checks
>>>>> hxtool: Error on missing docs
>>>>>
>>>>> include/monitor/hmp.h | 1 +
>>>>> monitor/hmp-cmds.c | 11 +++++++++++
>>>>> hmp-commands-info.hx | 9 +--------
>>>>> hmp-commands.hx | 41 +++++++++++++++++++++++++++++++----------
>>>>> scripts/hxtool | 39 ++++++++++++++++++++++++++++++++++++---
>>>>> 5 files changed, 80 insertions(+), 21 deletions(-)
>>>>>
>>>>
>>>> Obviously this conflicts with the PR I'm waiting since 10 days to post:
>>>>
>>>> $ git merge pull-monitor-2026-05-05
>>>> Auto-merging hmp-commands-info.hx
>>>> Auto-merging hmp-commands.hx
>>>> CONFLICT (content): Merge conflict in hmp-commands.hx
>>>> Auto-merging include/monitor/hmp.h
>>>> Auto-merging monitor/hmp-cmds.c
>>>> Automatic merge failed; fix conflicts and then commit the result.
>>>>
>>>> Sigh.
>
> I'm sorry.
>
>>> Hi,
>>> What is blocking you from sending your PR and who can do something about it?
>>
>> Sorry, this comment was for Markus. I understood he wanted to have a
>> look on patches related to monitor I was going to pull:
>> https://lore.kernel.org/qemu-devel/d434b8b1-e79c-40c7-984d-1164543c7069@linaro.org/
>
> Yes, I'd like to have a look. But I'm under water, so what I like
> doesn't matter. I'll have to rely on the review of others here.
All patches have at least 1 Reviewed-by tag. We also rely on CI. If you
noticed something that shouldn't have been merged, please point me to it
and consider adding a CI tests.
>> More than 1 week passed so I think we are good. Do not hold on Markus
>> pull-monitor-2026-05-05 tag, I'll wait it gets merged then fix the
>> conflicts and post mine.
>
> Go right ahead.
Thank you!
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2026-05-06 13:58 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-05 12:34 [PULL 0/4] Monitor patches for 2026-05-05 Markus Armbruster
2026-05-05 12:34 ` [PULL 1/4] hmp*hx: Move info docs Markus Armbruster
2026-05-05 12:35 ` [PULL 2/4] hxtool: Split srst/erst add checks Markus Armbruster
2026-05-05 12:35 ` [PULL 3/4] hxtool: Error on missing docs Markus Armbruster
2026-05-05 12:35 ` [PULL 4/4] monitor: Add `clear` command Markus Armbruster
2026-05-05 12:58 ` [PULL 0/4] Monitor patches for 2026-05-05 Philippe Mathieu-Daudé
2026-05-05 14:00 ` Stefan Hajnoczi
2026-05-05 14:40 ` Philippe Mathieu-Daudé
2026-05-06 6:14 ` Markus Armbruster
2026-05-06 13:58 ` Philippe Mathieu-Daudé
2026-05-05 18:26 ` Stefan Hajnoczi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.