From patchwork Mon Mar 9 15:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1251635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48bj9d3M5dz9sPJ for ; Tue, 10 Mar 2020 02:40:53 +1100 (AEDT) Received: from localhost ([::1]:45244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBKWR-0003ie-9U for incoming@patchwork.ozlabs.org; Mon, 09 Mar 2020 11:40:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34331) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBK3G-0000yX-IP for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:10:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBK3F-0008LQ-8I for qemu-devel@nongnu.org; Mon, 09 Mar 2020 11:10:42 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:57823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBK3E-0008K4-Ur; Mon, 09 Mar 2020 11:10:41 -0400 Received: from localhost.localdomain ([82.252.135.106]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MmU9X-1jcAWf2W4v-00iV3H; Mon, 09 Mar 2020 16:09:36 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 23/33] hw/i386: Include "hw/mem/nvdimm.h" Date: Mon, 9 Mar 2020 16:08:27 +0100 Message-Id: <20200309150837.3193387-24-laurent@vivier.eu> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200309150837.3193387-1-laurent@vivier.eu> References: <20200309150837.3193387-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:TeOo2QGtI6FU3p+t4iCnFPucQ9S2/xdWEQWUVjy9s/wGECS+B4n eir1zyf2Xl0ARL5I4ecMB5821XyXYnTfAdcoKGaHe2zX0I3dT7d2jnvt2EQijlPWAkWeCwO sha01a66gJdVsEL0PLk85CYyKKBQ2qVNBZeAzo3afuMDAUPJ6qoSufpqHH2Uka8ZxGzzGgM QxoffWr4TuEDYEYJJVcIw== X-UI-Out-Filterresults: notjunk:1; V03:K0:d50JJqTWXEY=:RapBcy9gldB8S7HBVp4kNA apk4Jry21kxu/kda90alx98CECOsZPUyr2xise488MFPhcYnEhFvEKTPcIxP3eZnNlDsilw6E Yfy4Dx25nGDDZJwgYab1Z2h1mMK+PgSCUr/jFnQsz/iN3PXiamUNH88QKfuqRjNCLpLECN+K0 33Uqf8lHAXdPv8vsnK95dJUBLxtl2PIwc5zk5yLmoSiAVA8LJ4f3N5hR8OzCYlx1TJfqOnq8Y 460osTJwYwiBidEL2apuIU8shSaFFPh1ujaDLPI2XyIxLik5d2wlnpjt2o6S43o6bdSooZcH1 VcNe0GES9qyGlgF091C4phv+Mfrf5zB2m4bEK4ahj5ureJYf2F1X4HKaVG2yb3gCjiqBFBeLr 6C22GLKr0jJyzIfBC3hcAgjzKDkcJhQkpS6Ep/TOW0HhJKo3IlAPuxv78cCR449dutHLI/jFQ 6s3h7dYps7vxGU29hnpK2RKc5tH8TCD5ZNCHva3zSRWp4idmsiC6sgYkaEWh2qh62NnJSCusY M+Ym7qWDyvWP+PfL2X64EPBDDmDYnxs+X5BlyBkRLUMpLiRff/Y4wMUEm2S9++oDF4UliGwzw GbJkwciQDE29d7Jx5YmDP+vMOJxhAxLf3iMMck7a4szjh0L8wl4ZT/Yf045Jr/K2X+NKhTk7r cAAGNjXShBk/uRy4UU+vkm6qq+gKzB0dKxeyxIMPFN286Zww72HyZo1tqZVsSfTVYqJp4UgjS 6/eC0p9yl6Qv5gRKdfg5HeL/W/bAK5NWyhCwDwd/SRilnS4FeXhC/+HkKhCdSnDEuBrv2I4Vh SvWbdZ4/MRb0MypasSzA7XMD6Cu4wQRt6JXRiuD+/0a3gzasat1gdAcHrJgTlMqA2ML0S1S X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Dmitry Fleytman , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Gerd Hoffmann , "Edgar E. Iglesias" , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Helge Deller , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , Michael Tokarev , Alistair Francis , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , Richard Henderson , Kevin Wolf , =?utf-8?q?Daniel_P?= =?utf-8?b?LiBCZXJyYW5nw6k=?= , Igor Mitsyanko , Laurent Vivier , Max Reitz , Aleksandar Markovic , Igor Mammedov , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé All this files use methods/definitions declared in the NVDIMM device header. Include it. This fixes (when modifying unrelated headers): hw/i386/acpi-build.c:2733:9: error: implicit declaration of function 'nvdimm_build_acpi' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_build_acpi(table_offsets, tables_blob, tables->linker, ^ hw/i386/pc.c:1996:61: error: use of undeclared identifier 'TYPE_NVDIMM' const bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); ^ hw/i386/pc.c:2032:55: error: use of undeclared identifier 'TYPE_NVDIMM' bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); ^ hw/i386/pc.c:2040:9: error: implicit declaration of function 'nvdimm_plug' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_plug(ms->nvdimms_state); ^ hw/i386/pc.c:2040:9: error: this function declaration is not a prototype [-Werror,-Wstrict-prototypes] nvdimm_plug(ms->nvdimms_state); ^ hw/i386/pc.c:2065:42: error: use of undeclared identifier 'TYPE_NVDIMM' if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { ^ hw/i386/pc_i440fx.c:307:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_init_acpi_state(machine->nvdimms_state, system_io, ^ hw/i386/pc_q35.c:332:9: error: implicit declaration of function 'nvdimm_init_acpi_state' is invalid in C99 [-Werror,-Wimplicit-function-declaration] nvdimm_init_acpi_state(machine->nvdimms_state, system_io, ^ Acked-by: John Snow Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200228114649.12818-17-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/i386/acpi-build.c | 1 + hw/i386/pc.c | 1 + hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + 4 files changed, 4 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 26777f882844..9a19c14e661b 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -47,6 +47,7 @@ #include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "hw/mem/memory-device.h" +#include "hw/mem/nvdimm.h" #include "sysemu/numa.h" #include "sysemu/reset.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6ab4acb0c62e..362eb2a180ff 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -76,6 +76,7 @@ #include "hw/boards.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" +#include "hw/mem/nvdimm.h" #include "qapi/error.h" #include "qapi/qapi-visit-common.h" #include "qapi/visitor.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9088db8fb601..e2d98243bc64 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ #include "migration/global_state.h" #include "migration/misc.h" #include "sysemu/numa.h" +#include "hw/mem/nvdimm.h" #define MAX_IDE_BUS 2 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 84cf925cf43a..d37c425e2236 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -53,6 +53,7 @@ #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" +#include "hw/mem/nvdimm.h" /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6