From patchwork Wed Jan 30 13:22:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1033521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qPJK5NLCz9s9G for ; Thu, 31 Jan 2019 00:25:53 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gopsF-00037x-LT for incoming@patchwork.ozlabs.org; Wed, 30 Jan 2019 08:25:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goppj-0001Na-U3 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 08:23:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goppf-0006PZ-SC for qemu-devel@nongnu.org; Wed, 30 Jan 2019 08:23:13 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:37347) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goppd-0006Et-OE; Wed, 30 Jan 2019 08:23:11 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1McY0L-1hQvKL1tBF-00d0eG; Wed, 30 Jan 2019 14:22:36 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 14:22:03 +0100 Message-Id: <20190130132214.25493-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190130132214.25493-1-laurent@vivier.eu> References: <20190130132214.25493-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8EK8MrWzuT304246ph8T2czJsWQXVzbhoPsIK4aV92xulwPYTjh puUPO3H1g686gJbAtou6MbKbILve50ePprU6MiWMtkRDODCqJNPoetKCoCZp3mPEmevaEX2 p0cEPD1yEomYkh053dV++HAxL9AH8cW6qgChf+n+m1eT6R5HdjlHTk4AilwkF+OiGD6PejN pyIaoESef3+vOYs68quHA== X-UI-Out-Filterresults: notjunk:1; V03:K0:M9VQKc9rpMM=:B7uQqpbmZNBhhCWzz9/vTQ uoiWI4YZUtsMUXl0+tFsZQSTH0PjtrNg+N5AWgcySshGp8R9LcWCyDBcrE3Fl6G7FD7WdyYys VDJ3wKOnHoR+DkFV26aaZgSyM62jFv/BN5UxZjntMFjD65QvEey5jJzMvgNz6YHROOjNn/B10 nlW3Ynt81idO4mUCq/VdmFs/lGuBII3wwuLGlDbeG+/6gPdLH4aS2S/quraOXtLoRRqpa3WpV M8Iud9zSnu34WTEN6/YvC2fMzSeNng5qnzBmQwq3A4EnDNCZIazWSDES2fZN7HgUa9FLdZeTT LyO2vNXafFCvFlndpMzEoTRZiss34MoO8GT39eZ5yfEQYgncf+BL1gLsNR7/x/8Bj0RiXshuK 71f7G8k4Qfdj6c7xNASCBaPcvuFqkTxI9cl3VW+MCJmdunUyINj3LKeh/lA9y+QAKIJcnpQI5 F0ygj2cy7An++Kr4ekgh0LVzk4xRx2WwQXOHZrPQf1Z3/S/n854VORUlgBLHgqK5HENC8OWvF bamvwUzXZNj1iqkygpGiWDXNINJUEfyYj9OFp2I3Ff+sKls3RWwfOa1WdZ090UJqj9tpvwY8I yZQQWMH0UvJTv9xe7+zdt9wyjpX6zi5TCDxt/bDDewlXUZbtL8xbez6OSDy7QPwNK4b1y5SQ1 +20pP0jWdqnGuO16m4Lk3+MJCQFYzH3lpP5WsCDG20xmhfcgUaqb7wAT25RrMwIms1G66PUVO IFYsjYWJvrxiDo7MJ0wCu+2ISdz1JzWnp7oE0zqo7NmB3doCOJw32ZE3wFc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 02/13] typo: apci->acpi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Michael Tokarev , Laurent Vivier , Jiri Slaby , qemu-block@nongnu.org, qemu-trivial@nongnu.org, "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Eduardo Habkost , Riku Voipio , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , Stafford Horne , Richard Henderson , Kevin Wolf , Peter Crosthwaite , Bastian Koppelmann , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" apci_1_compatible should be acpi_1_compatible. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190125094047.22276-1-dgilbert@redhat.com> Signed-off-by: Laurent Vivier --- 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;