Commit 48cb7f3c authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Michael S. Tsirkin
Browse files

q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props 



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
7a10ef51).

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent c7ff5482

hw/i386/pc_q35.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,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 */ }

    },

};