On 07/01/2016 17:33, Cornelia Huck wrote:
> On Thu, 7 Jan 2016 17:30:20 +0100
> Paolo Bonzini <[email protected]> wrote:
>
>> On 23/12/2015 20:21, Shmulik Ladkani wrote:
>>> Hi,
>>>
>>> On Fri, 18 Dec 2015 09:30:02 +0200 Shmulik Ladkani
>>> <[email protected]> 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.
>>>
>>> Please ignore this series, it'll clash.
>>>
>>> Recent pull has already introduced HW_COMPAT_2_5 and PC_COMPAT_2_5
>>> (240240d pc: Add pc-*-2.6 machine classes).
>>>
>>> I'll send patches introducing only CCW_COMPAT_2_5 and SPAPR_COMPAT_2_5
>>
>> Can you send these now?
>
> I've already added the CCW_COMPAT_2_5 patch to my queue.
>
Ok, so I can send Shmulik's patch doing
@@ -2,14 +2,7 @@
#define HW_COMPAT_H
#define HW_COMPAT_2_5 \
- /* empty */
-
-#define HW_COMPAT_2_4 \
{\
- .driver = "virtio-blk-device",\
- .property = "scsi",\
- .value = "true",\
- },{\
.driver = "pvscsi",\
.property = "x-old-pci-configuration",\
.value = "on",\
@@ -17,6 +10,13 @@
.driver = "pvscsi",\
.property = "x-disable-pcie",\
.value = "on",\
+ },
+
+#define HW_COMPAT_2_4 \
+ {\
+ .driver = "virtio-blk-device",\
+ .property = "scsi",\
+ .value = "true",\
},{\
.driver = "e1000",\
.property = "extra_mac_registers",\
in my next pull request.
Paolo
