From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=50041 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR31i-0000On-43 for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OR31b-0003hO-QN for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48458) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OR31b-0003h8-IL for qemu-devel@nongnu.org; Tue, 22 Jun 2010 08:56:23 -0400 From: Jes.Sorensen@redhat.com Date: Tue, 22 Jun 2010 14:56:03 +0200 Message-Id: <1277211364-12451-7-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> References: <1277211364-12451-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: avi@redhat.com Cc: Jes Sorensen , qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jes Sorensen 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 0ee963c..79f91d5 100644 --- a/vl.c +++ b/vl.c @@ -2459,6 +2459,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; @@ -2476,6 +2477,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.7.0.1