From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "David Hildenbrand" <david@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Jiri Slaby" <jslaby@suse.cz>,
qemu-s390x@nongnu.org, "Cornelia Huck" <cohuck@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Igor Mammedov" <imammedo@redhat.com>,
"Peter Crosthwaite" <crosthwaite.peter@gmail.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Stafford Horne" <shorne@gmail.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, qemu-trivial@nongnu.org,
"Max Reitz" <mreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PULL 02/13] typo: apci->acpi
Date: Wed, 30 Jan 2019 14:22:03 +0100 [thread overview]
Message-ID: <20190130132214.25493-3-laurent@vivier.eu> (raw)
In-Reply-To: <20190130132214.25493-1-laurent@vivier.eu>
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190125094047.22276-1-dgilbert@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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;
--
2.20.1
next prev parent reply other threads:[~2019-01-30 13:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-30 13:22 [Qemu-devel] [PULL 00/13] Trivial branch patches Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 01/13] hw: edu: set category of the edu device Laurent Vivier
2019-01-30 13:22 ` Laurent Vivier [this message]
2019-01-30 13:22 ` [Qemu-devel] [PULL 03/13] hw: input: set category of the i8042 device Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 04/13] hw: sd: set category of the sd memory card Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 05/13] Don't talk about the LGPL if the file is licensed under the GPL Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 06/13] COPYING.LIB: Synchronize the LGPL 2.1 with the version from gnu.org Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 07/13] target/openrisc: Fix LGPL version number Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 08/13] target/tricore: " Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 09/13] tcg: " Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 10/13] target/s390x: Fix LGPL version in the file header comments Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 11/13] target/m68k: Fix LGPL information in the file headers Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 12/13] hw/block: clean up stale xen_disk trace entries Laurent Vivier
2019-01-30 13:22 ` [Qemu-devel] [PULL 13/13] virtio-blk: remove duplicate definition of VirtIOBlock *s pointer Laurent Vivier
2019-01-31 18:59 ` [Qemu-devel] [PULL 00/13] Trivial branch patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190130132214.25493-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=crosthwaite.peter@gmail.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=jslaby@suse.cz \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kwolf@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mjt@tls.msk.ru \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=riku.voipio@iki.fi \
--cc=rth@twiddle.net \
--cc=shorne@gmail.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).