On Mon, 16 May 2016 17:36:13 +0200
Paolo Bonzini <pbonz...@redhat.com> wrote:
Maybe mention which stuff was moved why ;)
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> hw/s390x/css.c | 4 +-
> hw/s390x/s390-skeys.c | 1 +
> hw/s390x/s390-virtio-ccw.c | 4 +-
> hw/s390x/virtio-ccw.c | 5 +-
> hw/s390x/virtio-ccw.h | 3 +-
> {hw => include/hw}/s390x/css.h | 31 +++++++-
> {target-s390x => include/hw/s390x}/ioinst.h | 16 +---
> target-s390x/cpu.h | 113
> +++++-----------------------
> target-s390x/helper.c | 1 +
> target-s390x/interrupt.c | 66 +++++++++++++++-
> target-s390x/ioinst.c | 2 +-
> 11 files changed, 128 insertions(+), 118 deletions(-)
> rename {hw => include/hw}/s390x/css.h (76%)
> rename {target-s390x => include/hw/s390x}/ioinst.h (87%)
> diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
> index 66c831b..86b9edb 100644
> --- a/hw/s390x/virtio-ccw.h
> +++ b/hw/s390x/virtio-ccw.h
> @@ -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>
Wonder why we didn't need that one before?
> +#include <hw/s390x/css.h>
>
> #define VIRTUAL_CSSID 0xfe
>
> diff --git a/hw/s390x/css.h b/include/hw/s390x/css.h
> similarity index 76%
> rename from hw/s390x/css.h
> rename to include/hw/s390x/css.h
> index a320eea..98b2e2c 100644
> --- a/hw/s390x/css.h
> +++ b/include/hw/s390x/css.h
> @@ -14,7 +14,7 @@
>
> #include "hw/s390x/adapter.h"
> #include "hw/s390x/s390_flic.h"
> -#include "ioinst.h"
> +#include "hw/s390x/ioinst.h"
>
> /* Channel subsystem constants. */
> #define MAX_SCHID 65535
> @@ -67,6 +67,7 @@ typedef struct CMBE {
> uint32_t reserved[7];
> } QEMU_PACKED CMBE;
>
> +typedef struct SubchDev SubchDev;
> struct SubchDev {
Maybe do typedef and declaration all in one, to match the other
structures in this file?
> /* channel-subsystem related things: */
> uint8_t cssid;
In any case:
Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com>
