From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53493 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOVd1-00034l-KQ for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:52:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOVcw-00006f-Qd for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:52:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52423) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOVcw-00006X-J1 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 08:52:26 -0400 From: Jes.Sorensen@redhat.com Date: Tue, 15 Jun 2010 14:51:17 +0200 Message-Id: <1276606278-24268-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1276606278-24268-1-git-send-email-Jes.Sorensen@redhat.com> References: <1276606278-24268-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] Only treat KVM specific cmdline options for KVM enabled builds List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mtosatti@redhat.com Cc: jan.kiszka@siemens.com, qemu-devel@nongnu.org, Jes Sorensen From: Jes Sorensen Only treat KVM specific cmdline options for KVM enabled builds. This fixes build breakage for target MIPS etc. Signed-off-by: Jes Sorensen --- vl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/vl.c b/vl.c index 9e9c176..e4a9aa9 100644 --- a/vl.c +++ b/vl.c @@ -3264,6 +3264,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_no_kvm: kvm_allowed = 0; break; +#ifdef CONFIG_KVM case QEMU_OPTION_no_kvm_irqchip: { kvm_irqchip = 0; kvm_pit = 0; @@ -3281,6 +3282,7 @@ int main(int argc, char **argv, char **envp) kvm_nested = 1; break; } +#endif #if defined(TARGET_I386) || defined(TARGET_X86_64) || defined(TARGET_IA64) || defined(__linux__) case QEMU_OPTION_pcidevice: if (assigned_devices_index >= MAX_DEV_ASSIGN_CMDLINE) { -- 1.6.6.1