mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props

Browse Source 
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
7a10ef51c2).

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eduardo Habkost 2014-06-13 00:28:32 -03:00 committed by Michael S. Tsirkin
parent c7ff54825b
commit 48cb7f3c15
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/pc_q35.c
View File

@ -388,7 +388,7 @@ static QEMUMachine pc_q35_machine_v1_4 = {
.name = "pc-q35-1.4", .name = "pc-q35-1.4",
.init = pc_q35_init_1_4, .init = pc_q35_init_1_4,
.compat_props = (GlobalProperty[]) { .compat_props = (GlobalProperty[]) {
PC_COMPAT_1_4, PC_Q35_COMPAT_1_4,
{ /* end of list */ } { /* end of list */ }
}, },
}; };