From patchwork Sun May 16 13:44:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 52747 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 30217B7DD7 for ; Sun, 16 May 2010 23:48:04 +1000 (EST) Received: from localhost ([127.0.0.1]:51538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODeCG-000263-Pm for incoming@patchwork.ozlabs.org; Sun, 16 May 2010 09:48:00 -0400 Received: from [140.186.70.92] (port=51405 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ODe8w-0000Ig-Ik for qemu-devel@nongnu.org; Sun, 16 May 2010 09:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ODe8u-0005Og-Vo for qemu-devel@nongnu.org; Sun, 16 May 2010 09:44:34 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:57543) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ODe8u-0005OZ-Qv for qemu-devel@nongnu.org; Sun, 16 May 2010 09:44:32 -0400 Received: by pwj8 with SMTP id 8so707139pwj.4 for ; Sun, 16 May 2010 06:44:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:content-type; bh=coH88j/+UeaiaZLo8sN0US4VHEeahTWMCibEwJpNFTM=; b=DbEQKohCIQDeUqCfJSNqPjeO9tMhxIAev9tgmKeKPlPep2jSIY2oD/T3iH7n3UOA9Y +RxqjH3zC1S7I2UPXMAgInMOZvHdgNexAMAqvVSLdSb/6nvR7TwFcQtO0X1ULZ+bkYv/ JXynI4/Zcd4TzRoANdnb+XxnA2EYQRfQAY+N8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=FsSHKben4INFNHYWyt9Eshn6o/+RqOOoWkhUmWWUbZtbwUWFwoEYHLFLajBZC7CC5v sBWfEu/YBWRzhVysirPw8AX1k774tKRpdGdNjl6KpVnqZ1kcYUJUZ82Aq8/rMs3lRvuy W6WsmIWEMeXDvEQnJHFuVq8iTA4JJ6JIo6SnI= MIME-Version: 1.0 Received: by 10.141.100.15 with SMTP id c15mr2638504rvm.221.1274017471650; Sun, 16 May 2010 06:44:31 -0700 (PDT) Received: by 10.141.44.12 with HTTP; Sun, 16 May 2010 06:44:31 -0700 (PDT) Date: Sun, 16 May 2010 16:44:31 +0300 Message-ID: From: Blue Swirl To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH B/AB] Remove NO_CPU_IO_DEFS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Blue Swirl --- target-i386/cpu.h | 2 -- target-ppc/cpu.h | 2 -- target-sparc/cpu.h | 2 -- tcg/tcg.c | 1 - translate-all.c | 1 - 5 files changed, 0 insertions(+), 8 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 548ab80..740c06c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -863,9 +863,7 @@ void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4); void cpu_set_apic_base(CPUX86State *env, uint64_t val); uint64_t cpu_get_apic_base(CPUX86State *env); void cpu_set_apic_tpr(CPUX86State *env, uint8_t val); -#ifndef NO_CPU_IO_DEFS uint8_t cpu_get_apic_tpr(CPUX86State *env); -#endif /* hw/pc.c */ void cpu_smm_update(CPUX86State *env); diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 2ad4486..2c024e0 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -763,7 +763,6 @@ const ppc_def_t *cpu_ppc_find_by_name (const char *name); int cpu_ppc_register_internal (CPUPPCState *env, const ppc_def_t *def); /* Time-base and decrementer management */ -#ifndef NO_CPU_IO_DEFS uint64_t cpu_ppc_load_tbl (CPUPPCState *env); uint32_t cpu_ppc_load_tbu (CPUPPCState *env); void cpu_ppc_store_tbu (CPUPPCState *env, uint32_t value); @@ -797,7 +796,6 @@ void ppc_slb_invalidate_one (CPUPPCState *env, uint64_t T0); #endif int ppcemb_tlb_search (CPUPPCState *env, target_ulong address, uint32_t pid); #endif -#endif static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn) { diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 27b020b..2325596 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -434,7 +434,6 @@ typedef struct CPUSPARCState { sparc_def_t *def; } CPUSPARCState; -#ifndef NO_CPU_IO_DEFS /* helper.c */ CPUSPARCState *cpu_sparc_init(const char *cpu_model); void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu); @@ -487,7 +486,6 @@ static inline int tlb_compare_context(const SparcTLBEntry *tlb, } #endif -#endif /* cpu-exec.c */ #if !defined(CONFIG_USER_ONLY) diff --git a/tcg/tcg.c b/tcg/tcg.c index a99ecb9..77223e6 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -52,7 +52,6 @@ /* Note: the long term plan is to reduce the dependancies on the QEMU CPU definitions. Currently they are used for qemu_ld/st instructions */ -#define NO_CPU_IO_DEFS #include "cpu.h" #include "exec-all.h" diff --git a/translate-all.c b/translate-all.c index 91cbbc4..d741f53 100644 --- a/translate-all.c +++ b/translate-all.c @@ -24,7 +24,6 @@ #include "config.h" -#define NO_CPU_IO_DEFS #include "cpu.h" #include "exec-all.h" #include "disas.h"