From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:54271)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QdoGb-00024E-MZ
	for qemu-devel@nongnu.org; Mon, 04 Jul 2011 14:53:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QdoGZ-0000mA-Th
	for qemu-devel@nongnu.org; Mon, 04 Jul 2011 14:53:09 -0400
Received: from mx1.redhat.com ([209.132.183.28]:33292)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1QdoGZ-0000ll-9t
	for qemu-devel@nongnu.org; Mon, 04 Jul 2011 14:53:07 -0400
Date: Mon, 4 Jul 2011 15:37:47 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20110704183747.GA6113@amt.cnet>
References: <4E02F7EE.6050000@web.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4E02F7EE.6050000@web.de>
Subject: Re: [Qemu-devel] [PATCH][uq/master] kvmclock: Fix feature detection
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jan Kiszka <jan.kiszka@web.de>
Cc: Glauber Costa <glommer@redhat.com>, Avi Kivity <avi@redhat.com>, kvm <kvm@vger.kernel.org>, qemu-devel <qemu-devel@nongnu.org>

On Thu, Jun 23, 2011 at 10:23:10AM +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Bit-wise or the feature flags and drop the obsolete #ifdef.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  hw/kvmclock.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)

Applied, thanks.