From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MA0w8-00051I-21 for qemu-devel@nongnu.org; Fri, 29 May 2009 08:11:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MA0w3-0004zz-Hy for qemu-devel@nongnu.org; Fri, 29 May 2009 08:11:47 -0400 Received: from [199.232.76.173] (port=35155 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MA0w3-0004zs-E9 for qemu-devel@nongnu.org; Fri, 29 May 2009 08:11:43 -0400 Received: from mx2.redhat.com ([66.187.237.31]:50255) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MA0w3-0007QT-1T for qemu-devel@nongnu.org; Fri, 29 May 2009 08:11:43 -0400 From: Glauber Costa Date: Fri, 29 May 2009 08:11:40 -0400 Message-Id: <1243599100-3866-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] Disable kqemu by default List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com turns -no-kqemu option into -kqemu set kqemu_allowed to 0 by default. Signed-off-by: Glauber Costa --- kqemu.c | 2 +- qemu-options.hx | 8 ++++---- vl.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kqemu.c b/kqemu.c index 1718498..203241e 100644 --- a/kqemu.c +++ b/kqemu.c @@ -81,7 +81,7 @@ int kqemu_fd = KQEMU_INVALID_FD; 1 = user kqemu 2 = kernel kqemu */ -int kqemu_allowed = 1; +int kqemu_allowed = 0; uint64_t *pages_to_flush; unsigned int nb_pages_to_flush; uint64_t *ram_pages_to_update; diff --git a/qemu-options.hx b/qemu-options.hx index 87af798..755dc13 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1329,12 +1329,12 @@ Enable KQEMU full virtualization (default is user mode only). ETEXI #ifdef CONFIG_KQEMU -DEF("no-kqemu", 0, QEMU_OPTION_no_kqemu, \ - "-no-kqemu disable KQEMU kernel module usage\n") +DEF("-kqemu", 0, QEMU_OPTION_kqemu, \ + "-kqemu enable KQEMU kernel module usage\n") #endif STEXI -@item -no-kqemu -Disable KQEMU kernel module usage. KQEMU options are only available if +@item -kqemu +Enable KQEMU kernel module usage. KQEMU options are only available if KQEMU support is enabled when compiling. ETEXI diff --git a/vl.c b/vl.c index 1a227bb..13d87de 100644 --- a/vl.c +++ b/vl.c @@ -5398,8 +5398,8 @@ int main(int argc, char **argv, char **envp) break; #endif #ifdef CONFIG_KQEMU - case QEMU_OPTION_no_kqemu: - kqemu_allowed = 0; + case QEMU_OPTION_kqemu: + kqemu_allowed = 1; break; case QEMU_OPTION_kernel_kqemu: kqemu_allowed = 2; -- 1.5.6.6