From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36789) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyw-00049f-QC for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3Lyr-00045a-5N for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:09 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3Lyq-00045E-UE for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:05 -0400 Received: by mail-wm0-x242.google.com with SMTP id w143so20025567wmw.3 for ; Thu, 19 May 2016 04:19:04 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.19.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:03 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 19 May 2016 13:18:09 +0200 Message-Id: <1463656726-35952-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 15/52] target-ppc: do not make PowerPCCPUClass depend on target-specific symbols List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Just leave some members in even if they are unused on e.g. 32-bit PPC or user-mode emulation. This avoids complications when using PowerPCCPUClass in code that is compiled just once (because it applies to both 32-bit and 64-bit PPC for example) but still needs to peek at PPC-specific members. Signed-off-by: Paolo Bonzini --- target-ppc/cpu-qom.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target-ppc/cpu-qom.h b/target-ppc/cpu-qom.h index bab501f..6f4e929 100644 --- a/target-ppc/cpu-qom.h +++ b/target-ppc/cpu-qom.h @@ -67,14 +67,10 @@ typedef struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; -#if defined(TARGET_PPC64) const struct ppc_segment_page_sizes *sps; -#endif void (*init_proc)(CPUPPCState *env); int (*check_pow)(CPUPPCState *env); -#if defined(CONFIG_SOFTMMU) int (*handle_mmu_fault)(PowerPCCPU *cpu, vaddr eaddr, int rwx, int mmu_idx); -#endif bool (*interrupts_big_endian)(PowerPCCPU *cpu); } PowerPCCPUClass; -- 1.8.3.1