Patch for qemu-project/qemu#2247 issue

Patch for qemu-project/qemu#2247 issue

[liu.dayu]

hmp: Add help information for watchdog action: inject-nmi

virsh qemu-monitor-command --hmp help information of watchdog_action missing inject-nmi which already supported in Commit 795dc6e4

Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>

---
 hmp-commands.hx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 772ab996a..bc7e6d1dc 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1412,7 +1412,7 @@ ETEXI
     {
         .name       = "watchdog_action",
         .args_type  = "action:s",
-        .params     = "[reset|shutdown|poweroff|pause|debug|none]",
+        .params     = "[reset|shutdown|poweroff|pause|debug|none|inject-nmi]",
         .help       = "change watchdog action",
         .cmd        = hmp_watchdog_action,
         .command_completion = watchdog_action_completion,
--

Re: Patch for qemu-project/qemu#2247 issue

[Michael Tokarev]

01.04.2024 12:43, liu.dayu@zte.com.cn wrote:
> hmp: Add help information for watchdog action: inject-nmi
> 
> virsh qemu-monitor-command --hmp help information of watchdog_action missing inject-nmi which already supported in Commit 795dc6e4
> 
> Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>

Applied to trivial-patches tree, in the following form:

Author: Dayu Liu <liu.dayu@zte.com.cn>
Date:   Mon Apr 1 17:43:55 2024 +0800

     hmp: Add help information for watchdog action: inject-nmi

     virsh qemu-monitor-command --hmp help information of
     watchdog_action missing inject-nmi which already supported
     in Commit 795dc6e4

     Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2247
     Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>
     Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
     Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
     [Mjt: decode and word-wrap commit message and add Resolves: tag]

Thanks,

/mjt

Re: Patch for qemu-project/qemu#2247 issue

[Philippe Mathieu-Daudé]

On 1/4/24 18:52, Michael Tokarev wrote:
> 01.04.2024 12:43, liu.dayu@zte.com.cn wrote:
>> hmp: Add help information for watchdog action: inject-nmi
>>
>> virsh qemu-monitor-command --hmp help information of watchdog_action 
>> missing inject-nmi which already supported in Commit 795dc6e4
>>
>> Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>
> 
> Applied to trivial-patches tree, in the following form:
> 
> Author: Dayu Liu <liu.dayu@zte.com.cn>
> Date:   Mon Apr 1 17:43:55 2024 +0800
> 
>      hmp: Add help information for watchdog action: inject-nmi
> 
>      virsh qemu-monitor-command --hmp help information of
>      watchdog_action missing inject-nmi which already supported
>      in Commit 795dc6e4
> 

Fixes: 795dc6e46d ("watchdog: Add new Virtual Watchdog action INJECT-NMI")

>      Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2247
>      Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>
>      Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
>      Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
>      [Mjt: decode and word-wrap commit message and add Resolves: tag]
> 
> Thanks,
> 
> /mjt
> 

Re: Patch for qemu-project/qemu#2247 issue

[Michael Tokarev]

02.04.2024 12:50, Philippe Mathieu-Daudé пишет:
> On 1/4/24 18:52, Michael Tokarev wrote:
>> 01.04.2024 12:43, liu.dayu@zte.com.cn wrote:
>>> hmp: Add help information for watchdog action: inject-nmi
>>>
>>> virsh qemu-monitor-command --hmp help information of watchdog_action missing inject-nmi which already supported in Commit 795dc6e4
>>>
>>> Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>
>>
>> Applied to trivial-patches tree, in the following form:
>>
>> Author: Dayu Liu <liu.dayu@zte.com.cn>
>> Date:   Mon Apr 1 17:43:55 2024 +0800
>>
>>      hmp: Add help information for watchdog action: inject-nmi
>>
>>      virsh qemu-monitor-command --hmp help information of
>>      watchdog_action missing inject-nmi which already supported
>>      in Commit 795dc6e4
>>
> 
> Fixes: 795dc6e46d ("watchdog: Add new Virtual Watchdog action INJECT-NMI")

I don't think that commit is broken and needs Fixing.
I see your point though - to have more formal way to
mark "related" commits, it isn't always fixing something.

I sent a pullreq for this a couple hours ago anyway.

/mjt

Re: Patch for qemu-project/qemu#2247 issue

[Philippe Mathieu-Daudé]

On 2/4/24 11:59, Michael Tokarev wrote:
> 02.04.2024 12:50, Philippe Mathieu-Daudé пишет:
>> On 1/4/24 18:52, Michael Tokarev wrote:
>>> 01.04.2024 12:43, liu.dayu@zte.com.cn wrote:
>>>> hmp: Add help information for watchdog action: inject-nmi
>>>>
>>>> virsh qemu-monitor-command --hmp help information of watchdog_action 
>>>> missing inject-nmi which already supported in Commit 795dc6e4
>>>>
>>>> Signed-off-by: Dayu Liu <liu.dayu@zte.com.cn>
>>>
>>> Applied to trivial-patches tree, in the following form:
>>>
>>> Author: Dayu Liu <liu.dayu@zte.com.cn>
>>> Date:   Mon Apr 1 17:43:55 2024 +0800
>>>
>>>      hmp: Add help information for watchdog action: inject-nmi
>>>
>>>      virsh qemu-monitor-command --hmp help information of
>>>      watchdog_action missing inject-nmi which already supported
>>>      in Commit 795dc6e4
>>>
>>
>> Fixes: 795dc6e46d ("watchdog: Add new Virtual Watchdog action 
>> INJECT-NMI")
> 
> I don't think that commit is broken and needs Fixing.
> I see your point though - to have more formal way to
> mark "related" commits, it isn't always fixing something.
> 
> I sent a pullreq for this a couple hours ago anyway.

No worries ;)