* Re: [Qemu-devel] [PATCH] typo: apci->acpi
2019-01-25 9:40 [Qemu-devel] [PATCH] typo: apci->acpi Dr. David Alan Gilbert (git)
@ 2019-01-25 10:25 ` Igor Mammedov
2019-01-25 12:31 ` Philippe Mathieu-Daudé
2019-01-30 9:17 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Igor Mammedov @ 2019-01-25 10:25 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git); +Cc: qemu-devel, qemu-trivial
On Fri, 25 Jan 2019 09:40:46 +0000
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> apci_1_compatible should be acpi_1_compatible.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/acpi/cpu.c | 2 +-
> hw/i386/acpi-build.c | 2 +-
> include/hw/acpi/cpu.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index f10b190019..a0a43fe6b5 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -508,7 +508,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
> GArray *madt_buf = g_array_new(0, 1, 1);
> int arch_id = arch_ids->cpus[i].arch_id;
>
> - if (opts.apci_1_compatible && arch_id < 255) {
> + if (opts.acpi_1_compatible && arch_id < 255) {
> dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i);
> } else {
> dev = aml_device(CPU_NAME_FMT, i);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2e21a31f82..d60603abd7 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1847,7 +1847,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
> } else {
> CPUHotplugFeatures opts = {
> - .apci_1_compatible = true, .has_legacy_cphp = true
> + .acpi_1_compatible = true, .has_legacy_cphp = true
> };
> build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
> "\\_SB.PCI0", "\\_GPE._E02");
> diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
> index 89ce172941..62f0278ba2 100644
> --- a/include/hw/acpi/cpu.h
> +++ b/include/hw/acpi/cpu.h
> @@ -48,7 +48,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
> CPUHotplugState *state, hwaddr base_addr);
>
> typedef struct CPUHotplugFeatures {
> - bool apci_1_compatible;
> + bool acpi_1_compatible;
> bool has_legacy_cphp;
> } CPUHotplugFeatures;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] typo: apci->acpi
2019-01-25 9:40 [Qemu-devel] [PATCH] typo: apci->acpi Dr. David Alan Gilbert (git)
2019-01-25 10:25 ` Igor Mammedov
@ 2019-01-25 12:31 ` Philippe Mathieu-Daudé
2019-01-30 9:17 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-25 12:31 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git), qemu-devel, imammedo; +Cc: qemu-trivial
On 1/25/19 10:40 AM, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> apci_1_compatible should be acpi_1_compatible.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/acpi/cpu.c | 2 +-
> hw/i386/acpi-build.c | 2 +-
> include/hw/acpi/cpu.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index f10b190019..a0a43fe6b5 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -508,7 +508,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
> GArray *madt_buf = g_array_new(0, 1, 1);
> int arch_id = arch_ids->cpus[i].arch_id;
>
> - if (opts.apci_1_compatible && arch_id < 255) {
> + if (opts.acpi_1_compatible && arch_id < 255) {
> dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i);
> } else {
> dev = aml_device(CPU_NAME_FMT, i);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2e21a31f82..d60603abd7 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1847,7 +1847,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
> } else {
> CPUHotplugFeatures opts = {
> - .apci_1_compatible = true, .has_legacy_cphp = true
> + .acpi_1_compatible = true, .has_legacy_cphp = true
> };
> build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
> "\\_SB.PCI0", "\\_GPE._E02");
> diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
> index 89ce172941..62f0278ba2 100644
> --- a/include/hw/acpi/cpu.h
> +++ b/include/hw/acpi/cpu.h
> @@ -48,7 +48,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
> CPUHotplugState *state, hwaddr base_addr);
>
> typedef struct CPUHotplugFeatures {
> - bool apci_1_compatible;
> + bool acpi_1_compatible;
> bool has_legacy_cphp;
> } CPUHotplugFeatures;
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [Qemu-trivial] [PATCH] typo: apci->acpi
2019-01-25 9:40 [Qemu-devel] [PATCH] typo: apci->acpi Dr. David Alan Gilbert (git)
2019-01-25 10:25 ` Igor Mammedov
2019-01-25 12:31 ` Philippe Mathieu-Daudé
@ 2019-01-30 9:17 ` Laurent Vivier
2 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2019-01-30 9:17 UTC (permalink / raw)
To: Dr. David Alan Gilbert (git), qemu-devel, imammedo; +Cc: qemu-trivial
On 25/01/2019 10:40, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> apci_1_compatible should be acpi_1_compatible.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hw/acpi/cpu.c | 2 +-
> hw/i386/acpi-build.c | 2 +-
> include/hw/acpi/cpu.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c
> index f10b190019..a0a43fe6b5 100644
> --- a/hw/acpi/cpu.c
> +++ b/hw/acpi/cpu.c
> @@ -508,7 +508,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
> GArray *madt_buf = g_array_new(0, 1, 1);
> int arch_id = arch_ids->cpus[i].arch_id;
>
> - if (opts.apci_1_compatible && arch_id < 255) {
> + if (opts.acpi_1_compatible && arch_id < 255) {
> dev = aml_processor(i, 0, 0, CPU_NAME_FMT, i);
> } else {
> dev = aml_device(CPU_NAME_FMT, i);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 2e21a31f82..d60603abd7 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1847,7 +1847,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
> build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
> } else {
> CPUHotplugFeatures opts = {
> - .apci_1_compatible = true, .has_legacy_cphp = true
> + .acpi_1_compatible = true, .has_legacy_cphp = true
> };
> build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
> "\\_SB.PCI0", "\\_GPE._E02");
> diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h
> index 89ce172941..62f0278ba2 100644
> --- a/include/hw/acpi/cpu.h
> +++ b/include/hw/acpi/cpu.h
> @@ -48,7 +48,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
> CPUHotplugState *state, hwaddr base_addr);
>
> typedef struct CPUHotplugFeatures {
> - bool apci_1_compatible;
> + bool acpi_1_compatible;
> bool has_legacy_cphp;
> } CPUHotplugFeatures;
>
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread