Re: [Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-25 Thread Andreas Färber
Am 25.01.2013 02:12, schrieb Alexander Graf:
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 35c260d..3664dc8 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
[...]
  
  New World
  M: Alexander Graf ag...@suse.de
  L: qemu-...@nongnu.org
  S: Maintained
 -F: hw/ppc_newworld.c
 -F: hw/unin_pci.c
 -F: hw/dec_pci.[hc]
 +F: hw/ppc/ppc_newworld.c

F: hw/ppc/mac_newworld.c

 +F: hw/ppc/unin_pci.c
 +F: hw/ppc/dec_pci.[hc]
  
  Old World
  M: Alexander Graf ag...@suse.de
  L: qemu-...@nongnu.org
  S: Maintained
 -F: hw/ppc_oldworld.c
 -F: hw/grackle_pci.c
 +F: hw/ppc/ppc_oldworld.c

F: hw/ppc/mac_oldworld.c

 +F: hw/ppc/grackle_pci.c
  
  PReP
  M: Andreas FÀrber andreas.faer...@web.de

My bad. I'll send you a diff to fix-up my movement patch.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg



Re: [Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-25 Thread Blue Swirl
On Fri, Jan 25, 2013 at 1:12 AM, Alexander Graf ag...@suse.de wrote:
 This patch moves all PowerPC specific hardware emulation except for
 PREP to hw/ppc.

 Signed-off-by: Alexander Graf ag...@suse.de
 ---
  MAINTAINERS  |   20 ++--
  hw/Makefile.objs |   16 +---
  hw/ppc/Makefile.objs |   38 ++
  hw/{ = ppc}/adb.c   |2 +-
  hw/{ = ppc}/adb.h   |2 +-
  hw/{ = ppc}/cuda.c  |4 ++--
  hw/{ = ppc}/dec_pci.c   |   10 +-
  hw/{ = ppc}/dec_pci.h   |0

Please don't, Sparc64 should also use this device.

  hw/ppc/e500.c|6 +++---
  hw/ppc/e500plat.c|4 ++--
  hw/{ = ppc}/grackle_pci.c   |6 +++---
  hw/{ = ppc}/heathrow_pic.c  |4 ++--
  hw/ppc/mac.h |2 +-
  hw/{ = ppc}/mac_dbdma.c |4 ++--
  hw/{ = ppc}/mac_dbdma.h |0
  hw/ppc/mac_newworld.c|   10 +-
  hw/{ = ppc}/mac_nvram.c |6 +++---
  hw/ppc/mac_oldworld.c|4 ++--
  hw/{ = ppc}/macio.c |8 
  hw/{ = ppc}/mpc8544_guts.c  |4 ++--
  hw/ppc/mpc8544ds.c   |4 ++--
  hw/{ = ppc}/openpic.c   |   10 +-
  hw/{ = ppc}/openpic.h   |0
  hw/{ = ppc}/ppc-viosrp.h|0
  hw/{ = ppc}/ppc.c   |8 
  hw/{ = ppc}/ppc.h   |0
  hw/{ = ppc}/ppc405.h|0
  hw/{ = ppc}/ppc405_boards.c |   10 +-
  hw/{ = ppc}/ppc405_uc.c |4 ++--
  hw/{ = ppc}/ppc440_bamboo.c |   12 ++--
  hw/{ = ppc}/ppc4xx.h|2 +-
  hw/{ = ppc}/ppc4xx_devs.c   |2 +-
  hw/{ = ppc}/ppc4xx_pci.c|6 +++---
  hw/{ = ppc}/ppc_booke.c |6 +++---
  hw/{ = ppc}/ppc_prep.c  |0
  hw/{ = ppc}/ppce500_pci.c   |8 
  hw/{ = ppc}/ppce500_pci.h   |0
  hw/{ = ppc}/ppce500_spin.c  |4 ++--
  hw/{ = ppc}/spapr.c |   14 +++---
  hw/{ = ppc}/spapr.h |2 +-
  hw/{ = ppc}/spapr_events.c  |4 ++--
  hw/{ = ppc}/spapr_hcall.c   |2 +-
  hw/{ = ppc}/spapr_iommu.c   |6 +++---
  hw/{ = ppc}/spapr_llan.c|6 +++---
  hw/{ = ppc}/spapr_nvram.c   |4 ++--
  hw/{ = ppc}/spapr_pci.c |   14 +++---
  hw/{ = ppc}/spapr_pci.h |2 +-
  hw/{ = ppc}/spapr_rtas.c|4 ++--
  hw/{ = ppc}/spapr_vio.c |   12 ++--
  hw/{ = ppc}/spapr_vio.h |0
  hw/{ = ppc}/spapr_vscsi.c   |   12 ++--
  hw/{ = ppc}/spapr_vty.c |6 +++---
  hw/{ = ppc}/srp.h   |0
  hw/{ = ppc}/unin_pci.c  |8 
  hw/{ = ppc}/virtex_ml507.c  |   16 
  hw/{ = ppc}/xics.c  |6 +++---
  hw/{ = ppc}/xics.h  |0
  target-ppc/kvm.c |6 +++---
  58 files changed, 179 insertions(+), 171 deletions(-)
  rename hw/{ = ppc}/adb.c (99%)
  rename hw/{ = ppc}/adb.h (99%)
  rename hw/{ = ppc}/cuda.c (99%)
  rename hw/{ = ppc}/dec_pci.c (97%)
  rename hw/{ = ppc}/dec_pci.h (100%)
  rename hw/{ = ppc}/grackle_pci.c (98%)
  rename hw/{ = ppc}/heathrow_pic.c (99%)
  rename hw/{ = ppc}/mac_dbdma.c (99%)
  rename hw/{ = ppc}/mac_dbdma.h (100%)
  rename hw/{ = ppc}/mac_nvram.c (98%)
  rename hw/{ = ppc}/macio.c (99%)
  rename hw/{ = ppc}/mpc8544_guts.c (98%)
  rename hw/{ = ppc}/openpic.c (99%)
  rename hw/{ = ppc}/openpic.h (100%)
  rename hw/{ = ppc}/ppc-viosrp.h (100%)
  rename hw/{ = ppc}/ppc.c (99%)
  rename hw/{ = ppc}/ppc.h (100%)
  rename hw/{ = ppc}/ppc405.h (100%)
  rename hw/{ = ppc}/ppc405_boards.c (99%)
  rename hw/{ = ppc}/ppc405_uc.c (99%)
  rename hw/{ = ppc}/ppc440_bamboo.c (98%)
  rename hw/{ = ppc}/ppc4xx.h (99%)
  rename hw/{ = ppc}/ppc4xx_devs.c (99%)
  rename hw/{ = ppc}/ppc4xx_pci.c (99%)
  rename hw/{ = ppc}/ppc_booke.c (99%)
  rename hw/{ = ppc}/ppc_prep.c (100%)
  rename hw/{ = ppc}/ppce500_pci.c (99%)
  rename hw/{ = ppc}/ppce500_pci.h (100%)
  rename hw/{ = ppc}/ppce500_spin.c (99%)
  rename hw/{ = ppc}/spapr.c (99%)
  rename hw/{ = ppc}/spapr.h (99%)
  rename hw/{ = ppc}/spapr_events.c (99%)
  rename hw/{ = ppc}/spapr_hcall.c (99%)
  rename hw/{ = ppc}/spapr_iommu.c (99%)
  rename hw/{ = ppc}/spapr_llan.c (99%)
  rename hw/{ = ppc}/spapr_nvram.c (99%)
  rename hw/{ = ppc}/spapr_pci.c (99%)
  rename hw/{ = ppc}/spapr_pci.h (99%)
  rename hw/{ = ppc}/spapr_rtas.c (99%)
  rename hw/{ = ppc}/spapr_vio.c (99%)
  rename hw/{ = ppc}/spapr_vio.h (100%)
  rename hw/{ = ppc}/spapr_vscsi.c (99%)
  rename hw/{ = ppc}/spapr_vty.c (98%)
  rename hw/{ = ppc}/srp.h (100%)
  rename hw/{ = ppc}/unin_pci.c (99%)
  rename hw/{ = ppc}/virtex_ml507.c (97%)
  rename hw/{ = ppc}/xics.c (99%)
  rename hw/{ = ppc}/xics.h (100%)

 diff --git a/MAINTAINERS b/MAINTAINERS
 index 35c260d..3664dc8 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -352,13 +352,13 @@ PowerPC Machines
  M: Alexander Graf ag...@suse.de
  L: qemu-...@nongnu.org
  S: Odd Fixes
 -F: hw/ppc405_boards.c
 +F: hw/ppc/ppc405_boards.c

 

Re: [Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-25 Thread Alexander Graf

On 25.01.2013, at 20:06, Blue Swirl wrote:

 On Fri, Jan 25, 2013 at 1:12 AM, Alexander Graf ag...@suse.de wrote:
 This patch moves all PowerPC specific hardware emulation except for
 PREP to hw/ppc.
 
 Signed-off-by: Alexander Graf ag...@suse.de
 ---
 MAINTAINERS  |   20 ++--
 hw/Makefile.objs |   16 +---
 hw/ppc/Makefile.objs |   38 ++
 hw/{ = ppc}/adb.c   |2 +-
 hw/{ = ppc}/adb.h   |2 +-
 hw/{ = ppc}/cuda.c  |4 ++--
 hw/{ = ppc}/dec_pci.c   |   10 +-
 hw/{ = ppc}/dec_pci.h   |0
 
 Please don't, Sparc64 should also use this device.

I think it makes sense to move it back as soon as sparc64 actually starts using 
it. Potentially you could use the e500 pci controller on a possible future ARM 
machine or some other frankenstein combination, but that's not what the current 
code reflects.

If you feel strongly about it, I can just not move the dec pci controller, but 
I really don't think it makes sense unless you have patches or plan to have 
patches very soon.


Alex




Re: [Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-25 Thread Alexander Graf

On 25.01.2013, at 23:40, Paolo Bonzini wrote:

 Il 25/01/2013 02:12, Alexander Graf ha scritto:
 This patch moves all PowerPC specific hardware emulation except for
 PREP to hw/ppc.
 
 NACK, I believe it's too early for this.
 
 For example spapr_llan.c could go under hw/net, and hw/*_pci.c under
 hw/pci just as well.

I already removed this patch from my queue again.


Alex




Re: [Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-25 Thread Paolo Bonzini
Il 25/01/2013 02:12, Alexander Graf ha scritto:
 This patch moves all PowerPC specific hardware emulation except for
 PREP to hw/ppc.

NACK, I believe it's too early for this.

For example spapr_llan.c could go under hw/net, and hw/*_pci.c under
hw/pci just as well.

Paolo

 Signed-off-by: Alexander Graf ag...@suse.de
 ---
  MAINTAINERS  |   20 ++--
  hw/Makefile.objs |   16 +---
  hw/ppc/Makefile.objs |   38 ++
  hw/{ = ppc}/adb.c   |2 +-
  hw/{ = ppc}/adb.h   |2 +-
  hw/{ = ppc}/cuda.c  |4 ++--
  hw/{ = ppc}/dec_pci.c   |   10 +-
  hw/{ = ppc}/dec_pci.h   |0
  hw/ppc/e500.c|6 +++---
  hw/ppc/e500plat.c|4 ++--
  hw/{ = ppc}/grackle_pci.c   |6 +++---
  hw/{ = ppc}/heathrow_pic.c  |4 ++--
  hw/ppc/mac.h |2 +-
  hw/{ = ppc}/mac_dbdma.c |4 ++--
  hw/{ = ppc}/mac_dbdma.h |0
  hw/ppc/mac_newworld.c|   10 +-
  hw/{ = ppc}/mac_nvram.c |6 +++---
  hw/ppc/mac_oldworld.c|4 ++--
  hw/{ = ppc}/macio.c |8 
  hw/{ = ppc}/mpc8544_guts.c  |4 ++--
  hw/ppc/mpc8544ds.c   |4 ++--
  hw/{ = ppc}/openpic.c   |   10 +-
  hw/{ = ppc}/openpic.h   |0
  hw/{ = ppc}/ppc-viosrp.h|0
  hw/{ = ppc}/ppc.c   |8 
  hw/{ = ppc}/ppc.h   |0
  hw/{ = ppc}/ppc405.h|0
  hw/{ = ppc}/ppc405_boards.c |   10 +-
  hw/{ = ppc}/ppc405_uc.c |4 ++--
  hw/{ = ppc}/ppc440_bamboo.c |   12 ++--
  hw/{ = ppc}/ppc4xx.h|2 +-
  hw/{ = ppc}/ppc4xx_devs.c   |2 +-
  hw/{ = ppc}/ppc4xx_pci.c|6 +++---
  hw/{ = ppc}/ppc_booke.c |6 +++---
  hw/{ = ppc}/ppc_prep.c  |0
  hw/{ = ppc}/ppce500_pci.c   |8 
  hw/{ = ppc}/ppce500_pci.h   |0
  hw/{ = ppc}/ppce500_spin.c  |4 ++--
  hw/{ = ppc}/spapr.c |   14 +++---
  hw/{ = ppc}/spapr.h |2 +-
  hw/{ = ppc}/spapr_events.c  |4 ++--
  hw/{ = ppc}/spapr_hcall.c   |2 +-
  hw/{ = ppc}/spapr_iommu.c   |6 +++---
  hw/{ = ppc}/spapr_llan.c|6 +++---
  hw/{ = ppc}/spapr_nvram.c   |4 ++--
  hw/{ = ppc}/spapr_pci.c |   14 +++---
  hw/{ = ppc}/spapr_pci.h |2 +-
  hw/{ = ppc}/spapr_rtas.c|4 ++--
  hw/{ = ppc}/spapr_vio.c |   12 ++--
  hw/{ = ppc}/spapr_vio.h |0
  hw/{ = ppc}/spapr_vscsi.c   |   12 ++--
  hw/{ = ppc}/spapr_vty.c |6 +++---
  hw/{ = ppc}/srp.h   |0
  hw/{ = ppc}/unin_pci.c  |8 
  hw/{ = ppc}/virtex_ml507.c  |   16 
  hw/{ = ppc}/xics.c  |6 +++---
  hw/{ = ppc}/xics.h  |0
  target-ppc/kvm.c |6 +++---
  58 files changed, 179 insertions(+), 171 deletions(-)
  rename hw/{ = ppc}/adb.c (99%)
  rename hw/{ = ppc}/adb.h (99%)
  rename hw/{ = ppc}/cuda.c (99%)
  rename hw/{ = ppc}/dec_pci.c (97%)
  rename hw/{ = ppc}/dec_pci.h (100%)
  rename hw/{ = ppc}/grackle_pci.c (98%)
  rename hw/{ = ppc}/heathrow_pic.c (99%)
  rename hw/{ = ppc}/mac_dbdma.c (99%)
  rename hw/{ = ppc}/mac_dbdma.h (100%)
  rename hw/{ = ppc}/mac_nvram.c (98%)
  rename hw/{ = ppc}/macio.c (99%)
  rename hw/{ = ppc}/mpc8544_guts.c (98%)
  rename hw/{ = ppc}/openpic.c (99%)
  rename hw/{ = ppc}/openpic.h (100%)
  rename hw/{ = ppc}/ppc-viosrp.h (100%)
  rename hw/{ = ppc}/ppc.c (99%)
  rename hw/{ = ppc}/ppc.h (100%)
  rename hw/{ = ppc}/ppc405.h (100%)
  rename hw/{ = ppc}/ppc405_boards.c (99%)
  rename hw/{ = ppc}/ppc405_uc.c (99%)
  rename hw/{ = ppc}/ppc440_bamboo.c (98%)
  rename hw/{ = ppc}/ppc4xx.h (99%)
  rename hw/{ = ppc}/ppc4xx_devs.c (99%)
  rename hw/{ = ppc}/ppc4xx_pci.c (99%)
  rename hw/{ = ppc}/ppc_booke.c (99%)
  rename hw/{ = ppc}/ppc_prep.c (100%)
  rename hw/{ = ppc}/ppce500_pci.c (99%)
  rename hw/{ = ppc}/ppce500_pci.h (100%)
  rename hw/{ = ppc}/ppce500_spin.c (99%)
  rename hw/{ = ppc}/spapr.c (99%)
  rename hw/{ = ppc}/spapr.h (99%)
  rename hw/{ = ppc}/spapr_events.c (99%)
  rename hw/{ = ppc}/spapr_hcall.c (99%)
  rename hw/{ = ppc}/spapr_iommu.c (99%)
  rename hw/{ = ppc}/spapr_llan.c (99%)
  rename hw/{ = ppc}/spapr_nvram.c (99%)
  rename hw/{ = ppc}/spapr_pci.c (99%)
  rename hw/{ = ppc}/spapr_pci.h (99%)
  rename hw/{ = ppc}/spapr_rtas.c (99%)
  rename hw/{ = ppc}/spapr_vio.c (99%)
  rename hw/{ = ppc}/spapr_vio.h (100%)
  rename hw/{ = ppc}/spapr_vscsi.c (99%)
  rename hw/{ = ppc}/spapr_vty.c (98%)
  rename hw/{ = ppc}/srp.h (100%)
  rename hw/{ = ppc}/unin_pci.c (99%)
  rename hw/{ = ppc}/virtex_ml507.c (97%)
  rename hw/{ = ppc}/xics.c (99%)
  rename hw/{ = ppc}/xics.h (100%)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
 index 35c260d..3664dc8 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -352,13 +352,13 @@ PowerPC Machines
  M: Alexander Graf ag...@suse.de
  L: qemu-...@nongnu.org
  

[Qemu-devel] [PATCH] PPC: Move ppc specific hw emulation to hw/ppc

2013-01-24 Thread Alexander Graf
This patch moves all PowerPC specific hardware emulation except for
PREP to hw/ppc.

Signed-off-by: Alexander Graf ag...@suse.de
---
 MAINTAINERS  |   20 ++--
 hw/Makefile.objs |   16 +---
 hw/ppc/Makefile.objs |   38 ++
 hw/{ = ppc}/adb.c   |2 +-
 hw/{ = ppc}/adb.h   |2 +-
 hw/{ = ppc}/cuda.c  |4 ++--
 hw/{ = ppc}/dec_pci.c   |   10 +-
 hw/{ = ppc}/dec_pci.h   |0
 hw/ppc/e500.c|6 +++---
 hw/ppc/e500plat.c|4 ++--
 hw/{ = ppc}/grackle_pci.c   |6 +++---
 hw/{ = ppc}/heathrow_pic.c  |4 ++--
 hw/ppc/mac.h |2 +-
 hw/{ = ppc}/mac_dbdma.c |4 ++--
 hw/{ = ppc}/mac_dbdma.h |0
 hw/ppc/mac_newworld.c|   10 +-
 hw/{ = ppc}/mac_nvram.c |6 +++---
 hw/ppc/mac_oldworld.c|4 ++--
 hw/{ = ppc}/macio.c |8 
 hw/{ = ppc}/mpc8544_guts.c  |4 ++--
 hw/ppc/mpc8544ds.c   |4 ++--
 hw/{ = ppc}/openpic.c   |   10 +-
 hw/{ = ppc}/openpic.h   |0
 hw/{ = ppc}/ppc-viosrp.h|0
 hw/{ = ppc}/ppc.c   |8 
 hw/{ = ppc}/ppc.h   |0
 hw/{ = ppc}/ppc405.h|0
 hw/{ = ppc}/ppc405_boards.c |   10 +-
 hw/{ = ppc}/ppc405_uc.c |4 ++--
 hw/{ = ppc}/ppc440_bamboo.c |   12 ++--
 hw/{ = ppc}/ppc4xx.h|2 +-
 hw/{ = ppc}/ppc4xx_devs.c   |2 +-
 hw/{ = ppc}/ppc4xx_pci.c|6 +++---
 hw/{ = ppc}/ppc_booke.c |6 +++---
 hw/{ = ppc}/ppc_prep.c  |0
 hw/{ = ppc}/ppce500_pci.c   |8 
 hw/{ = ppc}/ppce500_pci.h   |0
 hw/{ = ppc}/ppce500_spin.c  |4 ++--
 hw/{ = ppc}/spapr.c |   14 +++---
 hw/{ = ppc}/spapr.h |2 +-
 hw/{ = ppc}/spapr_events.c  |4 ++--
 hw/{ = ppc}/spapr_hcall.c   |2 +-
 hw/{ = ppc}/spapr_iommu.c   |6 +++---
 hw/{ = ppc}/spapr_llan.c|6 +++---
 hw/{ = ppc}/spapr_nvram.c   |4 ++--
 hw/{ = ppc}/spapr_pci.c |   14 +++---
 hw/{ = ppc}/spapr_pci.h |2 +-
 hw/{ = ppc}/spapr_rtas.c|4 ++--
 hw/{ = ppc}/spapr_vio.c |   12 ++--
 hw/{ = ppc}/spapr_vio.h |0
 hw/{ = ppc}/spapr_vscsi.c   |   12 ++--
 hw/{ = ppc}/spapr_vty.c |6 +++---
 hw/{ = ppc}/srp.h   |0
 hw/{ = ppc}/unin_pci.c  |8 
 hw/{ = ppc}/virtex_ml507.c  |   16 
 hw/{ = ppc}/xics.c  |6 +++---
 hw/{ = ppc}/xics.h  |0
 target-ppc/kvm.c |6 +++---
 58 files changed, 179 insertions(+), 171 deletions(-)
 rename hw/{ = ppc}/adb.c (99%)
 rename hw/{ = ppc}/adb.h (99%)
 rename hw/{ = ppc}/cuda.c (99%)
 rename hw/{ = ppc}/dec_pci.c (97%)
 rename hw/{ = ppc}/dec_pci.h (100%)
 rename hw/{ = ppc}/grackle_pci.c (98%)
 rename hw/{ = ppc}/heathrow_pic.c (99%)
 rename hw/{ = ppc}/mac_dbdma.c (99%)
 rename hw/{ = ppc}/mac_dbdma.h (100%)
 rename hw/{ = ppc}/mac_nvram.c (98%)
 rename hw/{ = ppc}/macio.c (99%)
 rename hw/{ = ppc}/mpc8544_guts.c (98%)
 rename hw/{ = ppc}/openpic.c (99%)
 rename hw/{ = ppc}/openpic.h (100%)
 rename hw/{ = ppc}/ppc-viosrp.h (100%)
 rename hw/{ = ppc}/ppc.c (99%)
 rename hw/{ = ppc}/ppc.h (100%)
 rename hw/{ = ppc}/ppc405.h (100%)
 rename hw/{ = ppc}/ppc405_boards.c (99%)
 rename hw/{ = ppc}/ppc405_uc.c (99%)
 rename hw/{ = ppc}/ppc440_bamboo.c (98%)
 rename hw/{ = ppc}/ppc4xx.h (99%)
 rename hw/{ = ppc}/ppc4xx_devs.c (99%)
 rename hw/{ = ppc}/ppc4xx_pci.c (99%)
 rename hw/{ = ppc}/ppc_booke.c (99%)
 rename hw/{ = ppc}/ppc_prep.c (100%)
 rename hw/{ = ppc}/ppce500_pci.c (99%)
 rename hw/{ = ppc}/ppce500_pci.h (100%)
 rename hw/{ = ppc}/ppce500_spin.c (99%)
 rename hw/{ = ppc}/spapr.c (99%)
 rename hw/{ = ppc}/spapr.h (99%)
 rename hw/{ = ppc}/spapr_events.c (99%)
 rename hw/{ = ppc}/spapr_hcall.c (99%)
 rename hw/{ = ppc}/spapr_iommu.c (99%)
 rename hw/{ = ppc}/spapr_llan.c (99%)
 rename hw/{ = ppc}/spapr_nvram.c (99%)
 rename hw/{ = ppc}/spapr_pci.c (99%)
 rename hw/{ = ppc}/spapr_pci.h (99%)
 rename hw/{ = ppc}/spapr_rtas.c (99%)
 rename hw/{ = ppc}/spapr_vio.c (99%)
 rename hw/{ = ppc}/spapr_vio.h (100%)
 rename hw/{ = ppc}/spapr_vscsi.c (99%)
 rename hw/{ = ppc}/spapr_vty.c (98%)
 rename hw/{ = ppc}/srp.h (100%)
 rename hw/{ = ppc}/unin_pci.c (99%)
 rename hw/{ = ppc}/virtex_ml507.c (97%)
 rename hw/{ = ppc}/xics.c (99%)
 rename hw/{ = ppc}/xics.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 35c260d..3664dc8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -352,13 +352,13 @@ PowerPC Machines
 M: Alexander Graf ag...@suse.de
 L: qemu-...@nongnu.org
 S: Odd Fixes
-F: hw/ppc405_boards.c
+F: hw/ppc/ppc405_boards.c
 
 Bamboo
 M: Alexander Graf ag...@suse.de
 L: qemu-...@nongnu.org
 S: Odd Fixes
-F: hw/ppc440_bamboo.c
+F: hw/ppc/ppc440_bamboo.c
 
 e500
 M: Alexander Graf ag...@suse.de
@@ -374,22 +374,22 @@ M: Scott Wood scottw...@freescale.com
 L: