From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36354) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2dJB-0001Tf-TG for qemu-devel@nongnu.org; Tue, 17 May 2016 07:37:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2dJ8-0000qi-Kl for qemu-devel@nongnu.org; Tue, 17 May 2016 07:37:05 -0400 References: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> <1463412982-6681-15-git-send-email-pbonzini@redhat.com> <573AFE48.4080503@redhat.com> From: Paolo Bonzini Message-ID: <573B0255.7070801@redhat.com> Date: Tue, 17 May 2016 13:36:53 +0200 MIME-Version: 1.0 In-Reply-To: <573AFE48.4080503@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 14/50] target-ppc: make cpu-qom.h not target specific List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , qemu-devel@nongnu.org, qemu-ppc@nongnu.org On 17/05/2016 13:19, Thomas Huth wrote: >> > +#if defined(TARGET_PPC64) >> > +#define POWERPC_MMU_64 0x00010000 >> > +#define POWERPC_MMU_1TSEG 0x00020000 >> > +#define POWERPC_MMU_AMR 0x00040000 >> > + /* 64 bits PowerPC MMU */ >> > + POWERPC_MMU_64B = POWERPC_MMU_64 | 0x00000001, >> > + /* Architecture 2.03 and later (has LPCR) */ >> > + POWERPC_MMU_2_03 = POWERPC_MMU_64 | 0x00000002, >> > + /* Architecture 2.06 variant */ >> > + POWERPC_MMU_2_06 = POWERPC_MMU_64 | POWERPC_MMU_1TSEG >> > + | POWERPC_MMU_AMR | 0x00000003, >> > + /* Architecture 2.06 "degraded" (no 1T segments) */ >> > + POWERPC_MMU_2_06a = POWERPC_MMU_64 | POWERPC_MMU_AMR >> > + | 0x00000003, >> > + /* Architecture 2.07 variant */ >> > + POWERPC_MMU_2_07 = POWERPC_MMU_64 | POWERPC_MMU_1TSEG >> > + | POWERPC_MMU_AMR | 0x00000004, >> > + /* Architecture 2.07 "degraded" (no 1T segments) */ >> > + POWERPC_MMU_2_07a = POWERPC_MMU_64 | POWERPC_MMU_AMR >> > + | 0x00000004, >> > +#endif /* defined(TARGET_PPC64) */ >> > +}; > Moving code into cpu-qom.h that depends on a "#ifdef TARGET_PPC64" > in a patch labeled "make cpu-qom.h not target specific" sounds somewhat > wrong to me - even if it's only an enum... Could we somehow avoid this? I would just remove the #ifdef here. The TARGET_PPC64 in PowerPPCCPUClass is a recipe for trouble. If that field can be made present unconditionally, that's probably a good idea. Paolo