[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH-for-8.0] hw/acpi: Rename tco.c -> ich9_tco.c
From: |
Igor Mammedov |
Subject: |
Re: [PATCH-for-8.0] hw/acpi: Rename tco.c -> ich9_tco.c |
Date: |
Tue, 13 Dec 2022 13:34:01 +0100 |
On Mon, 12 Dec 2022 11:51:15 +0100
Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
> tco.c contains the ICH9 implementation of its "total cost
> of ownership". Rename it accordingly to emphasis this is
> a part of the ICH9 model.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Igor Mammedov <imammedo@redhat.com>
> ---
> Based-on: <20221207231205.1106381-1-shentey@gmail.com>
> "Clean up dependencies of ACPI controllers"
> ---
> MAINTAINERS | 4 ++--
> hw/acpi/ich9.c | 2 +-
> hw/acpi/{tco.c => ich9_tco.c} | 2 +-
> hw/acpi/meson.build | 2 +-
> include/hw/acpi/ich9.h | 2 +-
> include/hw/acpi/{tco.h => ich9_tco.h} | 2 +-
> tests/qtest/tco-test.c | 2 +-
> 7 files changed, 8 insertions(+), 8 deletions(-)
> rename hw/acpi/{tco.c => ich9_tco.c} (99%)
> rename include/hw/acpi/{tco.h => ich9_tco.h} (97%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6966490c94..35bde4a97e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1644,8 +1644,8 @@ F: hw/isa/piix3.c
> F: hw/isa/lpc_ich9.c
> F: hw/i2c/smbus_ich9.c
> F: hw/acpi/piix4.c
> -F: hw/acpi/ich9.c
> -F: include/hw/acpi/ich9.h
> +F: hw/acpi/ich9*.c
> +F: include/hw/acpi/ich9*.h
> F: include/hw/southbridge/piix.h
> F: hw/misc/sga.c
> F: hw/isa/apm.c
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index bd9bbade70..b10afa372a 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -34,7 +34,7 @@
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> #include "hw/acpi/acpi.h"
> -#include "hw/acpi/tco.h"
> +#include "hw/acpi/ich9_tco.h"
>
> #include "hw/i386/ich9.h"
> #include "hw/mem/pc-dimm.h"
> diff --git a/hw/acpi/tco.c b/hw/acpi/ich9_tco.c
> similarity index 99%
> rename from hw/acpi/tco.c
> rename to hw/acpi/ich9_tco.c
> index 4783721e4e..b68348707b 100644
> --- a/hw/acpi/tco.c
> +++ b/hw/acpi/ich9_tco.c
> @@ -12,7 +12,7 @@
> #include "hw/i386/ich9.h"
> #include "migration/vmstate.h"
>
> -#include "hw/acpi/tco.h"
> +#include "hw/acpi/ich9_tco.h"
> #include "trace.h"
>
> enum {
> diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
> index cfae2f58f6..30054a8cdc 100644
> --- a/hw/acpi/meson.build
> +++ b/hw/acpi/meson.build
> @@ -22,7 +22,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true:
> files('piix4.c'))
> acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c'))
> acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false:
> files('acpi-pci-hotplug-stub.c'))
> acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c'))
> -acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'tco.c'))
> +acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'ich9_tco.c'))
> acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c'))
> acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false:
> files('ipmi-stub.c'))
> acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
> diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
> index 7ca92843c6..d41866a229 100644
> --- a/include/hw/acpi/ich9.h
> +++ b/include/hw/acpi/ich9.h
> @@ -27,7 +27,7 @@
> #include "hw/acpi/pcihp.h"
> #include "hw/acpi/memory_hotplug.h"
> #include "hw/acpi/acpi_dev_interface.h"
> -#include "hw/acpi/tco.h"
> +#include "hw/acpi/ich9_tco.h"
>
> #define ACPI_PCIHP_ADDR_ICH9 0x0cc0
>
> diff --git a/include/hw/acpi/tco.h b/include/hw/acpi/ich9_tco.h
> similarity index 97%
> rename from include/hw/acpi/tco.h
> rename to include/hw/acpi/ich9_tco.h
> index a1e0da8213..c4393caee0 100644
> --- a/include/hw/acpi/tco.h
> +++ b/include/hw/acpi/ich9_tco.h
> @@ -1,5 +1,5 @@
> /*
> - * QEMU ICH9 TCO emulation
> + * QEMU ICH9 TCO emulation (total cost of ownership)
> *
> * Copyright (c) 2015 Paulo Alcantara <pcacjr@zytor.com>
> *
> diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c
> index 254f735370..d7b61ccfa5 100644
> --- a/tests/qtest/tco-test.c
> +++ b/tests/qtest/tco-test.c
> @@ -16,7 +16,7 @@
> #include "hw/pci/pci_regs.h"
> #include "hw/i386/ich9.h"
> #include "hw/acpi/ich9.h"
> -#include "hw/acpi/tco.h"
> +#include "hw/acpi/ich9_tco.h"
>
> #define RCBA_BASE_ADDR 0xfed1c000
> #define PM_IO_BASE_ADDR 0xb000