Re: [Qemu-devel] [PATCH 41/50] s390x: move stuff out of cpu.h

[Paolo Bonzini]

On 19/05/2016 12:17, Cornelia Huck wrote:
> On Mon, 16 May 2016 17:36:13 +0200
> Paolo Bonzini <address@hidden> wrote:
> 
> Maybe mention which stuff was moved why ;)

Right:

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

>> -#include "css.h"
>> +#include <hw/s390x/s390_flic.h>
> 
> Wonder why we didn't need that one before?

It's not needed, hw/s390x/css.h includes it.  But this file uses
AdapterRoutes, so I added it explicitly.

>> +#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?

Ok, will do.

Paolo

>>      /* channel-subsystem related things: */
>>      uint8_t cssid;
> 
> In any case:
> 
> Acked-by: Cornelia Huck <address@hidden>
>