[PATCH] qemu-kvm: Drop broken --no-cpu-emulation

[PATCH] qemu-kvm: Drop broken --no-cpu-emulation

[Jan Kiszka]

Doesn't build for quite a while now, let's remove the rotting bits.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Makefile.target         |    6 +---
 configure               |   10 ---------
 exec.c                  |    2 -
 target-i386/fake-exec.c |   52 -----------------------------------------------
 4 files changed, 2 insertions(+), 68 deletions(-)
 delete mode 100644 target-i386/fake-exec.c

diff --git a/Makefile.target b/Makefile.target
index dec62aa..3e72c95 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -69,10 +69,8 @@ all: $(PROGS) stap
 
 #########################################################
 # cpu emulator library
-libobj-y = exec.o cpu-exec.o
-libobj-$(CONFIG_NO_CPU_EMULATION) += fake-exec.o
-libobj-$(CONFIG_CPU_EMULATION) += translate-all.o translate.o
-libobj-$(CONFIG_CPU_EMULATION) += tcg/tcg.o tcg/optimize.o
+libobj-y = exec.o translate-all.o cpu-exec.o translate.o
+libobj-y += tcg/tcg.o tcg/optimize.o
 libobj-$(CONFIG_TCG_INTERPRETER) += tci.o
 libobj-y += fpu/softfloat.o
 libobj-y += op_helper.o helper.o
diff --git a/configure b/configure
index e398697..4a1a4cb 100755
--- a/configure
+++ b/configure
@@ -188,7 +188,6 @@ kvm_cap_device_assignment="yes"
 aix="no"
 blobs="yes"
 pkgversion=" ($(kvm_version))"
-cpu_emulation="yes"
 pie=""
 zero_malloc=""
 trace_backend="nop"
@@ -775,8 +774,6 @@ for opt do
   ;;
   --enable-docs) docs="yes"
   ;;
-  --disable-cpu-emulation) cpu_emulation="no"
-  ;;
   --disable-vhost-net) vhost_net="no"
   ;;
   --enable-vhost-net) vhost_net="yes"
@@ -1078,7 +1075,6 @@ echo "  --enable-linux-aio       enable Linux AIO support"
 echo "  --disable-attr           disables attr and xattr support"
 echo "  --enable-attr            enable attr and xattr support"
 echo "  --disable-blobs          disable installing provided firmware blobs"
-echo "  --disable-cpu-emulation  disables use of qemu cpu emulation code"
 echo "  --enable-docs            enable documentation build"
 echo "  --disable-docs           disable documentation build"
 echo "  --disable-vhost-net      disable vhost-net acceleration support"
@@ -2874,7 +2870,6 @@ if test -n "$sparc_cpu"; then
     echo "Target Sparc Arch $sparc_cpu"
 fi
 echo "xen support       $xen"
-echo "CPU emulation     $cpu_emulation"
 echo "brlapi support    $brlapi"
 echo "bluez  support    $bluez"
 echo "Documentation     $docs"
@@ -3176,11 +3171,6 @@ fi
 if test "$fdatasync" = "yes" ; then
   echo "CONFIG_FDATASYNC=y" >> $config_host_mak
 fi
-if test $cpu_emulation = "yes"; then
-  echo "CONFIG_CPU_EMULATION=y" >> $config_host_mak
-else
-  echo "CONFIG_NO_CPU_EMULATION=y" >> $config_host_mak
-fi
 if test "$madvise" = "yes" ; then
   echo "CONFIG_MADVISE=y" >> $config_host_mak
 fi
diff --git a/exec.c b/exec.c
index 4723ee9..5b9eb9a 100644
--- a/exec.c
+++ b/exec.c
@@ -4360,9 +4360,7 @@ void dump_exec_info(FILE *f, fprintf_function cpu_fprintf)
     cpu_fprintf(f, "TB flush count      %d\n", tb_flush_count);
     cpu_fprintf(f, "TB invalidate count %d\n", tb_phys_invalidate_count);
     cpu_fprintf(f, "TLB flush count     %d\n", tlb_flush_count);
-#ifdef CONFIG_PROFILER
     tcg_dump_info(f, cpu_fprintf);
-#endif
 }
 
 /* NOTE: this function can trigger an exception */
diff --git a/target-i386/fake-exec.c b/target-i386/fake-exec.c
deleted file mode 100644
index e6f8363..0000000
--- a/target-i386/fake-exec.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * fake-exec.c
- *
- * This is a file for stub functions so that compilation is possible
- * when TCG CPU emulation is disabled during compilation.
- *
- * Copyright 2007 IBM Corporation.
- * Added by & Authors:
- * 	Jerone Young <jyoung5@us.ibm.com>
- * This work is licensed under the GNU GPL licence version 2 or later.
- *
- */
-#include "exec.h"
-#include "cpu.h"
-#include "tcg.h"
-
-int code_copy_enabled = 0;
-
-CCTable cc_table[CC_OP_NB];
-
-TCGContext tcg_ctx;
-
-void cpu_dump_statistics (CPUState *env, FILE*f,
-                          int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
-                          int flags)
-{
-}
-
-void cpu_gen_init(void)
-{
-}
-
-int cpu_restore_state(TranslationBlock *tb,
-                      CPUState *env, unsigned long searched_pc,
-                      void *puc)
-
-{
-    return 0;
-}
-
-int cpu_x86_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr)
-{
-    return 0;
-}
-
-void optimize_flags_init(void)
-{
-}
-
-void tcg_prologue_init(TCGContext *ctx)
-{
-}
-- 
1.7.3.4

Re: [PATCH] qemu-kvm: Drop broken --no-cpu-emulation

[Marcelo Tosatti]

On Mon, Feb 06, 2012 at 03:21:41PM +0100, Jan Kiszka wrote:
> Doesn't build for quite a while now, let's remove the rotting bits.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  Makefile.target         |    6 +---
>  configure               |   10 ---------
>  exec.c                  |    2 -
>  target-i386/fake-exec.c |   52 -----------------------------------------------
>  4 files changed, 2 insertions(+), 68 deletions(-)
>  delete mode 100644 target-i386/fake-exec.c

Applied all, thanks.