Hi,
On 28/02/18 15:23, Igor Mammedov wrote:
> 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 <imamm...@redhat.com>
Reviewed-by: Eric Auger <eric.au...@redhat.com>
Eric
> ---
> 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,
>
