diff options
| author |   Beth Kon <eak@us.ibm.com> | 2009-07-07 11:50:36 -0400 |
|---|---|---|
| committer |   Avi Kivity <avi@redhat.com> | 2009-07-12 16:37:41 +0300 |
| commit | 01d2f8b55eb528fd6b1002276fbd297d93468bf2 (patch) | |
| tree | aa9ad5e36f8a2959f5a1ee24518163da09950135 /kvm | |
| parent | Select irq0->irq2 override based on kernel gsi routing availability (diff) | |
| download | qemu-kvm-01d2f8b55eb528fd6b1002276fbd297d93468bf2.tar.gz qemu-kvm-01d2f8b55eb528fd6b1002276fbd297d93468bf2.tar.bz2 qemu-kvm-01d2f8b55eb528fd6b1002276fbd297d93468bf2.zip | |
Advertise HPET in ACPI HPET table
Signed-off-by: Beth Kon <eak@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'kvm')
| -rwxr-xr-x | kvm/bios/acpi-dsdt.dsl | 2 | ||||
| -rwxr-xr-x | kvm/bios/rombios32.c | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/kvm/bios/acpi-dsdt.dsl b/kvm/bios/acpi-dsdt.dsl index 3560baa0a..26fc7add7 100755 --- a/kvm/bios/acpi-dsdt.dsl +++ b/kvm/bios/acpi-dsdt.dsl @@ -194,7 +194,6 @@ DefinitionBlock ( }) } #ifdef BX_QEMU -#ifdef HPET_WORKS_IN_KVM Device(HPET) { Name(_HID, EISAID("PNP0103")) Name(_UID, 0) @@ -214,7 +213,6 @@ DefinitionBlock ( }) } #endif -#endif } Scope(\_SB.PCI0) { diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c index f9e045273..28f2b21a5 100755 --- a/kvm/bios/rombios32.c +++ b/kvm/bios/rombios32.c @@ -1526,8 +1526,8 @@ struct acpi_20_generic_address { } __attribute__((__packed__)); /* - * * HPET Description Table - * */ + * HPET Description Table + */ struct acpi_20_hpet { ACPI_TABLE_HEADER_DEF /* ACPI common table header */ uint32_t timer_block_id; @@ -1716,13 +1716,11 @@ void acpi_bios_init(void) addr += madt_size; #ifdef BX_QEMU -#ifdef HPET_WORKS_IN_KVM addr = (addr + 7) & ~7; hpet_addr = addr; hpet = (void *)(addr); addr += sizeof(*hpet); #endif -#endif /* RSDP */ memset(rsdp, 0, sizeof(*rsdp)); @@ -1900,7 +1898,6 @@ void acpi_bios_init(void) } /* HPET */ -#ifdef HPET_WORKS_IN_KVM memset(hpet, 0, sizeof(*hpet)); /* Note timer_block_id value must be kept in sync with value advertised by * emulated hpet @@ -1909,7 +1906,6 @@ void acpi_bios_init(void) hpet->addr.address = cpu_to_le32(ACPI_HPET_ADDRESS); acpi_build_table_header((struct acpi_table_header *)hpet, "HPET", sizeof(*hpet), 1); -#endif #endif @@ -1919,8 +1915,7 @@ void acpi_bios_init(void) rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(ssdt_addr); rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(madt_addr); #ifdef BX_QEMU - /* No HPET (yet) */ -// rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(hpet_addr); + rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(hpet_addr); if (nb_numa_nodes > 0) rsdt->table_offset_entry[nb_rsdt_entries++] = cpu_to_le32(srat_addr); acpi_additional_tables(); /* resets cfg to required entry */ |