Re: [Qemu-devel] [PATCH 1/2] pc: fix regression introduced by adding 2.8 machine

[Igor Mammedov]

On Thu, 15 Sep 2016 18:18:46 +0300
"Michael S. Tsirkin" <address@hidden> wrote:

> On Thu, Sep 15, 2016 at 11:19:09AM -0300, Eduardo Habkost wrote:
> > On Wed, Sep 14, 2016 at 12:01:49PM +0200, Igor Mammedov wrote:  
> > > commit (a4d3c834 pc: Add 2.8 machine) didn't ammend
> > > PC_COMPAT_2_6 to include PC_COMPAT_2_7 which results in
> > > 
> > >     {\
> > >         .driver   = "virtio-pci",\
> > >         .property = "page-per-vq",\
> > >         .value    = "on",\
> > >     },
> > > 
> > > and
> > > 
> > >     {\
> > >         .driver   = TYPE_X86_CPU,\
> > >         .property = "l3-cache",\
> > >         .value    = "off",\
> > >     },
> > > 
> > > being ignored and as result change PC_COMPAT_2_6 behaviour.
> > >   
> > [...]  
> > >  #define PC_COMPAT_2_6 \
> > > +    PC_COMPAT_2_7 \
> > >      HW_COMPAT_2_6 \
> > >      {\
> > >          .driver   = "fw_cfg_io",\  
> > 
> > Isn't this supposed to be unnecessary since commit bacc344c
> > ("machine: add properties to compat_props incrementaly")?
> > 
> > -- 
> > Eduardo  
> 
> 
> Indeed, I tested page-per-vq and it seems on for 2.6.
> Igor, Marcel, could you comment pls?

You are right, I think inconsistency in

#define PC_COMPAT_2_5 \                                                         
 
    PC_COMPAT_2_6 \                                                             
 
    HW_COMPAT_2_5  
 
and

#define PC_COMPAT_2_7 \                                                         
 
    PC_COMPAT_2_8 \                                                             
 
    HW_COMPAT_2_7

made me think that we still need it.

I'd better clean-up PC_COMPAT_2_5 and PC_COMPAT_2_7