From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH 1/1] kvmclock: fix guest stop notification
Date: Thu, 20 Sep 2012 09:46:41 -0300
Message-ID: <20120920124641.GA15092@amt.cnet>
References: <a7267230c907a452a2dbf96daae5332178044741.1348129517.git.amit.shah@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: qemu list <qemu-devel@nongnu.org>, kvm list <kvm@vger.kernel.org>,
	Eric B Munson <emunson@mgebm.net>,
	Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>,
	Andreas =?iso-8859-1?Q?F=E4rber?= <afaerber@suse.de>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Laszlo Ersek <lersek@redhat.com>
To: Amit Shah <amit.shah@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:19258 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755192Ab2ITMsS (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 20 Sep 2012 08:48:18 -0400
Content-Disposition: inline
In-Reply-To: <a7267230c907a452a2dbf96daae5332178044741.1348129517.git.amit.shah@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Thu, Sep 20, 2012 at 01:55:20PM +0530, Amit Shah wrote:
> Commit f349c12c0434e29c79ecde89029320c4002f7253 added the guest stop
> notification, but it did it in a way that the stop notification would
> never reach the kernel.  The kvm_vm_state_changed() function gets a
> value of 0 for the 'running' parameter when the VM is stopped, making
> all the code added previously dead code.
>=20
> This patch reworks the code so that it's called when 'running' is 0,
> which indicates the VM was stopped.
>=20
> CC: Eric B Munson <emunson@mgebm.net>
> CC: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
> CC: Andreas F=E4rber <afaerber@suse.de>
> CC: Marcelo Tosatti <mtosatti@redhat.com>
> CC: Paolo Bonzini <pbonzini@redhat.com>
> CC: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Amit Shah <amit.shah@redhat.com>
> ---
>  hw/kvm/clock.c |   21 +++++++++++----------
>  1 files changed, 11 insertions(+), 10 deletions(-)
>=20
> diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c
> index 824b978..f3427eb 100644
> --- a/hw/kvm/clock.c
> +++ b/hw/kvm/clock.c
> @@ -71,18 +71,19 @@ static void kvmclock_vm_state_change(void *opaque=
, int running,
> =20
>      if (running) {
>          s->clock_valid =3D false;
> +        return;
> +    }
> =20
> -        if (!cap_clock_ctrl) {
> -            return;
> -        }
> -        for (penv =3D first_cpu; penv !=3D NULL; penv =3D penv->next=
_cpu) {
> -            ret =3D kvm_vcpu_ioctl(penv, KVM_KVMCLOCK_CTRL, 0);
> -            if (ret) {
> -                if (ret !=3D -EINVAL) {
> -                    fprintf(stderr, "%s: %s\n", __func__, strerror(-=
ret));
> -                }
> -                return;
> +    if (!cap_clock_ctrl) {
> +        return;
> +    }
> +    for (penv =3D first_cpu; penv !=3D NULL; penv =3D penv->next_cpu=
) {
> +        ret =3D kvm_vcpu_ioctl(penv, KVM_KVMCLOCK_CTRL, 0);
> +        if (ret) {
> +            if (ret !=3D -EINVAL) {
> +                fprintf(stderr, "%s: %s\n", __func__, strerror(-ret)=
);
>              }
> +            return;
>          }
>      }
>  }
> --=20
> 1.7.7.6

ACK

Avi, please merge through uq/master.