Re: [qemu-s390x] [PATCH v1 for-2.12 9/9] s390x: change the QEMU cpu model to a stripped down z12

[David Hildenbrand]

On 05.12.2017 16:24, Cornelia Huck wrote:
> On Mon,  4 Dec 2017 15:01:50 +0100
> David Hildenbrand <address@hidden> wrote:
> 
>> We are good enough to boot upstream Linux kernels / Fedora 26/27. That
>> should be suficient for now.
> 
> s/suficient/sufficient/
> 
>>
>> As the QEMU CPU model is migration safe, let's add compatibility code.
>> Generate the feature list to reduce the trouble of messing things up in the
>> future.
> 
> So we can mess up things effortlessly? :)

See, what I care about :P

s/trouble/chance/

> 
>>
>> Signed-off-by: David Hildenbrand <address@hidden>
>> ---
>>  hw/s390x/s390-virtio-ccw.c  |   6 +++
>>  target/s390x/cpu.h          |   3 ++
>>  target/s390x/cpu_models.c   | 100 
>> ++++++++++++++++++--------------------------
>>  target/s390x/cpu_models.h   |   1 +
>>  target/s390x/gen-features.c |  87 ++++++++++++++++++++++++++++++++++++++
>>  5 files changed, 138 insertions(+), 59 deletions(-)
>>
>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>> index a23b8aec9f..edd18b7fac 100644
>> --- a/hw/s390x/s390-virtio-ccw.c
>> +++ b/hw/s390x/s390-virtio-ccw.c
>> @@ -721,6 +721,9 @@ bool css_migration_enabled(void)
>>  
>>  static void ccw_machine_2_12_instance_options(MachineState *machine)
>>  {
>> +    const S390FeatBitmap qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_12 };
>> +
>> +    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
> 
> Does this want a comment?

Yes, will add comments to both.
[...]
>> +
>> +    /* TCG emulates some features that can usually not be enabled with
>> +     * the emulated machine generation. Make sure they can be enabled
>> +     * when using the QEMU model by adding them to full_feat. We have
>> +     * to copy the definition to do that.
>> +     */
>> +    memcpy(&s390_qemu_cpu_def, def, sizeof(s390_qemu_cpu_def));
>> +    bitmap_or(s390_qemu_cpu_def.full_feat, s390_qemu_cpu_def.full_feat,
>> +              qemu_max_cpu_feat, S390_FEAT_MAX);
>> +
> 
> So is this the place to e.g. enable zpci? Or does this need to go into
> the feature definitions?

It will go into target/s390x/gen-features.c under:

1. "qemu_V2_12" if you want it to always be active with "-cpu qemu"
2. "qemu_MAX" if you only want to be able to enable it via "-cpu
qemu,zpci=on"

Thanks!

-- 

Thanks,

David / dhildenb