Commit bd3f16ac authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

s390x: reorganize CSS bits between cpu.h and other headers 



Move cpu_inject_* to the only C file where they are used.

Move ioinst.h declarations that need S390CPU to cpu.h, to make
ioinst.h independent of cpu.h.

Move channel declarations that only need SubchDev from cpu.h
to css.h, to make more channel users independent of cpu.h.

Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 77ac58dd

hw/s390x/css.c

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include "qemu/bitops.h"

#include "exec/address-spaces.h"

#include "cpu.h"

#include "ioinst.h"

#include "css.h"

#include "hw/s390x/ioinst.h"

#include "hw/s390x/css.h"

#include "trace.h"

#include "hw/s390x/s390_flic.h"

hw/s390x/s390-skeys.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "migration/qemu-file.h"

#include "hw/s390x/storage-keys.h"

#include "qemu/error-report.h"

#include "sysemu/kvm.h"



#define S390_SKEYS_BUFFER_SIZE 131072  /* Room for 128k storage keys */

#define S390_SKEYS_SAVE_FLAG_EOS 0x01

hw/s390x/s390-virtio-ccw.c

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#include "s390-virtio.h"

#include "hw/s390x/sclp.h"

#include "hw/s390x/s390_flic.h"

#include "ioinst.h"

#include "css.h"

#include "hw/s390x/ioinst.h"

#include "hw/s390x/css.h"

#include "virtio-ccw.h"

#include "qemu/config-file.h"

#include "s390-pci-bus.h"

hw/s390x/virtio-ccw.c

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "sysemu/block-backend.h"

#include "sysemu/blockdev.h"

#include "sysemu/sysemu.h"

#include "sysemu/kvm.h"

#include "net/net.h"

#include "hw/virtio/virtio.h"

#include "hw/virtio/virtio-serial.h"
@@ -28,8 +29,8 @@ 
#include "hw/s390x/adapter.h"

#include "hw/s390x/s390_flic.h"



#include "ioinst.h"

#include "css.h"

#include "hw/s390x/ioinst.h"

#include "hw/s390x/css.h"

#include "virtio-ccw.h"

#include "trace.h"

hw/s390x/virtio-ccw.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include <hw/virtio/virtio-rng.h>

#include <hw/virtio/virtio-bus.h>



#include "css.h"

#include <hw/s390x/s390_flic.h>

#include <hw/s390x/css.h>



#define VIRTUAL_CSSID 0xfe