qemu-kvm: Drop broken --no-cpu-emulation
PATCH 1/1 qemu-kvm: Drop broken --no-cpu-emulation
Doesn't build for quite a while now, let's remove the rotting bits.
Signed-off-by Jan Kiszka <[email protected]>
--- 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
Makefile.target +2 -4
@@ -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
configure +0 -10
@@ -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
exec.c +0 -2
@@ -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 */
target-i386/fake-exec.c deleted +0 -52
52 lines not on this page · raw message
Signature · 1 line
1.7.3.4
Marcelo Tosatti
AppliedQuoted 10 lines · Jan Kiszka
Doesn't build for quite a while now, let's remove the rotting bits.
Signed-off-by Jan Kiszka <[email protected]>--- 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.