[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 44/71] hw/pci: Constify VMState
From: |
Richard Henderson |
Subject: |
[PATCH v2 44/71] hw/pci: Constify VMState |
Date: |
Thu, 21 Dec 2023 14:16:25 +1100 |
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
- [PATCH v2 34/71] hw/intc: Constify VMState, (continued)
- [PATCH v2 34/71] hw/intc: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 35/71] hw/ipack: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 36/71] hw/ipmi: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 37/71] hw/isa: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 38/71] hw/loongarch: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 39/71] hw/m68k: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 40/71] hw/misc: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 41/71] hw/net: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 42/71] hw/nvram: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 43/71] hw/openrisc: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 44/71] hw/pci: Constify VMState,
Richard Henderson <=
- [PATCH v2 45/71] hw/pci-bridge: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 46/71] hw/pci-host: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 47/71] hw/ppc: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 48/71] hw/riscv: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 49/71] hw/rtc: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 50/71] hw/s390x: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 51/71] hw/scsi: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 52/71] hw/sd: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 53/71] hw/sensor: Constify VMState, Richard Henderson, 2023/12/20
- [PATCH v2 54/71] hw/sparc: Constify VMState, Richard Henderson, 2023/12/20