From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=35553 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOVOO-0007sN-PI
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:37:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jan.kiszka@siemens.com>) id 1OOVOM-0005ee-0f
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:37:23 -0400
Received: from thoth.sbs.de ([192.35.17.2]:23326)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jan.kiszka@siemens.com>) id 1OOVOL-0005eN-Mt
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:37:21 -0400
Message-ID: <4C1773FF.9030009@siemens.com>
Date: Tue, 15 Jun 2010 14:37:19 +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>
	<4C177029.1090807@siemens.com> <4C1771F3.5090101@redhat.com>
In-Reply-To: <4C1771F3.5090101@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 <Jes.Sorensen@redhat.com>
Cc: "avi@redhat.com" <avi@redhat.com>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>

Jes Sorensen wrote:
> On 06/15/10 14:20, Jan Kiszka wrote:
>>> @@ -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.
> 
> Upstream seems to have removed the TARGET_I386 around 'int no_hpet = 0;'
> but to be honest, I think the correct solution is to not expose no_hpet
> to non x86 targets in upstream.

Then I would suggest to address this upstream first. The goal should be
to keep the diff low.

Jan

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