[Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets

[Jes Sorensen]

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.

Cheers,
Jes