From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 46/71] hw/pci-host: Constify VMState
Date: Thu, 21 Dec 2023 14:16:27 +1100 [thread overview]
Message-ID: <20231221031652.119827-47-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231221031652.119827-1-richard.henderson@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/pci-host/astro.c | 4 ++--
hw/pci-host/bonito.c | 2 +-
hw/pci-host/designware.c | 10 +++++-----
hw/pci-host/dino.c | 2 +-
hw/pci-host/gpex.c | 2 +-
hw/pci-host/gt64120.c | 2 +-
hw/pci-host/i440fx.c | 2 +-
hw/pci-host/ppce500.c | 6 +++---
hw/pci-host/q35.c | 2 +-
hw/pci-host/raven.c | 2 +-
hw/pci-host/versatile.c | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/hw/pci-host/astro.c b/hw/pci-host/astro.c
index 7d68ccee7e..f4de70475c 100644
--- a/hw/pci-host/astro.c
+++ b/hw/pci-host/astro.c
@@ -459,7 +459,7 @@ static const VMStateDescription vmstate_elroy = {
.name = "Elroy",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(hpa, ElroyState),
VMSTATE_UINT32(pci_bus_num, ElroyState),
VMSTATE_UINT64(config_address, ElroyState),
@@ -691,7 +691,7 @@ static const VMStateDescription vmstate_astro = {
.name = "Astro",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(ioc_ctrl, AstroState),
VMSTATE_UINT64(ioc_status_ctrl, AstroState),
VMSTATE_UINT64_ARRAY(ioc_ranges, AstroState, (0x03d8 - 0x300) / 8),
diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index bab661f3ce..1f0c435348 100644
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -619,7 +619,7 @@ static const VMStateDescription vmstate_bonito = {
.name = "Bonito",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, PCIBonitoState),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c
index f477f97847..dd9e389c07 100644
--- a/hw/pci-host/designware.c
+++ b/hw/pci-host/designware.c
@@ -529,7 +529,7 @@ static const VMStateDescription vmstate_designware_pcie_msi_bank = {
.name = "designware-pcie-msi-bank",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(enable, DesignwarePCIEMSIBank),
VMSTATE_UINT32(mask, DesignwarePCIEMSIBank),
VMSTATE_UINT32(status, DesignwarePCIEMSIBank),
@@ -541,7 +541,7 @@ static const VMStateDescription vmstate_designware_pcie_msi = {
.name = "designware-pcie-msi",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(base, DesignwarePCIEMSI),
VMSTATE_STRUCT_ARRAY(intr,
DesignwarePCIEMSI,
@@ -557,7 +557,7 @@ static const VMStateDescription vmstate_designware_pcie_viewport = {
.name = "designware-pcie-viewport",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT64(base, DesignwarePCIEViewport),
VMSTATE_UINT64(target, DesignwarePCIEViewport),
VMSTATE_UINT32(limit, DesignwarePCIEViewport),
@@ -570,7 +570,7 @@ static const VMStateDescription vmstate_designware_pcie_root = {
.name = "designware-pcie-root",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, PCIBridge),
VMSTATE_UINT32(atu_viewport, DesignwarePCIERoot),
VMSTATE_STRUCT_2DARRAY(viewports,
@@ -718,7 +718,7 @@ static const VMStateDescription vmstate_designware_pcie_host = {
.name = "designware-pcie-host",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT(root,
DesignwarePCIEHost,
1,
diff --git a/hw/pci-host/dino.c b/hw/pci-host/dino.c
index 5b0947a16c..d992c4bb69 100644
--- a/hw/pci-host/dino.c
+++ b/hw/pci-host/dino.c
@@ -287,7 +287,7 @@ static const VMStateDescription vmstate_dino = {
.name = "Dino",
.version_id = 2,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(iar0, DinoState),
VMSTATE_UINT32(iar1, DinoState),
VMSTATE_UINT32(imr, DinoState),
diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c
index a6752fac5e..e117e47fa7 100644
--- a/hw/pci-host/gpex.c
+++ b/hw/pci-host/gpex.c
@@ -195,7 +195,7 @@ static const VMStateDescription vmstate_gpex_root = {
.name = "gpex_root",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, GPEXRootState),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index 143bf053d7..e02efc9e2e 100644
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -431,7 +431,7 @@ static const VMStateDescription vmstate_gt64120 = {
.version_id = 1,
.minimum_version_id = 1,
.post_load = gt64120_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(regs, GT64120State, GT_REGS),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 653cc3f149..4f0a0438d7 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -125,7 +125,7 @@ static const VMStateDescription vmstate_i440fx = {
.version_id = 3,
.minimum_version_id = 3,
.post_load = i440fx_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState),
/* Used to be smm_enabled, which was basically always zero because
* SeaBIOS hardly uses SMM. SMRAM is now handled by CPU code.
diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c
index 453a4e6ed3..fa0d67b342 100644
--- a/hw/pci-host/ppce500.c
+++ b/hw/pci-host/ppce500.c
@@ -379,7 +379,7 @@ static const VMStateDescription vmstate_pci_outbound = {
.name = "pci_outbound",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(potar, struct pci_outbound),
VMSTATE_UINT32(potear, struct pci_outbound),
VMSTATE_UINT32(powbar, struct pci_outbound),
@@ -392,7 +392,7 @@ static const VMStateDescription vmstate_pci_inbound = {
.name = "pci_inbound",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(pitar, struct pci_inbound),
VMSTATE_UINT32(piwbar, struct pci_inbound),
VMSTATE_UINT32(piwbear, struct pci_inbound),
@@ -405,7 +405,7 @@ static const VMStateDescription vmstate_ppce500_pci = {
.name = "ppce500_pci",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_STRUCT_ARRAY(pob, PPCE500PCIState, PPCE500_PCI_NR_POBS, 1,
vmstate_pci_outbound, struct pci_outbound),
VMSTATE_STRUCT_ARRAY(pib, PPCE500PCIState, PPCE500_PCI_NR_PIBS, 1,
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 08534bc7cc..0d7d4e3f08 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -520,7 +520,7 @@ static const VMStateDescription vmstate_mch = {
.version_id = 1,
.minimum_version_id = 1,
.post_load = mch_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, MCHPCIState),
/* Used to be smm_enabled, which was basically always zero because
* SeaBIOS hardly uses SMM. SMRAM is now handled by CPU code.
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 86c3a49087..f71d4872c8 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -383,7 +383,7 @@ static const VMStateDescription vmstate_raven = {
.name = "raven",
.version_id = 0,
.minimum_version_id = 0,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, RavenPCIState),
VMSTATE_END_OF_LIST()
},
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 60d4e7cd92..0e65deb3f9 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -147,7 +147,7 @@ static const VMStateDescription pci_vpb_vmstate = {
.version_id = 1,
.minimum_version_id = 1,
.post_load = pci_vpb_post_load,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32_ARRAY(imap, PCIVPBState, 3),
VMSTATE_UINT32_ARRAY(smap, PCIVPBState, 3),
VMSTATE_UINT32(selfid, PCIVPBState),
--
2.34.1
next prev parent reply other threads:[~2023-12-21 3:24 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 3:15 [PATCH v2 00/71] *: Constify VMState Richard Henderson
2023-12-21 3:15 ` [PATCH v2 01/71] migration: Make VMStateDescription.subsections const Richard Henderson
2023-12-21 3:15 ` [PATCH v2 02/71] target/arm: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 03/71] target/arm: Constify hvf/hvf.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 04/71] target/alpha: Constify VMState in machine.c Richard Henderson
2023-12-21 3:15 ` [PATCH v2 05/71] target/avr: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 06/71] target/cris: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 07/71] target/hppa: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 08/71] target/i386: " Richard Henderson
2023-12-22 2:51 ` Zhao Liu
2023-12-21 3:15 ` [PATCH v2 09/71] target/loongarch: " Richard Henderson
2023-12-21 6:43 ` gaosong
2023-12-21 3:15 ` [PATCH v2 10/71] target/m68k: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 11/71] target/microblaze: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 12/71] target/mips: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 13/71] target/openrisc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 14/71] target/ppc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 15/71] target/riscv: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 16/71] target/s390x: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 17/71] target/sparc: " Richard Henderson
2023-12-21 3:15 ` [PATCH v2 18/71] hw/arm: Constify VMState Richard Henderson
2023-12-21 3:16 ` [PATCH v2 19/71] hw/core: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 20/71] hw/9pfs: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 21/71] hw/acpi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 22/71] hw/adc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 23/71] hw/audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 24/71] hw/block: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 25/71] hw/char: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 26/71] hw/display: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 27/71] hw/dma: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 28/71] hw/gpio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 29/71] hw/hyperv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 30/71] hw/i2c: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 31/71] hw/i386: " Richard Henderson
2023-12-22 2:54 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 32/71] hw/ide: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 33/71] hw/input: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 34/71] hw/intc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 35/71] hw/ipack: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 36/71] hw/ipmi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 37/71] hw/isa: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 38/71] hw/loongarch: " Richard Henderson
2023-12-21 6:44 ` gaosong
2023-12-21 3:16 ` [PATCH v2 39/71] hw/m68k: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 40/71] hw/misc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 41/71] hw/net: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 42/71] hw/nvram: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 43/71] hw/openrisc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 44/71] hw/pci: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 45/71] hw/pci-bridge: " Richard Henderson
2023-12-21 3:16 ` Richard Henderson [this message]
2023-12-21 3:16 ` [PATCH v2 47/71] hw/ppc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 48/71] hw/riscv: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 49/71] hw/rtc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 50/71] hw/s390x: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 51/71] hw/scsi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 52/71] hw/sd: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 53/71] hw/sensor: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 54/71] hw/sparc: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 55/71] hw/ssi: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 56/71] hw/timer: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 57/71] hw/tpm: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 58/71] hw/usb: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 59/71] hw/vfio: " Richard Henderson
2023-12-21 8:14 ` Cédric Le Goater
2023-12-21 3:16 ` [PATCH v2 60/71] hw/virtio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 61/71] hw/watchdog: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 62/71] hw/misc/macio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 63/71] audio: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 64/71] backends: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 65/71] cpu-target: " Richard Henderson
2023-12-22 2:55 ` Zhao Liu
2023-12-21 3:16 ` [PATCH v2 66/71] migration: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 67/71] system: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 68/71] replay: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 69/71] util/fifo8: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 70/71] tests/unit/test-vmstate: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 71/71] docs: Constify VMstate in examples Richard Henderson
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=20231221031652.119827-47-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).