On 13.09.2017 15:24, David Hildenbrand wrote:
> This allows us to drop inclusion of cpu_models.h in cpu-qom.h, and
> prepares for using cpu-qom.h as a s390 specific version of typedefs.h
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
> ---
> target/s390x/cpu-qom.h | 5 ++++-
> target/s390x/cpu.h | 5 +++--
> target/s390x/cpu_models.h | 8 ++++----
> 3 files changed, 11 insertions(+), 7 deletions(-)
[...]
> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
> index 372f7d8885..4a0a59dfbc 100644
> --- a/target/s390x/cpu.h
> +++ b/target/s390x/cpu.h
> @@ -25,6 +25,7 @@
>
> #include "qemu-common.h"
> #include "cpu-qom.h"
> +#include "cpu_models.h"
Do we really need to include cpu_models.h here? Looking at your changes
below, it does not seem to be necessary?
> #define TARGET_LONG_BITS 64
>
> @@ -80,7 +81,7 @@ typedef struct MchkQueue {
> uint16_t type;
> } MchkQueue;
>
> -typedef struct CPUS390XState {
> +struct CPUS390XState {
> uint64_t regs[16]; /* GP registers */
> /*
> * The floating point registers are part of the vector registers.
> @@ -174,7 +175,7 @@ typedef struct CPUS390XState {
> /* currently processed sigp order */
> uint8_t sigp_order;
>
> -} CPUS390XState;
> +};
>
> static inline CPU_DoubleU *get_freg(CPUS390XState *cs, int nr)
> {
Thomas
