[03/10] qemu-kvm: ppc: Drop diff to upstream

Commit Message

Jan Kiszka May 20, 2011, 5:12 p.m. UTC

qemu-kvm is x86-only today. Remove the remaining delta of the former ppc
support to avoid needless conflicts when sync'ing with upstream.

Signed-off-by: Jan Kiszka <[e-mail]>
CC: Alexander Graf <[e-mail]>
---
 target-ppc/cpu.h       |   10 +----
 target-ppc/fake-exec.c |  104 ------------------------------------------------
 target-ppc/helper.c    |    1 -
 target-ppc/machine.c   |    1 -
 4 files changed, 1 insertions(+), 115 deletions(-)
 delete mode 100644 target-ppc/fake-exec.c

Patch

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 133df95..7a6a7df 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -52,10 +52,9 @@ 
 #if defined(TARGET_PPCEMB)
 /* Specific definitions for PowerPC embedded */
 /* BookE have 36 bits physical address space */
-#if defined(CONFIG_USER_ONLY) || defined(USE_KVM)
+#if defined(CONFIG_USER_ONLY)
 /* It looks like a lot of Linux programs assume page size
  * is 4kB long. This is evil, but we have to deal with it...
- * Also kvm for embedded powerpc needs (atm) 4kB aligned pages
  */
 #define TARGET_PAGE_BITS 12
 #else /* defined(CONFIG_USER_ONLY) */
@@ -1927,13 +1926,6 @@  static inline void cpu_set_tls(CPUState *env, target_ulong newtls)
 #endif
 }
 
-/* hidden flags (hflags) - used internally by qemu to represent additional
- * cpu states.
- */
-#define HF_HALTED_SHIFT 1
-
-#define HF_HALTED_MASK 1<<HF_HALTED_SHIFT
-
 #if !defined(CONFIG_USER_ONLY)
 static inline int booke206_tlbe_id(CPUState *env, ppcemb_tlb_t *tlbe)
 {
diff --git a/target-ppc/fake-exec.c b/target-ppc/fake-exec.c
deleted file mode 100644
index 259e06d..0000000
--- a/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 <[e-mail]>
- * 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/target-ppc/helper.c b/target-ppc/helper.c
index 95f81ec..4238be6 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -28,7 +28,6 @@ 
 #include "helper_regs.h"
 #include "qemu-common.h"
 #include "kvm.h"
-#include "qemu-kvm.h"
 
 //#define DEBUG_MMU
 //#define DEBUG_BATS
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 4b98113..0c1986e 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,7 +1,6 @@ 
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "kvm.h"
-#include "qemu-kvm.h"
 
 void cpu_save(QEMUFile *f, void *opaque)
 {