On 18/12/2015 10:37, Cornelia Huck wrote:
> On Fri, 18 Dec 2015 09:30:02 +0200
> Shmulik Ladkani <shmulik.ladk...@ravellosystems.com> wrote:
>
>> Introduce the place-holder for 2.5 back-compat properties, and the
>> accompanying PC_COMPAT_2_5, CCW_COMPAT_2_5, SPAPR_COMPAT_2_5.
>>
>> Signed-off-by: Shmulik Ladkani <shmulik.ladk...@ravellosystems.com>
>> ---
>> hw/i386/pc_piix.c | 1 +
>> hw/i386/pc_q35.c | 1 +
>> hw/ppc/spapr.c | 9 +++++++++
>> hw/s390x/s390-virtio-ccw.c | 9 +++++++++
>> include/hw/compat.h | 3 +++
>> include/hw/i386/pc.h | 4 ++++
>> 6 files changed, 27 insertions(+)
>>
>
>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
>> index 5a52ff2..3d79654 100644
>> --- a/hw/s390x/s390-virtio-ccw.c
>> +++ b/hw/s390x/s390-virtio-ccw.c
>> @@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = {
>> },
>> };
>>
>> +#define CCW_COMPAT_2_5 \
>> + HW_COMPAT_2_5
>> +
>> #define CCW_COMPAT_2_4 \
>> + CCW_COMPAT_2_5 \
>> HW_COMPAT_2_4 \
>> {\
>> .driver = TYPE_S390_SKEYS,\
>> @@ -296,10 +300,15 @@ static const TypeInfo ccw_machine_2_4_info = {
>> static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data)
>> {
>> MachineClass *mc = MACHINE_CLASS(oc);
>> + static GlobalProperty compat_props[] = {
>> + CCW_COMPAT_2_5
>> + { /* end of list */ }
>> + };
>>
>> mc->alias = "s390-ccw-virtio";
>> mc->desc = "VirtIO-ccw based S390 machine v2.5";
>> mc->is_default = 1;
>> + mc->compat_props = compat_props;
>> }
>>
>> static const TypeInfo ccw_machine_2_5_info = {
>
> s390x part:
>
> Acked-by: Cornelia Huck <cornelia.h...@de.ibm.com>
>
> <There will be interaction with my patch introducing the ccw 2.6
> machine, but nothing that isn't sorted out easily>
>
Feel free to include these in your pull request if it's coming before
say January 6th.
Paolo
