From patchwork Fri May 20 17:12:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 804352 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4KHDC2n019974 for ; Fri, 20 May 2011 17:13:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935411Ab1ETRNI (ORCPT ); Fri, 20 May 2011 13:13:08 -0400 Received: from david.siemens.de ([192.35.17.14]:20080 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757128Ab1ETRMs (ORCPT ); Fri, 20 May 2011 13:12:48 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p4KHCg3w007259; Fri, 20 May 2011 19:12:43 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p4KHCeF7023636; Fri, 20 May 2011 19:12:42 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Alexander Graf Subject: [PATCH 03/10] qemu-kvm: ppc: Drop diff to upstream Date: Fri, 20 May 2011 19:12:33 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 20 May 2011 17:13:12 +0000 (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 CC: Alexander Graf --- 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 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< - * This work is licensed under the GNU GPL licence version 2 or later. - * - */ - -#include -#include -#include -#include -#include - -#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) {