Re: [Qemu-devel] [qemu-s390x] [PATCH v1] s390x/cpumodel: make qemu cpu model play with "none" machine

[David Hildenbrand]

On 13.12.2017 14:34, Christian Borntraeger wrote:
> 
> 
> On 12/13/2017 02:24 PM, David Hildenbrand wrote:
>> Make sure "-cpu qemu" works with "-M none".
>>
>> Signed-off-by: David Hildenbrand <address@hidden>
>> ---
>>
>> Conny, if this is okay, can you squash with the original patch?
>>
>>  hw/s390x/s390-virtio-ccw.c  | 4 ----
>>  target/s390x/cpu_models.c   | 7 +++++--
>>  target/s390x/gen-features.c | 4 ++--
>>  3 files changed, 7 insertions(+), 8 deletions(-)
>>
>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>> index c1f96418fa..466e45343c 100644
>> --- a/hw/s390x/s390-virtio-ccw.c
>> +++ b/hw/s390x/s390-virtio-ccw.c
>> @@ -725,10 +725,6 @@ bool css_migration_enabled(void)
>>
>>  static void ccw_machine_2_12_instance_options(MachineState *machine)
>>  {
>> -    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V2_12 };
>> -
>> -    /* with 2.12 we emulated a stripped down zEC12 (GA 2) */
>> -    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
>>  }
> 
> So what happens now when you specify a 2.10 machine? 

the 2.11 handler is called, initializing it to a z900.

$ qemu-system-s390x -nographic -machine s390-ccw-virtio-2.10 -hda
guest-tcg.qcow2
LOADPARM=[........]
Using virtio-blk.
Using SCSI scheme.
.....
The Linux kernel requires more recent processor hardware
Detected machine-type number: 2064
Missing facilities: 18,21,25,27,32,33,34,35,45,49,52
See Principles of Operations for facility bits

$ qemu-system-s390x -nographic -machine s390-ccw-virtio-2.12 -hda
guest-tcg.qcow2
LOADPARM=[........]
Using virtio-blk.
Using SCSI scheme.
.....
[    0.325571] Linux version 4.13.9-300.fc27.s390x ...

-- 

Thanks,

David / dhildenb