From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547471564888216.13306664707682; Mon, 14 Jan 2019 05:12:44 -0800 (PST) Received: from localhost ([127.0.0.1]:48477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj22l-0007pw-U4 for importer@patchew.org; Mon, 14 Jan 2019 08:12:43 -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=20Mathieu-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) Content-Transfer-Encoding: quoted-printable 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=20Mathieu-Daud=C3=A9?= , "open list:Virt" , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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=C3=A9 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 @@ =20 #include "hw/acpi/bios-linker-loader.h" #include "hw/qdev.h" +#include "hw/nvram/fw_cfg.h" #include "qemu/uuid.h" =20 #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" =20 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 =20 #include "hw/mem/pc-dimm.h" +#include "hw/nvram/fw_cfg.h" #include "hw/acpi/bios-linker-loader.h" =20 #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) =20 -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 =20 -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; =20 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); =20 -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; =20 -struct FWCfgIoState { +typedef struct FWCfgIoState { /*< private >*/ FWCfgState parent_obj; /*< public >*/ =20 MemoryRegion comb_iomem; -}; +} FWCfgIoState; =20 -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); =20 /** * 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; --=20 2.17.2 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154747147375784.82011466244046; Mon, 14 Jan 2019 05:11:13 -0800 (PST) Received: from localhost ([127.0.0.1]:48123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj21I-0006gU-Nn for importer@patchew.org; Mon, 14 Jan 2019 08:11:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj1zA-0005PL-0p for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:09:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj1z8-00076j-Aj for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:09:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45660) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj1z8-00076R-5H for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:08:58 -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 259FED6F0C for ; Mon, 14 Jan 2019 13:08:57 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39BB95D73F; Mon, 14 Jan 2019 13:08:53 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 14:08:28 +0100 Message-Id: <20190114130829.21790-3-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.38]); Mon, 14 Jan 2019 13:08:57 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 2/3] ui/console: Remove MouseTransformInfo 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: Paolo Bonzini , Laszlo Ersek , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Header files requiring MouseTransformInfo already include "ui/console.h". To clean "qemu/typedefs.h", move the declaration to "ui/console.h" (removing the forward declaration). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Gerd Hoffmann --- include/hw/devices.h | 1 + include/qemu/typedefs.h | 1 - include/ui/console.h | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/devices.h b/include/hw/devices.h index 0e27feb0c2..b5f1662225 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -4,6 +4,7 @@ /* Devices that have nowhere better to go. */ =20 #include "hw/hw.h" +#include "ui/console.h" =20 /* smc91c111.c */ void smc91c111_init(NICInfo *, uint32_t, qemu_irq); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 293e47ef7c..4cda7343bf 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -47,7 +47,6 @@ typedef struct MigrationIncomingState MigrationIncomingSt= ate; typedef struct MigrationState MigrationState; typedef struct Monitor Monitor; typedef struct MonitorDef MonitorDef; -typedef struct MouseTransformInfo MouseTransformInfo; typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; diff --git a/include/ui/console.h b/include/ui/console.h index 0a190370ac..aa9f975544 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -65,13 +65,13 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *ent= ry); =20 void kbd_put_ledstate(int ledstate); =20 -struct MouseTransformInfo { +typedef struct MouseTransformInfo { /* Touchscreen resolution */ int x; int y; /* Calibration values as used/generated by tslib */ int a[7]; -}; +} MouseTransformInfo; =20 void hmp_mouse_set(Monitor *mon, const QDict *qdict); =20 --=20 2.17.2 From nobody Sun May 19 13:14:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547471683894488.71604008715553; Mon, 14 Jan 2019 05:14:43 -0800 (PST) Received: from localhost ([127.0.0.1]:48952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj24g-0000go-SQ for importer@patchew.org; Mon, 14 Jan 2019 08:14:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj1zI-0005YA-S9 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:09:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj1zI-0007Aq-3E for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:09:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45800) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj1zH-0007Af-Tv for qemu-devel@nongnu.org; Mon, 14 Jan 2019 08:09:08 -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 30D50D7923 for ; Mon, 14 Jan 2019 13:09:07 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.90]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF69A5D756; Mon, 14 Jan 2019 13:08:57 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Thomas Huth , qemu-devel@nongnu.org Date: Mon, 14 Jan 2019 14:08:29 +0100 Message-Id: <20190114130829.21790-4-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.38]); Mon, 14 Jan 2019 13:09:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable 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 3/3] ui/console: Remove PixelFormat 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: Paolo Bonzini , Laszlo Ersek , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Header files requiring PixelFormat already include "ui/qemu-pixman.h". To clean "qemu/typedefs.h", move the declaration to "ui/qemu-pixman.h" (removing the forward declaration). Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Gerd Hoffmann --- include/qemu/typedefs.h | 1 - include/ui/console.h | 10 ---------- include/ui/qemu-pixman.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 4cda7343bf..64b8386697 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -67,7 +67,6 @@ typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIHostDeviceAddress PCIHostDeviceAddress; typedef struct PCIHostState PCIHostState; typedef struct PCMachineState PCMachineState; -typedef struct PixelFormat PixelFormat; typedef struct PostcopyDiscardState PostcopyDiscardState; typedef struct Property Property; typedef struct PropertyInfo PropertyInfo; diff --git a/include/ui/console.h b/include/ui/console.h index aa9f975544..fef900db76 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -121,16 +121,6 @@ struct QemuConsoleClass { =20 #define QEMU_ALLOCATED_FLAG 0x01 =20 -struct PixelFormat { - uint8_t bits_per_pixel; - uint8_t bytes_per_pixel; - uint8_t depth; /* color depth in bits */ - uint32_t rmask, gmask, bmask, amask; - uint8_t rshift, gshift, bshift, ashift; - uint8_t rmax, gmax, bmax, amax; - uint8_t rbits, gbits, bbits, abits; -}; - typedef struct DisplaySurface { pixman_format_code_t format; pixman_image_t *image; diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index b7c82d17fc..0668109305 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -53,6 +53,16 @@ =20 /* -------------------------------------------------------------------- */ =20 +typedef struct PixelFormat { + uint8_t bits_per_pixel; + uint8_t bytes_per_pixel; + uint8_t depth; /* color depth in bits */ + uint32_t rmask, gmask, bmask, amask; + uint8_t rshift, gshift, bshift, ashift; + uint8_t rmax, gmax, bmax, amax; + uint8_t rbits, gbits, bbits, abits; +} PixelFormat; + PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format); pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endia= n); pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format); --=20 2.17.2