[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/22] acpi: move ACPI_PORT_SMI_CMD define to header
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/22] acpi: move ACPI_PORT_SMI_CMD define to header it belongs to |
Date: |
Tue, 13 Mar 2018 23:45:22 +0200 |
From: Igor Mammedov <address@hidden>
ACPI_PORT_SMI_CMD is alias for APM_CNT_IOPORT,
so make it really one instead of duplicating its value.
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/isa/apm.h | 3 +++
hw/i386/acpi-build.c | 2 --
hw/isa/apm.c | 1 -
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index 4839ff1..b7098bf 100644
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -5,6 +5,9 @@
#include "hw/hw.h"
#include "exec/memory.h"
+#define APM_CNT_IOPORT 0xb2
+#define ACPI_PORT_SMI_CMD APM_CNT_IOPORT
+
typedef void (*apm_ctrl_changed_t)(uint32_t val, void *arg);
typedef struct APMState {
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b85fefe..699f3a0 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -255,8 +255,6 @@ static void acpi_get_pci_holes(Range *hole, Range *hole64)
NULL));
}
-#define ACPI_PORT_SMI_CMD 0x00b2 /* TODO: this is APM_CNT_IOPORT */
-
static void acpi_align_size(GArray *blob, unsigned align)
{
/* Align size to multiple of given size. This reduces the chance
diff --git a/hw/isa/apm.c b/hw/isa/apm.c
index e232b0d..c3101ef 100644
--- a/hw/isa/apm.c
+++ b/hw/isa/apm.c
@@ -34,7 +34,6 @@
#endif
/* fixed I/O location */
-#define APM_CNT_IOPORT 0xb2
#define APM_STS_IOPORT 0xb3
static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val,
--
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, 2018/03/13
- [Qemu-devel] [PULL 08/22] acpi: move ACPI_PORT_SMI_CMD define to header it belongs to,
Michael S. Tsirkin <=
- [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
- [Qemu-devel] [PULL 18/22] pc-dimm: make qmp_pc_dimm_device_list() sort devices by address, Michael S. Tsirkin, 2018/03/13