Re: [Qemu-devel] [PATCH] s390: Move hw files to hw/s390x

2013-01-25 Thread Christian Borntraeger 
On 25/01/13 01:18, Alexander Graf wrote:
 This moves all files only used by s390 system emulation to hw/s390x.
 
 Signed-off-by: Alexander Graf ag...@suse.de

makes sense

Acked-by: Christian Borntraeger borntrae...@de.ibm.com


 ---
  hw/s390x/Makefile.objs   |2 --
  hw/{ = s390x}/s390-virtio-bus.c |8 
  hw/{ = s390x}/s390-virtio-bus.h |   12 ++--
  hw/s390x/s390-virtio-hcall.c |2 +-
  hw/{ = s390x}/s390-virtio.c |   10 +-
  hw/{ = s390x}/s390-virtio.h |0
  6 files changed, 16 insertions(+), 18 deletions(-)
  rename hw/{ = s390x}/s390-virtio-bus.c (99%)
  rename hw/{ = s390x}/s390-virtio-bus.h (95%)
  rename hw/{ = s390x}/s390-virtio.c (98%)
  rename hw/{ = s390x}/s390-virtio.h (100%)
 
 diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
 index f6b461b..e4ee456 100644
 --- a/hw/s390x/Makefile.objs
 +++ b/hw/s390x/Makefile.objs
 @@ -1,6 +1,4 @@
  obj-y = s390-virtio-bus.o s390-virtio.o
 -
 -obj-y := $(addprefix ../,$(obj-y))
  obj-y += s390-virtio-hcall.o
  obj-y += sclp.o
  obj-y += event-facility.o
 diff --git a/hw/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
 similarity index 99%
 rename from hw/s390-virtio-bus.c
 rename to hw/s390x/s390-virtio-bus.c
 index 6858db0..32f63b0 100644
 --- a/hw/s390-virtio-bus.c
 +++ b/hw/s390x/s390-virtio-bus.c
 @@ -17,12 +17,12 @@
   * License along with this library; if not, see 
 http://www.gnu.org/licenses/.
   */
 
 -#include hw.h
 +#include hw/hw.h
  #include block/block.h
  #include sysemu/sysemu.h
 -#include boards.h
 +#include hw/boards.h
  #include monitor/monitor.h
 -#include loader.h
 +#include hw/loader.h
  #include elf.h
  #include hw/virtio.h
  #include hw/virtio-rng.h
 @@ -31,7 +31,7 @@
  #include hw/sysbus.h
  #include sysemu/kvm.h
 
 -#include hw/s390-virtio-bus.h
 +#include hw/s390x/s390-virtio-bus.h
  #include hw/virtio-bus.h
 
  /* #define DEBUG_S390 */
 diff --git a/hw/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h
 similarity index 95%
 rename from hw/s390-virtio-bus.h
 rename to hw/s390x/s390-virtio-bus.h
 index 438b37f..4aacf83 100644
 --- a/hw/s390-virtio-bus.h
 +++ b/hw/s390x/s390-virtio-bus.h
 @@ -19,12 +19,12 @@
  #ifndef HW_S390_VIRTIO_BUS_H
  #define HW_S390_VIRTIO_BUS_H 1
 
 -#include virtio-blk.h
 -#include virtio-net.h
 -#include virtio-rng.h
 -#include virtio-serial.h
 -#include virtio-scsi.h
 -#include virtio-bus.h
 +#include hw/virtio-blk.h
 +#include hw/virtio-net.h
 +#include hw/virtio-rng.h
 +#include hw/virtio-serial.h
 +#include hw/virtio-scsi.h
 +#include hw/virtio-bus.h
 
  #define VIRTIO_DEV_OFFS_TYPE 0   /* 8 bits */
  #define VIRTIO_DEV_OFFS_NUM_VQ   1   /* 8 bits */
 diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c
 index d7938c0..ee62649 100644
 --- a/hw/s390x/s390-virtio-hcall.c
 +++ b/hw/s390x/s390-virtio-hcall.c
 @@ -10,7 +10,7 @@
   */
 
  #include cpu.h
 -#include hw/s390-virtio.h
 +#include hw/s390x/s390-virtio.h
 
  #define MAX_DIAG_SUBCODES 255
 
 diff --git a/hw/s390-virtio.c b/hw/s390x/s390-virtio.c
 similarity index 98%
 rename from hw/s390-virtio.c
 rename to hw/s390x/s390-virtio.c
 index 6e0f53b..a8a489d 100644
 --- a/hw/s390-virtio.c
 +++ b/hw/s390x/s390-virtio.c
 @@ -21,22 +21,22 @@
   * License along with this library; if not, see 
 http://www.gnu.org/licenses/.
   */
 
 -#include hw.h
 +#include hw/hw.h
  #include block/block.h
  #include sysemu/blockdev.h
  #include sysemu/sysemu.h
  #include net/net.h
 -#include boards.h
 +#include hw/boards.h
  #include monitor/monitor.h
 -#include loader.h
 +#include hw/loader.h
  #include hw/virtio.h
  #include hw/sysbus.h
  #include sysemu/kvm.h
  #include exec/address-spaces.h
 
 -#include hw/s390-virtio-bus.h
 +#include hw/s390x/s390-virtio-bus.h
  #include hw/s390x/sclp.h
 -#include hw/s390-virtio.h
 +#include hw/s390x/s390-virtio.h
 
  //#define DEBUG_S390
 
 diff --git a/hw/s390-virtio.h b/hw/s390x/s390-virtio.h
 similarity index 100%
 rename from hw/s390-virtio.h
 rename to hw/s390x/s390-virtio.h

Re: [Qemu-devel] [PATCH] s390: Move hw files to hw/s390x

2013-01-25 Thread Peter Maydell 
On 25 January 2013 00:18, Alexander Graf ag...@suse.de wrote:
 This moves all files only used by s390 system emulation to hw/s390x.

This only makes sense if our plan is to rearrange the hw/
source files for all targets -- are we going to?
Do files for arch-specific kvm devices go in hw/kvm/ or
hw/$arch/ ?

-- PMM

Re: [Qemu-devel] [PATCH] s390: Move hw files to hw/s390x

2013-01-25 Thread Alexander Graf 


Am 25.01.2013 um 11:40 schrieb Peter Maydell peter.mayd...@linaro.org:

 On 25 January 2013 00:18, Alexander Graf ag...@suse.de wrote:
 This moves all files only used by s390 system emulation to hw/s390x.
 
 This only makes sense if our plan is to rearrange the hw/
 source files for all targets -- are we going to?
 Do files for arch-specific kvm devices go in hw/kvm/ or
 hw/$arch/ ?

I'd say let's sort out the obvious ones and then tackle the hard parts. But I 
don't want my targets to be scattered around through hw/ and hw/$arch as it is 
the case today.

Alex

 
 -- PMM

Re: [Qemu-devel] [PATCH] s390: Move hw files to hw/s390x

2013-01-25 Thread Paolo Bonzini 
Il 25/01/2013 11:40, Peter Maydell ha scritto:
 On 25 January 2013 00:18, Alexander Graf ag...@suse.de wrote:
 This moves all files only used by s390 system emulation to hw/s390x.
 
 This only makes sense if our plan is to rearrange the hw/
 source files for all targets -- are we going to?
 Do files for arch-specific kvm devices go in hw/kvm/ or
 hw/$arch/ ?

I'd say hw/$arch/kvm :)

Paolo

[Qemu-devel] [PATCH] s390: Move hw files to hw/s390x

2013-01-24 Thread Alexander Graf 
This moves all files only used by s390 system emulation to hw/s390x.

Signed-off-by: Alexander Graf ag...@suse.de
---
 hw/s390x/Makefile.objs   |2 --
 hw/{ = s390x}/s390-virtio-bus.c |8 
 hw/{ = s390x}/s390-virtio-bus.h |   12 ++--
 hw/s390x/s390-virtio-hcall.c |2 +-
 hw/{ = s390x}/s390-virtio.c |   10 +-
 hw/{ = s390x}/s390-virtio.h |0
 6 files changed, 16 insertions(+), 18 deletions(-)
 rename hw/{ = s390x}/s390-virtio-bus.c (99%)
 rename hw/{ = s390x}/s390-virtio-bus.h (95%)
 rename hw/{ = s390x}/s390-virtio.c (98%)
 rename hw/{ = s390x}/s390-virtio.h (100%)

diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index f6b461b..e4ee456 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -1,6 +1,4 @@
 obj-y = s390-virtio-bus.o s390-virtio.o
-
-obj-y := $(addprefix ../,$(obj-y))
 obj-y += s390-virtio-hcall.o
 obj-y += sclp.o
 obj-y += event-facility.o
diff --git a/hw/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c
similarity index 99%
rename from hw/s390-virtio-bus.c
rename to hw/s390x/s390-virtio-bus.c
index 6858db0..32f63b0 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390x/s390-virtio-bus.c
@@ -17,12 +17,12 @@
  * License along with this library; if not, see http://www.gnu.org/licenses/.
  */
 
-#include hw.h
+#include hw/hw.h
 #include block/block.h
 #include sysemu/sysemu.h
-#include boards.h
+#include hw/boards.h
 #include monitor/monitor.h
-#include loader.h
+#include hw/loader.h
 #include elf.h
 #include hw/virtio.h
 #include hw/virtio-rng.h
@@ -31,7 +31,7 @@
 #include hw/sysbus.h
 #include sysemu/kvm.h
 
-#include hw/s390-virtio-bus.h
+#include hw/s390x/s390-virtio-bus.h
 #include hw/virtio-bus.h
 
 /* #define DEBUG_S390 */
diff --git a/hw/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h
similarity index 95%
rename from hw/s390-virtio-bus.h
rename to hw/s390x/s390-virtio-bus.h
index 438b37f..4aacf83 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390x/s390-virtio-bus.h
@@ -19,12 +19,12 @@
 #ifndef HW_S390_VIRTIO_BUS_H
 #define HW_S390_VIRTIO_BUS_H 1
 
-#include virtio-blk.h
-#include virtio-net.h
-#include virtio-rng.h
-#include virtio-serial.h
-#include virtio-scsi.h
-#include virtio-bus.h
+#include hw/virtio-blk.h
+#include hw/virtio-net.h
+#include hw/virtio-rng.h
+#include hw/virtio-serial.h
+#include hw/virtio-scsi.h
+#include hw/virtio-bus.h
 
 #define VIRTIO_DEV_OFFS_TYPE   0   /* 8 bits */
 #define VIRTIO_DEV_OFFS_NUM_VQ 1   /* 8 bits */
diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c
index d7938c0..ee62649 100644
--- a/hw/s390x/s390-virtio-hcall.c
+++ b/hw/s390x/s390-virtio-hcall.c
@@ -10,7 +10,7 @@
  */
 
 #include cpu.h
-#include hw/s390-virtio.h
+#include hw/s390x/s390-virtio.h
 
 #define MAX_DIAG_SUBCODES 255
 
diff --git a/hw/s390-virtio.c b/hw/s390x/s390-virtio.c
similarity index 98%
rename from hw/s390-virtio.c
rename to hw/s390x/s390-virtio.c
index 6e0f53b..a8a489d 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -21,22 +21,22 @@
  * License along with this library; if not, see http://www.gnu.org/licenses/.
  */
 
-#include hw.h
+#include hw/hw.h
 #include block/block.h
 #include sysemu/blockdev.h
 #include sysemu/sysemu.h
 #include net/net.h
-#include boards.h
+#include hw/boards.h
 #include monitor/monitor.h
-#include loader.h
+#include hw/loader.h
 #include hw/virtio.h
 #include hw/sysbus.h
 #include sysemu/kvm.h
 #include exec/address-spaces.h
 
-#include hw/s390-virtio-bus.h
+#include hw/s390x/s390-virtio-bus.h
 #include hw/s390x/sclp.h
-#include hw/s390-virtio.h
+#include hw/s390x/s390-virtio.h
 
 //#define DEBUG_S390
 
diff --git a/hw/s390-virtio.h b/hw/s390x/s390-virtio.h
similarity index 100%
rename from hw/s390-virtio.h
rename to hw/s390x/s390-virtio.h
-- 
1.6.0.2