On 06/15/2010 01:04 PM, jes.soren...@redhat.com wrote:
From: Jes Sorensen<jes.soren...@redhat.com>
Only accept -no-hpet for i386 targets
Signed-off-by: Jes Sorensen<jes.soren...@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);
This can alternatively be made to match upstream by just removing the
#ifdef on no_hpet's declaration.
Not saying that -no-hpet makes any sense on non-i386 targets, mind, but
it seems pointless to deviate from upstream.
Paolo