From patchwork Mon Jan 14 13:08:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1024480 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=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43dYlS0cjbz9s4s for ; Tue, 15 Jan 2019 00:11:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:48237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj21q-00070d-2l for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2019 08:11:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj1z7-0005Nd-Nt for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:08:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj1z6-00076A-PW for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:08:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj1z4-00074o-8X; Mon, 14 Jan 2019 08:08:54 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71581369CA; Mon, 14 Jan 2019 13:08:53 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6999E5D75F; Mon, 14 Jan 2019 13:08:45 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 14:08:27 +0100 Message-Id: <20190114130829.21790-2-philmd@redhat.com> In-Reply-To: <20190114130829.21790-1-philmd@redhat.com> References: <20190114130829.21790-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 14 Jan 2019 13:08:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] hw/nvram/fw_cfg: Remove various typedefs from "qemu/typedefs.h" 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: Peter Maydell , Xiao Guangrong , Ben Warren , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , "open list:Virt" , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" There are only three include files requiring these typedefs, let them include "hw/nvram/fw_cfg.h" directly to simplify "qemu/typedefs.h". To clean "qemu/typedefs.h", move the declarations to "hw/nvram/fw_cfg.h". Reorder two function declarations to avoid forward typedef declarations. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laszlo Ersek --- include/hw/acpi/vmgenid.h | 1 + include/hw/arm/virt.h | 1 + include/hw/mem/nvdimm.h | 1 + include/hw/nvram/fw_cfg.h | 22 ++++++++++++---------- include/qemu/typedefs.h | 4 ---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index 38586ecbdf..be53de38f1 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -3,6 +3,7 @@ #include "hw/acpi/bios-linker-loader.h" #include "hw/qdev.h" +#include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" #define VMGENID_DEVICE "vmgenid" diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 4cc57a7ef6..fef632dcf5 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -35,6 +35,7 @@ #include "qemu/notify.h" #include "hw/boards.h" #include "hw/arm/arm.h" +#include "hw/nvram/fw_cfg.h" #include "sysemu/kvm.h" #include "hw/intc/arm_gicv3_common.h" diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h index c5c9b3c7f8..51d3a52c4b 100644 --- a/include/hw/mem/nvdimm.h +++ b/include/hw/mem/nvdimm.h @@ -24,6 +24,7 @@ #define QEMU_NVDIMM_H #include "hw/mem/pc-dimm.h" +#include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" #define NVDIMM_DEBUG 0 diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index f5a6895a74..cc744d5268 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -14,15 +14,12 @@ #define FW_CFG_IO(obj) OBJECT_CHECK(FWCfgIoState, (obj), TYPE_FW_CFG_IO) #define FW_CFG_MEM(obj) OBJECT_CHECK(FWCfgMemState, (obj), TYPE_FW_CFG_MEM) -typedef struct fw_cfg_file FWCfgFile; - #define FW_CFG_ORDER_OVERRIDE_VGA 70 #define FW_CFG_ORDER_OVERRIDE_NIC 80 #define FW_CFG_ORDER_OVERRIDE_USER 100 #define FW_CFG_ORDER_OVERRIDE_DEVICE 110 -void fw_cfg_set_order_override(FWCfgState *fw_cfg, int order); -void fw_cfg_reset_order_override(FWCfgState *fw_cfg); +typedef struct fw_cfg_file FWCfgFile; typedef struct FWCfgFiles { uint32_t count; @@ -34,7 +31,9 @@ typedef struct fw_cfg_dma_access FWCfgDmaAccess; typedef void (*FWCfgCallback)(void *opaque); typedef void (*FWCfgWriteCallback)(void *opaque, off_t start, size_t len); -struct FWCfgState { +typedef struct FWCfgEntry FWCfgEntry; + +typedef struct FWCfgState { /*< private >*/ SysBusDevice parent_obj; /*< public >*/ @@ -53,17 +52,17 @@ struct FWCfgState { dma_addr_t dma_addr; AddressSpace *dma_as; MemoryRegion dma_iomem; -}; +} FWCfgState; -struct FWCfgIoState { +typedef struct FWCfgIoState { /*< private >*/ FWCfgState parent_obj; /*< public >*/ MemoryRegion comb_iomem; -}; +} FWCfgIoState; -struct FWCfgMemState { +typedef struct FWCfgMemState { /*< private >*/ FWCfgState parent_obj; /*< public >*/ @@ -71,7 +70,10 @@ struct FWCfgMemState { MemoryRegion ctl_iomem, data_iomem; uint32_t data_width; MemoryRegionOps wide_data_ops; -}; +} FWCfgMemState; + +void fw_cfg_set_order_override(FWCfgState *fw_cfg, int order); +void fw_cfg_reset_order_override(FWCfgState *fw_cfg); /** * fw_cfg_add_bytes: diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 30ad8b2d8d..293e47ef7c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -28,10 +28,6 @@ typedef struct DriveInfo DriveInfo; typedef struct Error Error; typedef struct EventNotifier EventNotifier; typedef struct FlatView FlatView; -typedef struct FWCfgEntry FWCfgEntry; -typedef struct FWCfgIoState FWCfgIoState; -typedef struct FWCfgMemState FWCfgMemState; -typedef struct FWCfgState FWCfgState; typedef struct HVFX86EmulatorState HVFX86EmulatorState; typedef struct I2CBus I2CBus; typedef struct I2SCodec I2SCodec;