[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/22] acpi: reuse AcpiGenericAddress instead of Acpi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 06/22] acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress |
Date: |
Tue, 13 Mar 2018 23:45:20 +0200 |
From: Igor Mammedov <address@hidden>
Drop duplicate in form of Acpi20GenericAddress and reuse
AcpiGenericAddress.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Tested-by: Eric Auger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/acpi/acpi-defs.h | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h
index 80c8099..9942bc5 100644
--- a/include/hw/acpi/acpi-defs.h
+++ b/include/hw/acpi/acpi-defs.h
@@ -40,18 +40,6 @@ enum {
ACPI_FADT_F_LOW_POWER_S0_IDLE_CAPABLE,
};
-/*
- * ACPI 2.0 Generic Address Space definition.
- */
-struct Acpi20GenericAddress {
- uint8_t address_space_id;
- uint8_t register_bit_width;
- uint8_t register_bit_offset;
- uint8_t reserved;
- uint64_t address;
-} QEMU_PACKED;
-typedef struct Acpi20GenericAddress Acpi20GenericAddress;
-
struct AcpiRsdpDescriptor { /* Root System Descriptor Pointer */
uint64_t signature; /* ACPI signature, contains "RSD PTR " */
uint8_t checksum; /* To make sum of struct == 0 */
@@ -167,7 +155,8 @@ struct AcpiGenericAddress {
uint8_t space_id; /* Address space where struct or register exists
*/
uint8_t bit_width; /* Size in bits of given register */
uint8_t bit_offset; /* Bit offset within the register */
- uint8_t access_width; /* Minimum Access size (ACPI 3.0) */
+ uint8_t access_width; /* ACPI 3.0: Minimum Access size (ACPI 3.0),
+ ACPI 2.0: Reserved, Table 5-1 */
uint64_t address; /* 64-bit address of struct or register */
} QEMU_PACKED;
@@ -456,7 +445,7 @@ typedef struct AcpiGenericTimerTable AcpiGenericTimerTable;
struct Acpi20Hpet {
ACPI_TABLE_HEADER_DEF /* ACPI common table header */
uint32_t timer_block_id;
- Acpi20GenericAddress addr;
+ struct AcpiGenericAddress addr;
uint8_t hpet_number;
uint16_t min_tick;
uint8_t page_protect;
--
MST
- [Qemu-devel] [PULL 00/22] virtio,vhost,pci,pc: features, cleanups, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 02/22] virtio-net: use 64-bit values for feature flags, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 04/22] acpi: remove unused acpi-dsdt.aml, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 03/22] virtio-net: add linkspeed and duplex settings to virtio-net, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 05/22] pc: replace pm object initialization with one-liner in acpi_get_pm_info(), Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 07/22] acpi: add build_append_gas() helper for Generic Address Structure, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 06/22] acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 08/22] acpi: move ACPI_PORT_SMI_CMD define to header it belongs to, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 01/22] scripts/update-linux-headers: add ethtool.h and update to 4.16.0-rc4, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 10/22] pc: acpi: use build_append_foo() API to construct FADT, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 09/22] pc: acpi: isolate FADT specific data into AcpiFadtData structure, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 13/22] tests: acpi: don't read all fields in test_acpi_fadt_table(), Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 15/22] qemu-options-wrapper.h: fix include patch, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 14/22] vhost: used_memslots refactoring, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 12/22] virt_arm: acpi: reuse common build_fadt(), Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 11/22] acpi: move build_fadt() from i386 specific to generic ACPI source, Michael S. Tsirkin, 2018/03/13
- [Qemu-devel] [PULL 17/22] hw/pci: remove obsolete PCIDevice->init(), Michael S. Tsirkin, 2018/03/13