* [Qemu-devel] [PATCH 0/2] ppc: remove dead definitions @ 2017-09-19 21:36 John Snow 2017-09-19 21:36 ` [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions John Snow 2017-09-19 21:36 ` [Qemu-devel] [PATCH 2/2] ppc: remove all " John Snow 0 siblings, 2 replies; 7+ messages in thread From: John Snow @ 2017-09-19 21:36 UTC (permalink / raw) To: qemu-devel; +Cc: imammedo, thuth, agraf, david, John Snow Following conversation from: https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg05362.html Split into two patches: (1) Definitions that match Igor's cleanup precisely (2) Everything else I brazenly took a chainsaw to with little precision (Only lightly tested.) John Snow (2): ppc: remove unused CPU definitions ppc: remove all unused CPU definitions target/ppc/cpu-models.h | 255 ------------------------------------------------ 1 file changed, 255 deletions(-) -- 2.9.5 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions 2017-09-19 21:36 [Qemu-devel] [PATCH 0/2] ppc: remove dead definitions John Snow @ 2017-09-19 21:36 ` John Snow 2017-09-20 18:47 ` Thomas Huth 2017-09-19 21:36 ` [Qemu-devel] [PATCH 2/2] ppc: remove all " John Snow 1 sibling, 1 reply; 7+ messages in thread From: John Snow @ 2017-09-19 21:36 UTC (permalink / raw) To: qemu-devel; +Cc: imammedo, thuth, agraf, david, John Snow Following commit aef77960, remove now-unused definitions from cpu-models.h. Signed-off-by: John Snow <jsnow@redhat.com> --- target/ppc/cpu-models.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index df31d7f..b34b512 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -291,34 +291,6 @@ enum { #endif CPU_POWERPC_e200z5 = 0x81000000, CPU_POWERPC_e200z6 = 0x81120000, - /* MPC55xx microcontrollers */ -#define CPU_POWERPC_MPC55xx CPU_POWERPC_MPC5567 -#if 0 -#define CPU_POWERPC_MPC5514E CPU_POWERPC_MPC5514E_v1 -#define CPU_POWERPC_MPC5514E_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5514E_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5514G CPU_POWERPC_MPC5514G_v1 -#define CPU_POWERPC_MPC5514G_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5514G_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5515S CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516E CPU_POWERPC_MPC5516E_v1 -#define CPU_POWERPC_MPC5516E_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5516E_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516G CPU_POWERPC_MPC5516G_v1 -#define CPU_POWERPC_MPC5516G_v0 CPU_POWERPC_e200z0 -#define CPU_POWERPC_MPC5516G_v1 CPU_POWERPC_e200z1 -#define CPU_POWERPC_MPC5516S CPU_POWERPC_e200z1 -#endif -#if 0 -#define CPU_POWERPC_MPC5533 CPU_POWERPC_e200z3 -#define CPU_POWERPC_MPC5534 CPU_POWERPC_e200z3 -#endif -#define CPU_POWERPC_MPC5553 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5554 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5561 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5565 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5566 CPU_POWERPC_e200z6 -#define CPU_POWERPC_MPC5567 CPU_POWERPC_e200z6 /* e300 family */ /* e300 cores */ CPU_POWERPC_e300c1 = 0x00830010, @@ -326,11 +298,7 @@ enum { CPU_POWERPC_e300c3 = 0x00850010, CPU_POWERPC_e300c4 = 0x00860010, /* MPC83xx microcontrollers */ -#define CPU_POWERPC_MPC831x CPU_POWERPC_e300c3 -#define CPU_POWERPC_MPC832x CPU_POWERPC_e300c2 #define CPU_POWERPC_MPC834x CPU_POWERPC_e300c1 -#define CPU_POWERPC_MPC835x CPU_POWERPC_e300c1 -#define CPU_POWERPC_MPC836x CPU_POWERPC_e300c1 #define CPU_POWERPC_MPC837x CPU_POWERPC_e300c4 /* e500 family */ /* e500 cores */ -- 2.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions 2017-09-19 21:36 ` [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions John Snow @ 2017-09-20 18:47 ` Thomas Huth 2017-09-23 5:23 ` David Gibson 0 siblings, 1 reply; 7+ messages in thread From: Thomas Huth @ 2017-09-20 18:47 UTC (permalink / raw) To: John Snow, qemu-devel; +Cc: imammedo, agraf, david On 19.09.2017 23:36, John Snow wrote: > Following commit aef77960, remove now-unused definitions from > cpu-models.h. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > target/ppc/cpu-models.h | 32 -------------------------------- > 1 file changed, 32 deletions(-) > > diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h > index df31d7f..b34b512 100644 > --- a/target/ppc/cpu-models.h > +++ b/target/ppc/cpu-models.h > @@ -291,34 +291,6 @@ enum { > #endif > CPU_POWERPC_e200z5 = 0x81000000, > CPU_POWERPC_e200z6 = 0x81120000, > - /* MPC55xx microcontrollers */ > -#define CPU_POWERPC_MPC55xx CPU_POWERPC_MPC5567 > -#if 0 > -#define CPU_POWERPC_MPC5514E CPU_POWERPC_MPC5514E_v1 > -#define CPU_POWERPC_MPC5514E_v0 CPU_POWERPC_e200z0 > -#define CPU_POWERPC_MPC5514E_v1 CPU_POWERPC_e200z1 > -#define CPU_POWERPC_MPC5514G CPU_POWERPC_MPC5514G_v1 > -#define CPU_POWERPC_MPC5514G_v0 CPU_POWERPC_e200z0 > -#define CPU_POWERPC_MPC5514G_v1 CPU_POWERPC_e200z1 > -#define CPU_POWERPC_MPC5515S CPU_POWERPC_e200z1 > -#define CPU_POWERPC_MPC5516E CPU_POWERPC_MPC5516E_v1 > -#define CPU_POWERPC_MPC5516E_v0 CPU_POWERPC_e200z0 > -#define CPU_POWERPC_MPC5516E_v1 CPU_POWERPC_e200z1 > -#define CPU_POWERPC_MPC5516G CPU_POWERPC_MPC5516G_v1 > -#define CPU_POWERPC_MPC5516G_v0 CPU_POWERPC_e200z0 > -#define CPU_POWERPC_MPC5516G_v1 CPU_POWERPC_e200z1 > -#define CPU_POWERPC_MPC5516S CPU_POWERPC_e200z1 > -#endif > -#if 0 > -#define CPU_POWERPC_MPC5533 CPU_POWERPC_e200z3 > -#define CPU_POWERPC_MPC5534 CPU_POWERPC_e200z3 > -#endif > -#define CPU_POWERPC_MPC5553 CPU_POWERPC_e200z6 > -#define CPU_POWERPC_MPC5554 CPU_POWERPC_e200z6 > -#define CPU_POWERPC_MPC5561 CPU_POWERPC_e200z6 > -#define CPU_POWERPC_MPC5565 CPU_POWERPC_e200z6 > -#define CPU_POWERPC_MPC5566 CPU_POWERPC_e200z6 > -#define CPU_POWERPC_MPC5567 CPU_POWERPC_e200z6 > /* e300 family */ > /* e300 cores */ > CPU_POWERPC_e300c1 = 0x00830010, > @@ -326,11 +298,7 @@ enum { > CPU_POWERPC_e300c3 = 0x00850010, > CPU_POWERPC_e300c4 = 0x00860010, > /* MPC83xx microcontrollers */ I think you should also remove the above comment now? > -#define CPU_POWERPC_MPC831x CPU_POWERPC_e300c3 > -#define CPU_POWERPC_MPC832x CPU_POWERPC_e300c2 > #define CPU_POWERPC_MPC834x CPU_POWERPC_e300c1 > -#define CPU_POWERPC_MPC835x CPU_POWERPC_e300c1 > -#define CPU_POWERPC_MPC836x CPU_POWERPC_e300c1 > #define CPU_POWERPC_MPC837x CPU_POWERPC_e300c4 > /* e500 family */ > /* e500 cores */ With the above comment removed: Reviewed-by: Thomas Huth <thuth@redhat.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions 2017-09-20 18:47 ` Thomas Huth @ 2017-09-23 5:23 ` David Gibson 0 siblings, 0 replies; 7+ messages in thread From: David Gibson @ 2017-09-23 5:23 UTC (permalink / raw) To: Thomas Huth; +Cc: John Snow, qemu-devel, imammedo, agraf [-- Attachment #1: Type: text/plain, Size: 3400 bytes --] On Wed, Sep 20, 2017 at 08:47:43PM +0200, Thomas Huth wrote: > On 19.09.2017 23:36, John Snow wrote: > > Following commit aef77960, remove now-unused definitions from > > cpu-models.h. > > > > Signed-off-by: John Snow <jsnow@redhat.com> > > --- > > target/ppc/cpu-models.h | 32 -------------------------------- > > 1 file changed, 32 deletions(-) > > > > diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h > > index df31d7f..b34b512 100644 > > --- a/target/ppc/cpu-models.h > > +++ b/target/ppc/cpu-models.h > > @@ -291,34 +291,6 @@ enum { > > #endif > > CPU_POWERPC_e200z5 = 0x81000000, > > CPU_POWERPC_e200z6 = 0x81120000, > > - /* MPC55xx microcontrollers */ > > -#define CPU_POWERPC_MPC55xx CPU_POWERPC_MPC5567 > > -#if 0 > > -#define CPU_POWERPC_MPC5514E CPU_POWERPC_MPC5514E_v1 > > -#define CPU_POWERPC_MPC5514E_v0 CPU_POWERPC_e200z0 > > -#define CPU_POWERPC_MPC5514E_v1 CPU_POWERPC_e200z1 > > -#define CPU_POWERPC_MPC5514G CPU_POWERPC_MPC5514G_v1 > > -#define CPU_POWERPC_MPC5514G_v0 CPU_POWERPC_e200z0 > > -#define CPU_POWERPC_MPC5514G_v1 CPU_POWERPC_e200z1 > > -#define CPU_POWERPC_MPC5515S CPU_POWERPC_e200z1 > > -#define CPU_POWERPC_MPC5516E CPU_POWERPC_MPC5516E_v1 > > -#define CPU_POWERPC_MPC5516E_v0 CPU_POWERPC_e200z0 > > -#define CPU_POWERPC_MPC5516E_v1 CPU_POWERPC_e200z1 > > -#define CPU_POWERPC_MPC5516G CPU_POWERPC_MPC5516G_v1 > > -#define CPU_POWERPC_MPC5516G_v0 CPU_POWERPC_e200z0 > > -#define CPU_POWERPC_MPC5516G_v1 CPU_POWERPC_e200z1 > > -#define CPU_POWERPC_MPC5516S CPU_POWERPC_e200z1 > > -#endif > > -#if 0 > > -#define CPU_POWERPC_MPC5533 CPU_POWERPC_e200z3 > > -#define CPU_POWERPC_MPC5534 CPU_POWERPC_e200z3 > > -#endif > > -#define CPU_POWERPC_MPC5553 CPU_POWERPC_e200z6 > > -#define CPU_POWERPC_MPC5554 CPU_POWERPC_e200z6 > > -#define CPU_POWERPC_MPC5561 CPU_POWERPC_e200z6 > > -#define CPU_POWERPC_MPC5565 CPU_POWERPC_e200z6 > > -#define CPU_POWERPC_MPC5566 CPU_POWERPC_e200z6 > > -#define CPU_POWERPC_MPC5567 CPU_POWERPC_e200z6 > > /* e300 family */ > > /* e300 cores */ > > CPU_POWERPC_e300c1 = 0x00830010, > > @@ -326,11 +298,7 @@ enum { > > CPU_POWERPC_e300c3 = 0x00850010, > > CPU_POWERPC_e300c4 = 0x00860010, > > /* MPC83xx microcontrollers */ > > I think you should also remove the above comment now? > > > -#define CPU_POWERPC_MPC831x CPU_POWERPC_e300c3 > > -#define CPU_POWERPC_MPC832x CPU_POWERPC_e300c2 > > #define CPU_POWERPC_MPC834x CPU_POWERPC_e300c1 > > -#define CPU_POWERPC_MPC835x CPU_POWERPC_e300c1 > > -#define CPU_POWERPC_MPC836x CPU_POWERPC_e300c1 > > #define CPU_POWERPC_MPC837x CPU_POWERPC_e300c4 > > /* e500 family */ > > /* e500 cores */ > > With the above comment removed: > > Reviewed-by: Thomas Huth <thuth@redhat.com> No, there's still one entry left in that subsection, so the comment should stay. Applied. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 2/2] ppc: remove all unused CPU definitions 2017-09-19 21:36 [Qemu-devel] [PATCH 0/2] ppc: remove dead definitions John Snow 2017-09-19 21:36 ` [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions John Snow @ 2017-09-19 21:36 ` John Snow 2017-09-20 18:52 ` Thomas Huth 1 sibling, 1 reply; 7+ messages in thread From: John Snow @ 2017-09-19 21:36 UTC (permalink / raw) To: qemu-devel; +Cc: imammedo, thuth, agraf, david, John Snow Remove *all* unused CPU definitions as indicated by compile-time `#if 0` constructs. Signed-off-by: John Snow <jsnow@redhat.com> --- target/ppc/cpu-models.h | 223 ------------------------------------------------ 1 file changed, 223 deletions(-) diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h index b34b512..248f833 100644 --- a/target/ppc/cpu-models.h +++ b/target/ppc/cpu-models.h @@ -44,184 +44,55 @@ enum { /* PowerPC 401 cores */ CPU_POWERPC_401A1 = 0x00210000, CPU_POWERPC_401B2 = 0x00220000, -#if 0 - CPU_POWERPC_401B3 = xxx, -#endif CPU_POWERPC_401C2 = 0x00230000, CPU_POWERPC_401D2 = 0x00240000, CPU_POWERPC_401E2 = 0x00250000, CPU_POWERPC_401F2 = 0x00260000, CPU_POWERPC_401G2 = 0x00270000, /* PowerPC 401 microcontrolers */ -#if 0 - CPU_POWERPC_401GF = xxx, -#endif #define CPU_POWERPC_IOP480 CPU_POWERPC_401B2 /* IBM Processor for Network Resources */ CPU_POWERPC_COBRA = 0x10100000, /* XXX: 405 ? */ -#if 0 - CPU_POWERPC_XIPCHIP = xxx, -#endif /* PowerPC 403 family */ /* PowerPC 403 microcontrollers */ CPU_POWERPC_403GA = 0x00200011, CPU_POWERPC_403GB = 0x00200100, CPU_POWERPC_403GC = 0x00200200, CPU_POWERPC_403GCX = 0x00201400, -#if 0 - CPU_POWERPC_403GP = xxx, -#endif /* PowerPC 405 family */ /* PowerPC 405 cores */ -#if 0 - CPU_POWERPC_405A3 = xxx, -#endif -#if 0 - CPU_POWERPC_405A4 = xxx, -#endif -#if 0 - CPU_POWERPC_405B3 = xxx, -#endif -#if 0 - CPU_POWERPC_405B4 = xxx, -#endif -#if 0 - CPU_POWERPC_405C3 = xxx, -#endif -#if 0 - CPU_POWERPC_405C4 = xxx, -#endif CPU_POWERPC_405D2 = 0x20010000, -#if 0 - CPU_POWERPC_405D3 = xxx, -#endif CPU_POWERPC_405D4 = 0x41810000, -#if 0 - CPU_POWERPC_405D5 = xxx, -#endif -#if 0 - CPU_POWERPC_405E4 = xxx, -#endif -#if 0 - CPU_POWERPC_405F4 = xxx, -#endif -#if 0 - CPU_POWERPC_405F5 = xxx, -#endif -#if 0 - CPU_POWERPC_405F6 = xxx, -#endif /* PowerPC 405 microcontrolers */ /* XXX: missing 0x200108a0 */ CPU_POWERPC_405CRa = 0x40110041, CPU_POWERPC_405CRb = 0x401100C5, CPU_POWERPC_405CRc = 0x40110145, CPU_POWERPC_405EP = 0x51210950, -#if 0 - CPU_POWERPC_405EXr = xxx, -#endif CPU_POWERPC_405EZ = 0x41511460, /* 0x51210950 ? */ -#if 0 - CPU_POWERPC_405FX = xxx, -#endif CPU_POWERPC_405GPa = 0x40110000, CPU_POWERPC_405GPb = 0x40110040, CPU_POWERPC_405GPc = 0x40110082, CPU_POWERPC_405GPd = 0x401100C4, CPU_POWERPC_405GPR = 0x50910951, -#if 0 - CPU_POWERPC_405H = xxx, -#endif -#if 0 - CPU_POWERPC_405L = xxx, -#endif CPU_POWERPC_405LP = 0x41F10000, -#if 0 - CPU_POWERPC_405PM = xxx, -#endif -#if 0 - CPU_POWERPC_405PS = xxx, -#endif -#if 0 - CPU_POWERPC_405S = xxx, -#endif /* IBM network processors */ CPU_POWERPC_NPE405H = 0x414100C0, CPU_POWERPC_NPE405H2 = 0x41410140, CPU_POWERPC_NPE405L = 0x416100C0, CPU_POWERPC_NPE4GS3 = 0x40B10000, -#if 0 - CPU_POWERPC_NPCxx1 = xxx, -#endif -#if 0 - CPU_POWERPC_NPR161 = xxx, -#endif -#if 0 - CPU_POWERPC_LC77700 = xxx, -#endif /* IBM STBxxx (PowerPC 401/403/405 core based microcontrollers) */ -#if 0 - CPU_POWERPC_STB01000 = xxx, -#endif -#if 0 - CPU_POWERPC_STB01010 = xxx, -#endif -#if 0 - CPU_POWERPC_STB0210 = xxx, /* 401B3 */ -#endif CPU_POWERPC_STB03 = 0x40310000, /* 0x40130000 ? */ -#if 0 - CPU_POWERPC_STB043 = xxx, -#endif -#if 0 - CPU_POWERPC_STB045 = xxx, -#endif CPU_POWERPC_STB04 = 0x41810000, CPU_POWERPC_STB25 = 0x51510950, -#if 0 - CPU_POWERPC_STB130 = xxx, -#endif /* Xilinx cores */ CPU_POWERPC_X2VP4 = 0x20010820, CPU_POWERPC_X2VP20 = 0x20010860, -#if 0 - CPU_POWERPC_ZL10310 = xxx, -#endif -#if 0 - CPU_POWERPC_ZL10311 = xxx, -#endif -#if 0 - CPU_POWERPC_ZL10320 = xxx, -#endif -#if 0 - CPU_POWERPC_ZL10321 = xxx, -#endif /* PowerPC 440 family */ /* Generic PowerPC 440 */ #define CPU_POWERPC_440 CPU_POWERPC_440GXf /* PowerPC 440 cores */ -#if 0 - CPU_POWERPC_440A4 = xxx, -#endif CPU_POWERPC_440_XILINX = 0x7ff21910, -#if 0 - CPU_POWERPC_440A5 = xxx, -#endif -#if 0 - CPU_POWERPC_440B4 = xxx, -#endif -#if 0 - CPU_POWERPC_440F5 = xxx, -#endif -#if 0 - CPU_POWERPC_440G5 = xxx, -#endif -#if 0 - CPU_POWERPC_440H4 = xxx, -#endif -#if 0 - CPU_POWERPC_440H6 = xxx, -#endif /* PowerPC 440 microcontrolers */ CPU_POWERPC_440EPa = 0x42221850, CPU_POWERPC_440EPb = 0x422218D3, @@ -234,24 +105,11 @@ enum { CPU_POWERPC_440GXb = 0x51B21851, CPU_POWERPC_440GXc = 0x51B21892, CPU_POWERPC_440GXf = 0x51B21894, -#if 0 - CPU_POWERPC_440S = xxx, -#endif CPU_POWERPC_440SP = 0x53221850, CPU_POWERPC_440SP2 = 0x53221891, CPU_POWERPC_440SPE = 0x53421890, /* PowerPC 460 family */ -#if 0 - /* Generic PowerPC 464 */ -#define CPU_POWERPC_464 CPU_POWERPC_464H90 -#endif /* PowerPC 464 microcontrolers */ -#if 0 - CPU_POWERPC_464H90 = xxx, -#endif -#if 0 - CPU_POWERPC_464H90FP = xxx, -#endif /* Freescale embedded PowerPC cores */ /* PowerPC MPC 5xx cores (aka RCPU) */ CPU_POWERPC_MPC5xx = 0x00020020, @@ -280,15 +138,6 @@ enum { #define CPU_POWERPC_MPC5200B_v21 CPU_POWERPC_G2LEgp1 /* e200 family */ /* e200 cores */ -#if 0 - CPU_POWERPC_e200z0 = xxx, -#endif -#if 0 - CPU_POWERPC_e200z1 = xxx, -#endif -#if 0 /* ? */ - CPU_POWERPC_e200z3 = 0x81120000, -#endif CPU_POWERPC_e200z5 = 0x81000000, CPU_POWERPC_e200z6 = 0x81120000, /* e300 family */ @@ -406,9 +255,6 @@ enum { /* XXX: missing 0x000a0100 */ /* XXX: missing 0x00093102 */ CPU_POWERPC_604R = 0x000a0101, -#if 0 - CPU_POWERPC_604EV = xxx, /* XXX: same as 604R ? */ -#endif /* PowerPC 740/750 cores (aka G3) */ /* XXX: missing 0x00084202 */ CPU_POWERPC_7x0_v10 = 0x00080100, @@ -463,9 +309,6 @@ enum { CPU_POWERPC_7x5_v26 = 0x00083206, CPU_POWERPC_7x5_v27 = 0x00083207, CPU_POWERPC_7x5_v28 = 0x00083208, -#if 0 - CPU_POWERPC_7x5P = xxx, -#endif /* PowerPC 74xx cores (aka G4) */ /* XXX: missing 0x000C1101 */ CPU_POWERPC_7400_v10 = 0x000C0100, @@ -553,12 +396,6 @@ enum { /* XXX: should be POWER (RIOS), RSC3308, RSC4608, * POWER2 (RIOS2) & RSC2 (P2SC) here */ -#if 0 - CPU_POWER = xxx, /* 0x20000 ? 0x30000 for RSC ? */ -#endif -#if 0 - CPU_POWER2 = xxx, /* 0x40000 ? */ -#endif /* PA Semi core */ CPU_POWERPC_PA6T = 0x00900000, }; @@ -582,60 +419,6 @@ enum { POWERPC_SVR_5200B_v20 = 0x80110020, POWERPC_SVR_5200B_v21 = 0x80110021, #define POWERPC_SVR_55xx POWERPC_SVR_5567 -#if 0 - POWERPC_SVR_5533 = xxx, -#endif -#if 0 - POWERPC_SVR_5534 = xxx, -#endif -#if 0 - POWERPC_SVR_5553 = xxx, -#endif -#if 0 - POWERPC_SVR_5554 = xxx, -#endif -#if 0 - POWERPC_SVR_5561 = xxx, -#endif -#if 0 - POWERPC_SVR_5565 = xxx, -#endif -#if 0 - POWERPC_SVR_5566 = xxx, -#endif -#if 0 - POWERPC_SVR_5567 = xxx, -#endif -#if 0 - POWERPC_SVR_8313 = xxx, -#endif -#if 0 - POWERPC_SVR_8313E = xxx, -#endif -#if 0 - POWERPC_SVR_8314 = xxx, -#endif -#if 0 - POWERPC_SVR_8314E = xxx, -#endif -#if 0 - POWERPC_SVR_8315 = xxx, -#endif -#if 0 - POWERPC_SVR_8315E = xxx, -#endif -#if 0 - POWERPC_SVR_8321 = xxx, -#endif -#if 0 - POWERPC_SVR_8321E = xxx, -#endif -#if 0 - POWERPC_SVR_8323 = xxx, -#endif -#if 0 - POWERPC_SVR_8323E = xxx, -#endif POWERPC_SVR_8343 = 0x80570010, POWERPC_SVR_8343A = 0x80570030, POWERPC_SVR_8343E = 0x80560010, @@ -652,12 +435,6 @@ enum { POWERPC_SVR_8349A = 0x80510030, POWERPC_SVR_8349E = 0x80500010, POWERPC_SVR_8349EA = 0x80500030, -#if 0 - POWERPC_SVR_8358E = xxx, -#endif -#if 0 - POWERPC_SVR_8360E = xxx, -#endif #define POWERPC_SVR_E500 0x40000000 POWERPC_SVR_8377 = 0x80C70010 | POWERPC_SVR_E500, POWERPC_SVR_8377E = 0x80C60010 | POWERPC_SVR_E500, -- 2.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] ppc: remove all unused CPU definitions 2017-09-19 21:36 ` [Qemu-devel] [PATCH 2/2] ppc: remove all " John Snow @ 2017-09-20 18:52 ` Thomas Huth 2017-09-23 5:28 ` David Gibson 0 siblings, 1 reply; 7+ messages in thread From: Thomas Huth @ 2017-09-20 18:52 UTC (permalink / raw) To: John Snow, qemu-devel; +Cc: imammedo, agraf, david On 19.09.2017 23:36, John Snow wrote: > Remove *all* unused CPU definitions as indicated by compile-time > `#if 0` constructs. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > target/ppc/cpu-models.h | 223 ------------------------------------------------ > 1 file changed, 223 deletions(-) > > diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h > index b34b512..248f833 100644 > --- a/target/ppc/cpu-models.h > +++ b/target/ppc/cpu-models.h [...] > @@ -234,24 +105,11 @@ enum { > CPU_POWERPC_440GXb = 0x51B21851, > CPU_POWERPC_440GXc = 0x51B21892, > CPU_POWERPC_440GXf = 0x51B21894, > -#if 0 > - CPU_POWERPC_440S = xxx, > -#endif > CPU_POWERPC_440SP = 0x53221850, > CPU_POWERPC_440SP2 = 0x53221891, > CPU_POWERPC_440SPE = 0x53421890, > /* PowerPC 460 family */ > -#if 0 > - /* Generic PowerPC 464 */ > -#define CPU_POWERPC_464 CPU_POWERPC_464H90 > -#endif > /* PowerPC 464 microcontrolers */ > -#if 0 > - CPU_POWERPC_464H90 = xxx, > -#endif > -#if 0 > - CPU_POWERPC_464H90FP = xxx, > -#endif I think you could also remove the "/* PowerPC 460 family */" and "/* PowerPC 464 microcontrolers */" lines now. Anyway: Reviewed-by: Thomas Huth <thuth@redhat.com> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] ppc: remove all unused CPU definitions 2017-09-20 18:52 ` Thomas Huth @ 2017-09-23 5:28 ` David Gibson 0 siblings, 0 replies; 7+ messages in thread From: David Gibson @ 2017-09-23 5:28 UTC (permalink / raw) To: Thomas Huth; +Cc: John Snow, qemu-devel, imammedo, agraf [-- Attachment #1: Type: text/plain, Size: 1792 bytes --] On Wed, Sep 20, 2017 at 08:52:21PM +0200, Thomas Huth wrote: > On 19.09.2017 23:36, John Snow wrote: > > Remove *all* unused CPU definitions as indicated by compile-time > > `#if 0` constructs. > > > > Signed-off-by: John Snow <jsnow@redhat.com> > > --- > > target/ppc/cpu-models.h | 223 ------------------------------------------------ > > 1 file changed, 223 deletions(-) > > > > diff --git a/target/ppc/cpu-models.h b/target/ppc/cpu-models.h > > index b34b512..248f833 100644 > > --- a/target/ppc/cpu-models.h > > +++ b/target/ppc/cpu-models.h > [...] > > @@ -234,24 +105,11 @@ enum { > > CPU_POWERPC_440GXb = 0x51B21851, > > CPU_POWERPC_440GXc = 0x51B21892, > > CPU_POWERPC_440GXf = 0x51B21894, > > -#if 0 > > - CPU_POWERPC_440S = xxx, > > -#endif > > CPU_POWERPC_440SP = 0x53221850, > > CPU_POWERPC_440SP2 = 0x53221891, > > CPU_POWERPC_440SPE = 0x53421890, > > /* PowerPC 460 family */ > > -#if 0 > > - /* Generic PowerPC 464 */ > > -#define CPU_POWERPC_464 CPU_POWERPC_464H90 > > -#endif > > /* PowerPC 464 microcontrolers */ > > -#if 0 > > - CPU_POWERPC_464H90 = xxx, > > -#endif > > -#if 0 > > - CPU_POWERPC_464H90FP = xxx, > > -#endif > > I think you could also remove the "/* PowerPC 460 family */" and "/* > PowerPC 464 microcontrolers */" lines now. > > Anyway: > > Reviewed-by: Thomas Huth <thuth@redhat.com> Yes, I've made that extra change and applied. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-09-23 5:29 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-09-19 21:36 [Qemu-devel] [PATCH 0/2] ppc: remove dead definitions John Snow 2017-09-19 21:36 ` [Qemu-devel] [PATCH 1/2] ppc: remove unused CPU definitions John Snow 2017-09-20 18:47 ` Thomas Huth 2017-09-23 5:23 ` David Gibson 2017-09-19 21:36 ` [Qemu-devel] [PATCH 2/2] ppc: remove all " John Snow 2017-09-20 18:52 ` Thomas Huth 2017-09-23 5:28 ` David Gibson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).