Re: [PATCH v3] vmstate: validate VMStateDescription::fields upon registration

[Philippe Mathieu-Daudé]

On 16/3/26 15:21, Fabiano Rosas wrote:

-- >8 --
 From 9bd63109e970ff231eb321e627f622910f9977ca Mon Sep 17 00:00:00 2001
From: Fabiano Rosas <faro...@suse.de>
Date: Mon, 16 Mar 2026 11:16:22 -0300
Subject: [PATCH] fixup! vmstate: validate VMStateDescription::fields upon
  registration

---
  hw/acpi/acpi-cpu-hotplug-stub.c | 4 +++-
  hw/acpi/acpi-mem-hotplug-stub.c | 4 +++-
  hw/acpi/acpi-pci-hotplug-stub.c | 4 +++-
  3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c b/hw/acpi/acpi-cpu-hotplug-stub.c
index 72c5f05f5c..4332f3fb7d 100644
--- a/hw/acpi/acpi-cpu-hotplug-stub.c
+++ b/hw/acpi/acpi-cpu-hotplug-stub.c
@@ -3,7 +3,9 @@
  #include "hw/acpi/cpu.h"

/* Following stubs are all related to ACPI cpu hotplug */

-const VMStateDescription vmstate_cpu_hotplug;
+const VMStateDescription vmstate_cpu_hotplug = {
+    .fields = (const VMStateField[]) { VMSTATE_END_OF_LIST() },
+};

void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,

                           CPUHotplugState *state, hwaddr base_addr)
diff --git a/hw/acpi/acpi-mem-hotplug-stub.c b/hw/acpi/acpi-mem-hotplug-stub.c
index 7ad0fdcdf2..36c12a4e5f 100644
--- a/hw/acpi/acpi-mem-hotplug-stub.c
+++ b/hw/acpi/acpi-mem-hotplug-stub.c
@@ -2,7 +2,9 @@
  #include "hw/acpi/memory_hotplug.h"
  #include "migration/vmstate.h"

-const VMStateDescription vmstate_memory_hotplug;

+const VMStateDescription vmstate_memory_hotplug = {
+    .fields = (const VMStateField[]) { VMSTATE_END_OF_LIST() },
+};

void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner,

                                MemHotplugState *state, hwaddr io_base)
diff --git a/hw/acpi/acpi-pci-hotplug-stub.c b/hw/acpi/acpi-pci-hotplug-stub.c
index d58ea726a8..3e3a484d3e 100644
--- a/hw/acpi/acpi-pci-hotplug-stub.c
+++ b/hw/acpi/acpi-pci-hotplug-stub.c
@@ -2,7 +2,9 @@
  #include "hw/acpi/pcihp.h"
  #include "migration/vmstate.h"

-const VMStateDescription vmstate_acpi_pcihp_pci_status;

+const VMStateDescription vmstate_acpi_pcihp_pci_status = {
+    .fields = (const VMStateField[]) { VMSTATE_END_OF_LIST() },
+};

void acpi_pcihp_init(Object *owner, AcpiPciHpState *s,

                       MemoryRegion *address_space_io, uint16_t io_base)

Missing:

-- >8 --
diff --git a/hw/display/ramfb-stubs.c b/hw/display/ramfb-stubs.c
index b83551357bb..283af44ecec 100644
--- a/hw/display/ramfb-stubs.c
+++ b/hw/display/ramfb-stubs.c
@@ -2,7 +2,9 @@
 #include "qapi/error.h"
 #include "hw/display/ramfb.h"

-const VMStateDescription ramfb_vmstate = {};
+const VMStateDescription ramfb_vmstate = {
+    .fields = (const VMStateField[]) { VMSTATE_END_OF_LIST() },
+};

 void ramfb_display_update(QemuConsole *con, RAMFBState *s)
 {
---

Otherwise LGTM (agreeing with Peter to post separately as
a preliminary Fixes patch).