diff mbox

[RFC,v2,01/39] q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props

Message ID 1402688658-22333-2-git-send-email-ehabkost@redhat.com
State New
Headers show

Commit Message

Eduardo Habkost June 13, 2014, 7:43 p.m. UTC 
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 incorrectly initializes hpet-intcap to
0xff0104 (behavior introduced in QEMU 2.0, by commit
7a10ef51c2397ac4323bc786af02c58b413b5cd2).

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i386/pc_q35.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andreas Färber June 16, 2014, 10:28 a.m. UTC | #1 
Am 13.06.2014 21:43, schrieb Eduardo Habkost:
> 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 incorrectly initializes hpet-intcap to
> 0xff0104 (behavior introduced in QEMU 2.0, by commit
> 7a10ef51c2397ac4323bc786af02c58b413b5cd2).
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas
diff mbox

Patch

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 629eb2d..52920d3 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -390,7 +390,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 */ }
     },
 };