From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 44/71] hw/pci: Constify VMState
Date: Thu, 21 Dec 2023 14:16:25 +1100 [thread overview]
Message-ID: <20231221031652.119827-45-richard.henderson@linaro.org> (raw)
In-Reply-To: <20231221031652.119827-1-richard.henderson@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/pci/shpc.h | 2 +-
hw/pci/msix.c | 4 ++--
hw/pci/pci.c | 8 ++++----
hw/pci/pci_host.c | 2 +-
hw/pci/pcie_aer.c | 4 ++--
hw/pci/shpc.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index 89c7a3b7fa..a0789df153 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -52,7 +52,7 @@ void shpc_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp);
-extern VMStateInfo shpc_vmstate_info;
+extern const VMStateInfo shpc_vmstate_info;
#define SHPC_VMSTATE(_field, _type, _test) \
VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _type, _test, 0, \
shpc_vmstate_info, 0)
diff --git a/hw/pci/msix.c b/hw/pci/msix.c
index cd817f4ca8..487e49834e 100644
--- a/hw/pci/msix.c
+++ b/hw/pci/msix.c
@@ -685,7 +685,7 @@ static int get_msix_state(QEMUFile *f, void *pv, size_t size,
return 0;
}
-static VMStateInfo vmstate_info_msix = {
+static const VMStateInfo vmstate_info_msix = {
.name = "msix state",
.get = get_msix_state,
.put = put_msix_state,
@@ -693,7 +693,7 @@ static VMStateInfo vmstate_info_msix = {
const VMStateDescription vmstate_msix = {
.name = "msix",
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
{
.name = "msix",
.version_id = 0,
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index c49417abb2..76080af580 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -92,7 +92,7 @@ static const VMStateDescription vmstate_pcibus = {
.name = "PCIBUS",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_EQUAL(nirq, PCIBus, NULL),
VMSTATE_VARRAY_INT32(irq_count, PCIBus,
nirq, 0, vmstate_info_int32,
@@ -673,7 +673,7 @@ static int put_pci_config_device(QEMUFile *f, void *pv, size_t size,
return 0;
}
-static VMStateInfo vmstate_info_pci_config = {
+static const VMStateInfo vmstate_info_pci_config = {
.name = "pci config",
.get = get_pci_config_device,
.put = put_pci_config_device,
@@ -714,7 +714,7 @@ static int put_pci_irq_state(QEMUFile *f, void *pv, size_t size,
return 0;
}
-static VMStateInfo vmstate_info_pci_irq_state = {
+static const VMStateInfo vmstate_info_pci_irq_state = {
.name = "pci irq state",
.get = get_pci_irq_state,
.put = put_pci_irq_state,
@@ -734,7 +734,7 @@ const VMStateDescription vmstate_pci_device = {
.name = "PCIDevice",
.version_id = 2,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice),
VMSTATE_BUFFER_UNSAFE_INFO_TEST(config, PCIDevice,
migrate_is_not_pcie,
diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c
index a18aa0a8d4..dfe6fe6184 100644
--- a/hw/pci/pci_host.c
+++ b/hw/pci/pci_host.c
@@ -234,7 +234,7 @@ const VMStateDescription vmstate_pcihost = {
.needed = pci_host_needed,
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(config_reg, PCIHostState),
VMSTATE_END_OF_LIST()
}
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index b68c7ecb49..2c85a78fcd 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -797,7 +797,7 @@ static const VMStateDescription vmstate_pcie_aer_err = {
.name = "PCIE_AER_ERROR",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT32(status, PCIEAERErr),
VMSTATE_UINT16(source_id, PCIEAERErr),
VMSTATE_UINT16(flags, PCIEAERErr),
@@ -818,7 +818,7 @@ const VMStateDescription vmstate_pcie_aer_log = {
.name = "PCIE_AER_ERROR_LOG",
.version_id = 1,
.minimum_version_id = 1,
- .fields = (VMStateField[]) {
+ .fields = (const VMStateField[]) {
VMSTATE_UINT16(log_num, PCIEAERLog),
VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog, NULL),
VMSTATE_VALIDATE("log_num <= log_max", pcie_aer_state_log_num_valid),
diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index df7f370111..d2a5eea69e 100644
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -736,7 +736,7 @@ static int shpc_load(QEMUFile *f, void *pv, size_t size,
return 0;
}
-VMStateInfo shpc_vmstate_info = {
+const VMStateInfo shpc_vmstate_info = {
.name = "shpc",
.get = shpc_load,
.put = shpc_save,
--
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 ` Richard Henderson [this message]
2023-12-21 3:16 ` [PATCH v2 45/71] hw/pci-bridge: " Richard Henderson
2023-12-21 3:16 ` [PATCH v2 46/71] hw/pci-host: " Richard Henderson
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-45-richard.henderson@linaro.org \
--to=richard.henderson@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).