From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=53522 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q0WrX-00054C-1J
	for qemu-devel@nongnu.org; Fri, 18 Mar 2011 06:24:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan.kiszka@web.de>) id 1Q0WrW-0002ZY-3W
	for qemu-devel@nongnu.org; Fri, 18 Mar 2011 06:24:54 -0400
Received: from fmmailgate01.web.de ([217.72.192.221]:45655)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@web.de>) id 1Q0WrV-0002ZI-PI
	for qemu-devel@nongnu.org; Fri, 18 Mar 2011 06:24:54 -0400
Message-ID: <4D8332F3.2090301@web.de>
Date: Fri, 18 Mar 2011 11:24:51 +0100
From: Jan Kiszka <jan.kiszka@web.de>
MIME-Version: 1.0
References: <1300401727-5235-1-git-send-email-glommer@redhat.com>
	<1300401727-5235-4-git-send-email-glommer@redhat.com>
In-Reply-To: <1300401727-5235-4-git-send-email-glommer@redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig4138FF15418BE57AA03ADC50"
Sender: jan.kiszka@web.de
Subject: [Qemu-devel] Re: [PATCH 3/3] don't create kvmclock when one of the
	flags are present.
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Glauber Costa <glommer@redhat.com>
Cc: mtosatti@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org, avi@redhat.com

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig4138FF15418BE57AA03ADC50
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable

On 2011-03-17 23:42, Glauber Costa wrote:
> kvmclock presence can be signalled by two different flags. So for
> device creation, we have to test for both.

Patch is OK, but the subject's logic is inverted.

Jan

>=20
> Signed-off-by: Glauber Costa <glommer@redhat.com>
> ---
>  hw/kvmclock.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>=20
> diff --git a/hw/kvmclock.c b/hw/kvmclock.c
> index b6ceddf..004c4ad 100644
> --- a/hw/kvmclock.c
> +++ b/hw/kvmclock.c
> @@ -103,7 +103,11 @@ static SysBusDeviceInfo kvmclock_info =3D {
>  void kvmclock_create(void)
>  {
>      if (kvm_enabled() &&
> -        first_cpu->cpuid_kvm_features & (1ULL << KVM_FEATURE_CLOCKSOUR=
CE)) {
> +        first_cpu->cpuid_kvm_features & ((1ULL << KVM_FEATURE_CLOCKSOU=
RCE)
> +#ifdef KVM_FEATURE_CLOCKSOURCE2
> +        || (1ULL << KVM_FEATURE_CLOCKSOURCE2)
> +#endif
> +    )) {
>          sysbus_create_simple("kvmclock", -1, NULL);
>      }
>  }


--------------enig4138FF15418BE57AA03ADC50
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/

iEYEARECAAYFAk2DMvMACgkQitSsb3rl5xTVCwCeM2YXcvCcXY2Q4pukcG7At0/D
eEUAoMWSnlIZ+YQDQwq2CykxZuRNVzUY
=65lP
-----END PGP SIGNATURE-----

--------------enig4138FF15418BE57AA03ADC50--