[PATCH v2 59/71] hw/vfio: Constify VMState

2023-12-20 Thread Richard Henderson
Signed-off-by: Richard Henderson 
---
 hw/vfio/display.c | 2 +-
 hw/vfio/pci.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 7a10fa8604..1aa440c663 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -560,7 +560,7 @@ const VMStateDescription vfio_display_vmstate = {
 .version_id = 1,
 .minimum_version_id = 1,
 .needed = migrate_needed,
-.fields = (VMStateField[]) {
+.fields = (const VMStateField[]) {
 VMSTATE_STRUCT_POINTER(ramfb, VFIODisplay, ramfb_vmstate, RAMFBState),
 VMSTATE_END_OF_LIST(),
 }
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 1874ec1aba..9f838978be 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2561,7 +2561,7 @@ const VMStateDescription vmstate_vfio_display = {
 .version_id = 1,
 .minimum_version_id = 1,
 .needed = vfio_display_migration_needed,
-.fields = (VMStateField[]){
+.fields = (const VMStateField[]){
 VMSTATE_STRUCT_POINTER(dpy, VFIOPCIDevice, vfio_display_vmstate,
VFIODisplay),
 VMSTATE_END_OF_LIST()
@@ -2572,12 +2572,12 @@ const VMStateDescription vmstate_vfio_pci_config = {
 .name = "VFIOPCIDevice",
 .version_id = 1,
 .minimum_version_id = 1,
-.fields = (VMStateField[]) {
+.fields = (const VMStateField[]) {
 VMSTATE_PCI_DEVICE(pdev, VFIOPCIDevice),
 VMSTATE_MSIX_TEST(pdev, VFIOPCIDevice, vfio_msix_present),
 VMSTATE_END_OF_LIST()
 },
-.subsections = (const VMStateDescription * []) {
+.subsections = (const VMStateDescription * const []) {
 &vmstate_vfio_display,
 NULL
 }
-- 
2.34.1




Re: [PATCH v2 59/71] hw/vfio: Constify VMState

2023-12-21 Thread Cédric Le Goater

On 12/21/23 04:16, Richard Henderson wrote:

Signed-off-by: Richard Henderson 


Reviewed-by: Cédric Le Goater 

I suppose you will include the patch in :

  
https://lore.kernel.org/qemu-devel/20231221031652.119827-1-richard.hender...@linaro.org/


Thanks,

C.




---
  hw/vfio/display.c | 2 +-
  hw/vfio/pci.c | 6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/vfio/display.c b/hw/vfio/display.c
index 7a10fa8604..1aa440c663 100644
--- a/hw/vfio/display.c
+++ b/hw/vfio/display.c
@@ -560,7 +560,7 @@ const VMStateDescription vfio_display_vmstate = {
  .version_id = 1,
  .minimum_version_id = 1,
  .needed = migrate_needed,
-.fields = (VMStateField[]) {
+.fields = (const VMStateField[]) {
  VMSTATE_STRUCT_POINTER(ramfb, VFIODisplay, ramfb_vmstate, RAMFBState),
  VMSTATE_END_OF_LIST(),
  }
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 1874ec1aba..9f838978be 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2561,7 +2561,7 @@ const VMStateDescription vmstate_vfio_display = {
  .version_id = 1,
  .minimum_version_id = 1,
  .needed = vfio_display_migration_needed,
-.fields = (VMStateField[]){
+.fields = (const VMStateField[]){
  VMSTATE_STRUCT_POINTER(dpy, VFIOPCIDevice, vfio_display_vmstate,
 VFIODisplay),
  VMSTATE_END_OF_LIST()
@@ -2572,12 +2572,12 @@ const VMStateDescription vmstate_vfio_pci_config = {
  .name = "VFIOPCIDevice",
  .version_id = 1,
  .minimum_version_id = 1,
-.fields = (VMStateField[]) {
+.fields = (const VMStateField[]) {
  VMSTATE_PCI_DEVICE(pdev, VFIOPCIDevice),
  VMSTATE_MSIX_TEST(pdev, VFIOPCIDevice, vfio_msix_present),
  VMSTATE_END_OF_LIST()
  },
-.subsections = (const VMStateDescription * []) {
+.subsections = (const VMStateDescription * const []) {
  &vmstate_vfio_display,
  NULL
  }