OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390: Move hw files to hw/s390x

Browse Source 
This moves all files only used by s390 system emulation to hw/s390x.

Signed-off-by: Alexander Graf <agraf@suse.de>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Alexander Graf 2013-01-25 01:16:39 +01:00
parent 93726cb319
commit b73d353110
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/Makefile.objs
View File

@ -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

8
hw/s390-virtio-bus.c → hw/s390x/s390-virtio-bus.c
View File

@ -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 */

12
hw/s390-virtio-bus.h → hw/s390x/s390-virtio-bus.h
View File

@ -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 */

2
hw/s390x/s390-virtio-hcall.c
View File

@ -10,7 +10,7 @@
*/
#include "cpu.h"
#include "hw/s390-virtio.h"
#include "hw/s390x/s390-virtio.h"
#define MAX_DIAG_SUBCODES 255

10
hw/s390-virtio.c → hw/s390x/s390-virtio.c
View File

@ -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

0
hw/s390-virtio.h → hw/s390x/s390-virtio.h
View File