Patchwork QMP: Really move the RESET event to qemu_system_reset()

login
register
mail settings
Submitter Luiz Capitulino
Date March 10, 2010, 2:54 p.m.
Message ID <20100310115450.1f5f6c8d@redhat.com>
Download mbox | patch
Permalink /patch/47251/
State New
Headers show

Comments

Luiz Capitulino - March 10, 2010, 2:54 p.m.
Something bad has happened in the merge of commit 0ee44250, as
the log message says it's supposed to be in qemu_system_reset()
but it is do_vm_stop().

Possibly, it was a problem with the conflict resolution with
ea375f9a (which has been merged first).

This commit moves (again) the RESET event into qemu_system_reset().

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 vl.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
Anthony Liguori - March 10, 2010, 3:24 p.m.
On 03/10/2010 08:54 AM, Luiz Capitulino wrote:
> Something bad has happened in the merge of commit 0ee44250, as
> the log message says it's supposed to be in qemu_system_reset()
> but it is do_vm_stop().
>
> Possibly, it was a problem with the conflict resolution with
> ea375f9a (which has been merged first).
>    

It's not due to conflict resolution, it's due to patch applying with 
fuzz.  I'm not sure I have a great solution to avoid this.

Regards,

Anthony Liguori

> This commit moves (again) the RESET event into qemu_system_reset().
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
> ---
>   vl.c |    3 +--
>   1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index d8328c7..fd89e50 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3148,8 +3148,6 @@ static void do_vm_stop(int reason)
>           vm_state_notify(0, reason);
>           monitor_protocol_event(QEVENT_STOP, NULL);
>       }
> -
> -    monitor_protocol_event(QEVENT_RESET, NULL);
>   }
>
>   void qemu_register_reset(QEMUResetHandler *func, void *opaque)
> @@ -3182,6 +3180,7 @@ void qemu_system_reset(void)
>       QTAILQ_FOREACH_SAFE(re,&reset_handlers, entry, nre) {
>           re->func(re->opaque);
>       }
> +    monitor_protocol_event(QEVENT_RESET, NULL);
>       cpu_synchronize_all_post_reset();
>   }
>
>
Anthony Liguori - March 10, 2010, 3:27 p.m.
On 03/10/2010 08:54 AM, Luiz Capitulino wrote:
> Something bad has happened in the merge of commit 0ee44250, as
> the log message says it's supposed to be in qemu_system_reset()
> but it is do_vm_stop().
>
> Possibly, it was a problem with the conflict resolution with
> ea375f9a (which has been merged first).
>
> This commit moves (again) the RESET event into qemu_system_reset().
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   vl.c |    3 +--
>   1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index d8328c7..fd89e50 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3148,8 +3148,6 @@ static void do_vm_stop(int reason)
>           vm_state_notify(0, reason);
>           monitor_protocol_event(QEVENT_STOP, NULL);
>       }
> -
> -    monitor_protocol_event(QEVENT_RESET, NULL);
>   }
>
>   void qemu_register_reset(QEMUResetHandler *func, void *opaque)
> @@ -3182,6 +3180,7 @@ void qemu_system_reset(void)
>       QTAILQ_FOREACH_SAFE(re,&reset_handlers, entry, nre) {
>           re->func(re->opaque);
>       }
> +    monitor_protocol_event(QEVENT_RESET, NULL);
>       cpu_synchronize_all_post_reset();
>   }
>
>

Patch

diff --git a/vl.c b/vl.c
index d8328c7..fd89e50 100644
--- a/vl.c
+++ b/vl.c
@@ -3148,8 +3148,6 @@  static void do_vm_stop(int reason)
         vm_state_notify(0, reason);
         monitor_protocol_event(QEVENT_STOP, NULL);
     }
-
-    monitor_protocol_event(QEVENT_RESET, NULL);
 }
 
 void qemu_register_reset(QEMUResetHandler *func, void *opaque)
@@ -3182,6 +3180,7 @@  void qemu_system_reset(void)
     QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) {
         re->func(re->opaque);
     }
+    monitor_protocol_event(QEVENT_RESET, NULL);
     cpu_synchronize_all_post_reset();
 }