From patchwork Mon Jun 27 18:19:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 921962 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5RIKlgh001203 for ; Mon, 27 Jun 2011 18:20:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311Ab1F0SUd (ORCPT ); Mon, 27 Jun 2011 14:20:33 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:44977 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753237Ab1F0SUZ (ORCPT ); Mon, 27 Jun 2011 14:20:25 -0400 Received: from smtp03.web.de ( [172.20.0.65]) by fmmailgate03.web.de (Postfix) with ESMTP id B63E9192E0278; Mon, 27 Jun 2011 20:20:24 +0200 (CEST) Received: from [2.204.233.154] (helo=localhost.localdomain) by smtp03.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QbGQ4-0007wf-00; Mon, 27 Jun 2011 20:20:24 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" , Alex Williamson , Joerg Roedel Subject: [PATCH 03/13] qemu-kvm: Drop -enable-nesting command line switch Date: Mon, 27 Jun 2011 20:19:46 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+C04ZM8mvYfgtT79UCExBPL9CD1gx+UEppA67G KZa8u9S1/SYJyMJrzbl322oKssc+XV24qXvepb9OztPA4JKkjg QjH9WA7HQ= 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.6 (demeter2.kernel.org [140.211.167.43]); Mon, 27 Jun 2011 18:20:47 +0000 (UTC) From: Jan Kiszka Link it is already handling in upstream, this feature can be controlled via -cpu ...+/-svm. CC: Joerg Roedel Signed-off-by: Jan Kiszka --- qemu-kvm.h | 7 ------- qemu-options.hx | 2 -- target-i386/cpuid.c | 3 --- vl.c | 4 ---- 4 files changed, 0 insertions(+), 16 deletions(-) diff --git a/qemu-kvm.h b/qemu-kvm.h index f3f775c..845880e 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -259,19 +259,12 @@ int kvm_update_ioport_access(CPUState *env); int kvm_arch_set_ioport_access(unsigned long start, unsigned long size, bool enable); -#ifdef CONFIG_KVM extern int kvm_irqchip; extern int kvm_pit; extern int kvm_pit_reinject; -extern int kvm_nested; extern unsigned int kvm_shadow_memory; int kvm_handle_tpr_access(CPUState *env); - -#else -#define kvm_nested 0 -#endif - int kvm_tpr_enable_vapic(CPUState *env); #endif diff --git a/qemu-options.hx b/qemu-options.hx index 9972dcf..6a6dc89 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2420,8 +2420,6 @@ DEF("no-kvm-pit-reinjection", 0, QEMU_OPTION_no_kvm_pit_reinjection, "-no-kvm-pit-reinjection\n" " disable KVM kernel mode PIT interrupt reinjection\n", QEMU_ARCH_I386) -DEF("enable-nesting", 0, QEMU_OPTION_enable_nesting, - "-enable-nesting enable support for running a VM inside the VM (AMD only)\n", QEMU_ARCH_I386) DEF("nvram", HAS_ARG, QEMU_OPTION_nvram, "-nvram FILE provide ia64 nvram contents\n", QEMU_ARCH_ALL) DEF("tdf", 0, QEMU_OPTION_tdf, diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index b5b563c..d1f3b43 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -1238,9 +1238,6 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, /* disable CPU features that KVM cannot support */ - /* svm */ - if (!kvm_nested) - *ecx &= ~CPUID_EXT3_SVM; /* 3dnow */ *edx &= ~0xc0000000; } diff --git a/vl.c b/vl.c index 611dbd2..dd870e6 100644 --- a/vl.c +++ b/vl.c @@ -2717,10 +2717,6 @@ int main(int argc, char **argv, char **envp) kvm_pit_reinject = 0; break; } - case QEMU_OPTION_enable_nesting: { - kvm_nested = 1; - break; - } #endif case QEMU_OPTION_usb: usb_enabled = 1;