On Thu, Feb 07, 2013 at 11:50:28PM -0200, Marcelo Tosatti wrote:
> On Wed, Jan 23, 2013 at 03:19:23PM +0800, Hu Tao wrote:
> > From: Wen Congyang <wency@xxxxxxxxxxxxxx>
> >
> > The guest should run after resetting it, but it does not run if its
> > old state is RUN_STATE_INTERNAL_ERROR or RUN_STATE_PAUSED.
> >
> > We don't set runstate to RUN_STATE_PAUSED when resetting the guest,
> > so the runstate will be changed from RUN_STATE_INTERNAL_ERROR or
> > RUN_STATE_PAUSED to RUN_STATE_RUNNING(not RUN_STATE_PAUSED).
>
> It appears the last hunk will automatically reset state from
> RUN_STATE_INTERNAL_ERROR to RUN_STATE_RUNNING ?
Yes.
>
> I suppose the transition table allows, from RUN_STATE_INTERNAL_ERROR:
>
> <monitor> system_reset
> <monitor> cont
>
> To resume the machine?
True.
I think the purpose of this patch is to always reset and _run_ the guest
by `system_reset', avoiding an additional `cont' following `system_reset'.
>
> >
> > Signed-off-by: Wen Congyang <wency@xxxxxxxxxxxxxx>
> > ---
> > include/block/block.h | 2 ++
> > qmp.c | 2 +-
> > vl.c | 7 ++++---
> > 3 files changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/block/block.h b/include/block/block.h
> > index ffd1936..5e82ccb 100644
> > --- a/include/block/block.h
> > +++ b/include/block/block.h
> > @@ -366,6 +366,8 @@ void bdrv_disable_copy_on_read(BlockDriverState *bs);
> > void bdrv_set_in_use(BlockDriverState *bs, int in_use);
> > int bdrv_in_use(BlockDriverState *bs);
> >
> > +void iostatus_bdrv_it(void *opaque, BlockDriverState *bs);
> > +
> > #ifdef CONFIG_LINUX_AIO
> > int raw_get_aio_fd(BlockDriverState *bs);
> > #else
> > diff --git a/qmp.c b/qmp.c
> > index 55b056b..5f1bed1 100644
> > --- a/qmp.c
> > +++ b/qmp.c
> > @@ -130,7 +130,7 @@ SpiceInfo *qmp_query_spice(Error **errp)
> > };
> > #endif
> >
> > -static void iostatus_bdrv_it(void *opaque, BlockDriverState *bs)
> > +void iostatus_bdrv_it(void *opaque, BlockDriverState *bs)
> > {
> > bdrv_iostatus_reset(bs);
> > }
> > diff --git a/vl.c b/vl.c
> > index b0bcf1e..1d2edaa 100644
> > --- a/vl.c
> > +++ b/vl.c
> > @@ -534,7 +534,7 @@ static const RunStateTransition runstate_transitions_def[] = {
> > { RUN_STATE_INMIGRATE, RUN_STATE_RUNNING },
> > { RUN_STATE_INMIGRATE, RUN_STATE_PAUSED },
> >
> > - { RUN_STATE_INTERNAL_ERROR, RUN_STATE_PAUSED },
> > + { RUN_STATE_INTERNAL_ERROR, RUN_STATE_RUNNING },
> > { RUN_STATE_INTERNAL_ERROR, RUN_STATE_FINISH_MIGRATE },
> >
> > { RUN_STATE_IO_ERROR, RUN_STATE_RUNNING },
> > @@ -569,7 +569,7 @@ static const RunStateTransition runstate_transitions_def[] = {
> >
> > { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
> >
> > - { RUN_STATE_SHUTDOWN, RUN_STATE_PAUSED },
> > + { RUN_STATE_SHUTDOWN, RUN_STATE_RUNNING },
> > { RUN_STATE_SHUTDOWN, RUN_STATE_FINISH_MIGRATE },
> >
> > { RUN_STATE_DEBUG, RUN_STATE_SUSPENDED },
> > @@ -1951,7 +1951,8 @@ static bool main_loop_should_exit(void)
> > resume_all_vcpus();
> > if (runstate_check(RUN_STATE_INTERNAL_ERROR) ||
> > runstate_check(RUN_STATE_SHUTDOWN)) {
> > - runstate_set(RUN_STATE_PAUSED);
> > + bdrv_iterate(iostatus_bdrv_it, NULL);
> > + vm_start();
> > }
> > }
> > if (qemu_wakeup_requested()) {
> > --
> > 1.8.0.1.240.ge8a1f5a
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Regards,
Hu Tao
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
