Ping? Is anybody going to apply this? On Fri, Jun 13, 2014 at 12:28:32AM -0300, Eduardo Habkost wrote: > pc-q35-1.4 was incorrectly using PC_COMPAT_1_4 instead of > PC_Q35_COMPAT_1_4. > > The only side-effect was that the hpet compat property (inherited from > PC_Q35_COMPAT_1_7) was missing. > > Without this patch, pc-q35-1.4 inicorrectly initializes hpet-intcap to > 0xff0104 (behavior introduced in QEMU 2.0, by commit > 7a10ef51c2397ac4323bc786af02c58b413b5cd2). > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > --- > hw/i386/pc_q35.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index b3c02c1..81afe6a 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -377,7 +377,7 @@ static QEMUMachine pc_q35_machine_v1_4 = { > .name = "pc-q35-1.4", > .init = pc_q35_init_1_4, > .compat_props = (GlobalProperty[]) { > - PC_COMPAT_1_4, > + PC_Q35_COMPAT_1_4, > { /* end of list */ } > }, > }; > -- > 1.9.0 >
-- Eduardo