From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=44235 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOV8Z-0000eq-30
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:21:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jan.kiszka@siemens.com>) id 1OOV8X-0002bU-Qb
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:21:03 -0400
Received: from david.siemens.de ([192.35.17.14]:16775)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jan.kiszka@siemens.com>) id 1OOV8X-0002bI-Gj
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:21:01 -0400
Message-ID: <4C177029.1090807@siemens.com>
Date: Tue, 15 Jun 2010 14:20:57 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <1276599879-22749-1-git-send-email-Jes.Sorensen@redhat.com>
	<1276599879-22749-8-git-send-email-Jes.Sorensen@redhat.com>
In-Reply-To: <1276599879-22749-8-git-send-email-Jes.Sorensen@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets
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: Jes.Sorensen@redhat.com
Cc: avi@redhat.com, qemu-devel@nongnu.org

Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> Only accept -no-hpet for i386 targets
> 
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  vl.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/vl.c b/vl.c
> index e4a9aa9..1977409 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -3328,9 +3328,11 @@ int main(int argc, char **argv, char **envp)
>              case QEMU_OPTION_no_acpi:
>                  acpi_enabled = 0;
>                  break;
> +#ifdef TARGET_I386
>              case QEMU_OPTION_no_hpet:
>                  no_hpet = 1;
>                  break;
> +#endif
>              case QEMU_OPTION_balloon:
>                  if (balloon_parse(optarg) < 0) {
>                      fprintf(stderr, "Unknown -balloon argument %s\n", optarg);

Upstream carries no-hpet unconditionally now. I guess you need to clean
up a different merge artifact.

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux