From patchwork Tue Jun 22 12:56:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 107386 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MCuRTu018668 for ; Tue, 22 Jun 2010 12:56:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758065Ab0FVM4Z (ORCPT ); Tue, 22 Jun 2010 08:56:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48585 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757112Ab0FVM4X (ORCPT ); Tue, 22 Jun 2010 08:56:23 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCuMJ1001885 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 08:56:22 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCu6te002896; Tue, 22 Jun 2010 08:56:20 -0400 From: Jes.Sorensen@redhat.com To: avi@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jes Sorensen Subject: [PATCH 6/7] Only treat KVM specific cmdline options for KVM enabled builds 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 12:56:27 +0000 (UTC) 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) {