[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets |
Date: |
Tue, 15 Jun 2010 14:20:57 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
address@hidden wrote:
> From: Jes Sorensen <address@hidden>
>
> Only accept -no-hpet for i386 targets
>
> Signed-off-by: Jes Sorensen <address@hidden>
> ---
> 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
- [Qemu-devel] [PATCH 1/7] Only call kvm_set_irqfd() if CONFIG_KVM is defined, (continued)
[Qemu-devel] [PATCH 4/7] Build certain drivers for MIPS as well., Jes . Sorensen, 2010/06/15
[Qemu-devel] [PATCH 5/7] Only export phys_mem create functions for !CONFIG_USER_ONLY builds, Jes . Sorensen, 2010/06/15
[Qemu-devel] [PATCH 3/7] time_drift_fix is x86 only, rather than !ia64, Jes . Sorensen, 2010/06/15
[Qemu-devel] [PATCH 7/7] Only accept -no-hpet for i386 targets, Jes . Sorensen, 2010/06/15
- [Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets,
Jan Kiszka <=
[Qemu-devel] Re: [PATCH 7/7] Only accept -no-hpet for i386 targets, Paolo Bonzini, 2010/06/15
[Qemu-devel] [PATCH 6/7] Only treat KVM specific cmdline options for KVM enabled builds, Jes . Sorensen, 2010/06/15
[Qemu-devel] Re: [PATCH 0/7] Fix building qemu-kvm for non KVM target, Avi Kivity, 2010/06/15