[PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Jerone Young]

These patches remove all traces of --disable-cpu-emulation configuration flag.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

6 files changed, 2 insertions(+), 227 deletions(-)
qemu/Makefile.target         |    6 --
qemu/configure               |   13 -----
qemu/target-i386/fake-exec.c |   54 ---------------------
qemu/target-ia64/fake-exec.c |   44 -----------------
qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
qemu/vl.c                    |    8 ---

[PATCH 1 of 2] Remove qemu files and entries associated with --disable-cpu-emulation configure argument

[Jerone Young]

6 files changed, 227 deletions(-)
qemu/Makefile.target         |    4 -
qemu/configure               |   13 -----
qemu/target-i386/fake-exec.c |   54 ---------------------
qemu/target-ia64/fake-exec.c |   44 -----------------
qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
qemu/vl.c                    |    8 ---


Signed-off-by: Jerone Young <jyoung5@.us.ibm.com>

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -192,11 +192,7 @@ all: $(PROGS)
 # cpu emulator library
 LIBOBJS=exec.o kqemu.o cpu-exec.o host-utils.o
 
-ifeq ($(NO_CPU_EMULATION), 1)
-LIBOBJS+=fake-exec.o
-else
 LIBOBJS+= translate-all.o translate.o
-endif
 ifdef CONFIG_DYNGEN_OP
 LIBOBJS+=op.o
 endif
diff --git a/qemu/configure b/qemu/configure
--- a/qemu/configure
+++ b/qemu/configure
@@ -116,7 +116,6 @@ uname_release=""
 uname_release=""
 curses="yes"
 nptl="yes"
-cpu_emulation="yes"
 device_tree_support=""
 
 # OS specific
@@ -353,8 +352,6 @@ for opt do
   ;;
   --disable-nptl) nptl="no"
   ;;
-  --disable-cpu-emulation) cpu_emulation="no"
-  ;;
   --disable-libfdt) device_tree_support="no"
   ;;
   *) echo "ERROR: unknown option $opt"; exit 1
@@ -463,7 +460,6 @@ echo "  --fmod-inc               path to
 echo "  --fmod-inc               path to FMOD includes"
 echo "  --enable-uname-release=R Return R for uname -r in usermode emulation"
 echo "  --sparc_cpu=V            Build qemu for Sparc architecture v7, v8, v8plus, v8plusa, v9"
-echo "  --disable-cpu-emulation  disables use of qemu cpu emulation code"
 echo "  --disable-libfdt         disables use of libfdt support for device tree"
 echo ""
 echo "NOTE: The object files are built at the place where configure is launched"
@@ -926,7 +922,6 @@ fi
 fi
 echo "kqemu support     $kqemu"
 echo "kvm support       $kvm"
-echo "CPU emulation     $cpu_emulation"
 if test $cpu = "powerpc"; then
 echo "libfdt support    $device_tree_support"
 fi
@@ -1291,13 +1286,6 @@ interp_prefix1=`echo "$interp_prefix" | 
 interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
 
-disable_cpu_emulation() {
-  if test $cpu_emulation = "no"; then
-    echo "#define NO_CPU_EMULATION 1" >> $config_h
-    echo "NO_CPU_EMULATION=1" >> $config_mak
-  fi
-}
-
 configure_kvm() {
   if test $kvm = "yes" -a "$target_softmmu" = "yes" -a \
           \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "ia64" -o "$cpu" = "powerpc" \); then
@@ -1308,7 +1296,6 @@ configure_kvm() {
 	echo "USE_KVM_PIT=1" >> $config_mak
 	echo "#define USE_KVM_PIT 1" >> $config_h
     fi
-    disable_cpu_emulation
   fi
 }
 
diff --git a/qemu/target-i386/fake-exec.c b/qemu/target-i386/fake-exec.c
deleted file mode 100644
--- a/qemu/target-i386/fake-exec.c
+++ /dev/null
@@ -1,54 +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"
-
-int code_copy_enabled = 0;
-
-CCTable cc_table[CC_OP_NB];
-
-void cpu_dump_statistics (CPUState *env, FILE*f,
-                          int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
-                          int flags)
-{
-}
-
-unsigned long code_gen_max_block_size(void)
-{
-    return 32;
-}
-
-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 flush_icache_range(unsigned long start, unsigned long stop)
-{
-}
-
-void optimize_flags_init(void)
-{
-}
diff --git a/qemu/target-ia64/fake-exec.c b/qemu/target-ia64/fake-exec.c
deleted file mode 100644
--- a/qemu/target-ia64/fake-exec.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * fake-exec.c for ia64.
- *
- * 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>
- *
- * Copyright 2008 Intel Corporation.
- * Added by Xiantao Zhang <xiantao.zhang@intel.com>
- *
- * This work is licensed under the GNU GPL licence version 2 or later.
- *
- */
-#include "exec.h"
-#include "cpu.h"
-
-int code_copy_enabled = 0;
-
-void cpu_gen_init(void)
-{
-}
-
-unsigned long code_gen_max_block_size(void)
-{
-    return 32;
-}
-
-int cpu_ia64_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr)
-{
-    return 0;
-}
-
-void flush_icache_range(unsigned long start, unsigned long stop)
-{
-    while (start < stop) {
-	asm volatile ("fc %0" :: "r"(start));
-	start += 32;
-    }
-    asm volatile (";;sync.i;;srlz.i;;");
-}
-
diff --git a/qemu/target-ppc/fake-exec.c b/qemu/target-ppc/fake-exec.c
deleted file mode 100644
--- a/qemu/target-ppc/fake-exec.c
+++ /dev/null
@@ -1,104 +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 <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "cpu.h"
-#include "exec-all.h"
-
-
-struct ppc_def_t {
-    const unsigned char *name;
-    uint32_t pvr;
-    uint32_t svr;
-    uint64_t insns_flags;
-    uint64_t msr_mask;
-    powerpc_mmu_t   mmu_model;
-    powerpc_excp_t  excp_model;
-    powerpc_input_t bus_model;
-    uint32_t flags;
-    int bfd_mach;
-    void (*init_proc)(CPUPPCState *env);
-    int  (*check_pow)(CPUPPCState *env);
-};
-
-int code_copy_enabled = 0;
-
-void cpu_dump_state (CPUState *env, FILE *f,
-                     int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
-                     int flags)
-{
-}
-
-void ppc_cpu_list (FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...))
-{
-}
-
-void cpu_dump_statistics (CPUState *env, FILE*f,
-                          int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
-                          int flags)
-{
-}
-
-unsigned long code_gen_max_block_size(void)
-{
-    return 32;
-}
-
-void cpu_gen_init(void)
-{
-}
-
-int cpu_restore_state(TranslationBlock *tb,
-                      CPUState *env, unsigned long searched_pc,
-                      void *puc)
-
-{
-    return 0;
-}
-
-int cpu_ppc_gen_code(CPUState *env, TranslationBlock *tb, int *gen_code_size_ptr)
-{
-    return 0;
-}
-
-void init_proc_ppc440ep_kvm(CPUPPCState *env)
-{
-    ppc40x_irq_init(env);
-}
-
-static ppc_def_t ppc440ep_kvm = {
-    .name = "440EP KVM",
-    .mmu_model = POWERPC_MMU_SOFT_4xx, /*XXX needed for GDB stub */
-    .init_proc = init_proc_ppc440ep_kvm,
-};
-
-const ppc_def_t *cpu_ppc_find_by_name (const unsigned char *name)
-{
-    return &ppc440ep_kvm;
-}
-
-int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def)
-{
-    env->mmu_model = def->mmu_model;
-    (*def->init_proc)(env);
-    return 0;
-}
-
-void flush_icache_range(unsigned long start, unsigned long stop)
-{
-}
diff --git a/qemu/vl.c b/qemu/vl.c
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -7786,9 +7786,7 @@ static void help(int exitcode)
            "-no-kqemu       disable KQEMU kernel module usage\n"
 #endif
 #ifdef USE_KVM
-#ifndef NO_CPU_EMULATION
 	   "-no-kvm         disable KVM hardware virtualization\n"
-#endif
 	   "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n"
 	   "-no-kvm-pit	    disable KVM kernel mode PIT\n"
 #endif
@@ -7997,9 +7995,7 @@ const QEMUOption qemu_options[] = {
     { "kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu },
 #endif
 #ifdef USE_KVM
-#ifndef NO_CPU_EMULATION
     { "no-kvm", 0, QEMU_OPTION_no_kvm },
-#endif
     { "no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip },
     { "no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit },
 #endif
@@ -9083,10 +9079,6 @@ int main(int argc, char **argv)
 	if (kvm_qemu_init() < 0) {
 	    extern int kvm_allowed;
 	    fprintf(stderr, "Could not initialize KVM, will disable KVM support\n");
-#ifdef NO_CPU_EMULATION
-	    fprintf(stderr, "Compiled with --disable-cpu-emulation, exiting.\n");
-	    exit(1);
-#endif
 	    kvm_allowed = 0;
 	}
     }

[PATCH 2 of 2] Create dyngen dependency for exec.o for those who still have dyngen

[Jerone Young]

1 file changed, 2 insertions(+)
qemu/Makefile.target |    2 ++


This patch adds a make file dependency for compiling exec.c with archs that still have dyngen dependencies.

This allows powerpc qemu to now compile without the --disable-cpu-emulation flag.

Signed-off-by: Jerone Young <jyoung5@us.ibm.com>

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -334,6 +334,8 @@ op.o: op.c
 
 machine.o: machine.c
 	$(CC) $(OP_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+exec.o : exec.c $(OPC_H)
 
 # HELPER_CFLAGS is used for all the code compiled with static register
 # variables

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Jerone Young]

After getting some private emails on this patch. I felt that I needed to
say that these patches probably should not go in.

There is some value in having a kvm only binary. So having the --disable
cpu-emulation flag still has value.


So best not to remove this honestly until everything completely merges
with upstream qemu.

On Tue, 2008-06-10 at 13:50 -0500, Jerone Young wrote:
> These patches remove all traces of --disable-cpu-emulation configuration flag.
> 
> Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
> 
> 6 files changed, 2 insertions(+), 227 deletions(-)
> qemu/Makefile.target         |    6 --
> qemu/configure               |   13 -----
> qemu/target-i386/fake-exec.c |   54 ---------------------
> qemu/target-ia64/fake-exec.c |   44 -----------------
> qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
> qemu/vl.c                    |    8 ---
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Anthony Liguori]

Jerone Young wrote:
> After getting some private emails on this patch. I felt that I needed to
> say that these patches probably should not go in.
>   

I agree with your sentiment, --disable-cpu-emulation is a terrible hack 
that's is only going to make things difficult to merge with upstream.

The proper solution is to implement a -kvm target type much like 
-softmmu and -linux-user.

So I think this patch series should go in.

Regards,

Anthony Liguori

> There is some value in having a kvm only binary. So having the --disable
> cpu-emulation flag still has value.
>
>
> So best not to remove this honestly until everything completely merges
> with upstream qemu.
>
> On Tue, 2008-06-10 at 13:50 -0500, Jerone Young wrote:
>   
>> These patches remove all traces of --disable-cpu-emulation configuration flag.
>>
>> Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
>>
>> 6 files changed, 2 insertions(+), 227 deletions(-)
>> qemu/Makefile.target         |    6 --
>> qemu/configure               |   13 -----
>> qemu/target-i386/fake-exec.c |   54 ---------------------
>> qemu/target-ia64/fake-exec.c |   44 -----------------
>> qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
>> qemu/vl.c                    |    8 ---
>> --
>> To unsubscribe from this list: send the line "unsubscribe kvm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>     
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>   

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Soren Hansen]

[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]

On Fri, Jun 13, 2008 at 12:44:24PM -0500, Anthony Liguori wrote:
>> After getting some private emails on this patch. I felt that I needed
>> to say that these patches probably should not go in.
> So I think this patch series should go in.

I'm (one of?) the one(s) who e-mail Jerone about the patch.

I added a similar patch to the Ubuntu packages for the Hardy release,
because we wanted to build with gcc 4.x, and the buzz at the time was
that TCG was still somewhat experimental, so I wasn't too hot on the
idea of supporting it for 5 years.  The existence of
--disable-cpu-emulation keeps me from having to maintain a delta to do
the same thing. 

If TCG is considered stable, then I'm cool with not having a
--disable-cpu-emulation switch, but if it's still considered pre-beta
stuff, then I'd very much like to keep it.  It should be trivial to
leave it out, when we try (again) to get kvm and qemu merged and then we
can deal with it some other way.

-- 
Soren Hansen               | 
Virtualisation specialist  | Ubuntu Server Team
Canonical Ltd.             | http://www.ubuntu.com/

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Jerone Young]

I figured you would say that ;-) Seeing how Soren (so that's 2 votes) is
also fine with it, then let's just kick it to the crub and go ahead and
include the patch.

On Fri, 2008-06-13 at 12:44 -0500, Anthony Liguori wrote:
> Jerone Young wrote:
> > After getting some private emails on this patch. I felt that I needed to
> > say that these patches probably should not go in.
> >   
> 
> I agree with your sentiment, --disable-cpu-emulation is a terrible hack 
> that's is only going to make things difficult to merge with upstream.
> 
> The proper solution is to implement a -kvm target type much like 
> -softmmu and -linux-user.
> 
> So I think this patch series should go in.
> 
> Regards,
> 
> Anthony Liguori
> 
> > There is some value in having a kvm only binary. So having the --disable
> > cpu-emulation flag still has value.
> >
> >
> > So best not to remove this honestly until everything completely merges
> > with upstream qemu.
> >
> > On Tue, 2008-06-10 at 13:50 -0500, Jerone Young wrote:
> >   
> >> These patches remove all traces of --disable-cpu-emulation configuration flag.
> >>
> >> Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
> >>
> >> 6 files changed, 2 insertions(+), 227 deletions(-)
> >> qemu/Makefile.target         |    6 --
> >> qemu/configure               |   13 -----
> >> qemu/target-i386/fake-exec.c |   54 ---------------------
> >> qemu/target-ia64/fake-exec.c |   44 -----------------
> >> qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
> >> qemu/vl.c                    |    8 ---
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe kvm" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >>     
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe kvm" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >   
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Anthony Liguori]

Jerone Young wrote:
> These patches remove all traces of --disable-cpu-emulation configuration flag.
>   

Avi: can you apply this series?  --disable-cpu-emulation doesn't compile 
on x86 for kvm-70.  It would be better to revert it then trying to fix 
it since it serves no purpose anymore.

Regards,

Anthony Liguori

> Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
>
> 6 files changed, 2 insertions(+), 227 deletions(-)
> qemu/Makefile.target         |    6 --
> qemu/configure               |   13 -----
> qemu/target-i386/fake-exec.c |   54 ---------------------
> qemu/target-ia64/fake-exec.c |   44 -----------------
> qemu/target-ppc/fake-exec.c  |  104 ------------------------------------------
> qemu/vl.c                    |    8 ---
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>   

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Avi Kivity]

Jerone Young wrote:
> These patches remove all traces of --disable-cpu-emulation configuration flag.
>
>   

I kind of like --disable-cpu-emulation.  It means we have the choice of 
kvm-only (low footprint, shuts up the security people), qemu-only 
(running cross-arch or on older cpu), and mixed mode (I'm a distro so  
don't know what cpu I'm running on).

Well, actually, at least Fedora already supplies both plain qemu and 
qemu-kvm, so it seems they don't care much about mixed mode.  I'll look 
at applying the patches.


-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Avi Kivity]

Avi Kivity wrote:
> Jerone Young wrote:
>> These patches remove all traces of --disable-cpu-emulation 
>> configuration flag.
>>
>>   
>
> I kind of like --disable-cpu-emulation.  It means we have the choice 
> of kvm-only (low footprint, shuts up the security people), qemu-only 
> (running cross-arch or on older cpu), and mixed mode (I'm a distro so  
> don't know what cpu I'm running on).
>
> Well, actually, at least Fedora already supplies both plain qemu and 
> qemu-kvm, so it seems they don't care much about mixed mode.  I'll 
> look at applying the patches.
>

Er, that only makes sense with Anthony's idea of a -kvm subtarget thrown 
in as well.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.

Re: [PATCH 0 of 2] Remove --disable-cpu-emulation for qemu

[Anthony Liguori]

Avi Kivity wrote:
> Avi Kivity wrote:
>> Jerone Young wrote:
>>> These patches remove all traces of --disable-cpu-emulation 
>>> configuration flag.
>>>
>>>   
>>
>> I kind of like --disable-cpu-emulation.  It means we have the choice 
>> of kvm-only (low footprint, shuts up the security people), qemu-only 
>> (running cross-arch or on older cpu), and mixed mode (I'm a distro 
>> so  don't know what cpu I'm running on).
>>
>> Well, actually, at least Fedora already supplies both plain qemu and 
>> qemu-kvm, so it seems they don't care much about mixed mode.  I'll 
>> look at applying the patches.
>>
>
> Er, that only makes sense with Anthony's idea of a -kvm subtarget 
> thrown in as well.

The -kvm subtarget is really easy to implement.  If anyone is interested 
in doing this, let me know and I'll point them in the right direction.  
The good thing about a -kvm subtarget is that we can introduce a 
CONFIG_KVM_ONLY #define which we can use to compile out l1_phys_map et 
al.  That will give a much better RSS reduction than not linking in 
TCG.  I doubt --disable-cpu-emulation really reduces RSS size an 
observable amount.

Regards,

Anthony Liguori