From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>,
Eric Farman <farman@linux.ibm.com>,
Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Subject: [PULL 19/43] migration: drop VMStateField.err_hint
Date: Thu, 23 Apr 2026 16:19:33 -0300 [thread overview]
Message-ID: <20260423191958.1440-20-farosas@suse.de> (raw)
In-Reply-To: <20260423191958.1440-1-farosas@suse.de>
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
The field is unused, all users of VMSTATE_*_EQUAL pass _err_hint=NULL.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Acked-by: Eric Farman <farman@linux.ibm.com> # s390
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260304212303.667141-18-vsementsov@yandex-team.ru
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
hw/block/fdc.c | 2 +-
hw/display/qxl.c | 4 ++--
hw/display/vga.c | 2 +-
hw/display/virtio-gpu.c | 2 +-
hw/display/vmware_vga.c | 2 +-
hw/i386/vmmouse.c | 2 +-
hw/ide/ahci.c | 2 +-
hw/intc/openpic.c | 2 +-
hw/intc/spapr_xive.c | 2 +-
hw/intc/xics.c | 2 +-
hw/intc/xive.c | 2 +-
hw/nvram/eeprom93xx.c | 2 +-
hw/pci/pci.c | 2 +-
hw/pci/pcie_aer.c | 2 +-
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 4 ++--
hw/ppc/spapr_vio.c | 4 ++--
hw/s390x/css.c | 6 +++---
hw/usb/hcd-uhci.c | 2 +-
include/migration/vmstate.h | 36 +++++++++++++++++-------------------
migration/vmstate-types.c | 15 ---------------
target/ppc/machine.c | 6 +++---
22 files changed, 44 insertions(+), 61 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 4585640af9..2c1681b7d0 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -1051,7 +1051,7 @@ const VMStateDescription vmstate_fdc = {
VMSTATE_UINT8(config, FDCtrl),
VMSTATE_UINT8(lock, FDCtrl),
VMSTATE_UINT8(pwrd, FDCtrl),
- VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl, NULL),
+ VMSTATE_UINT8_EQUAL(num_floppies, FDCtrl),
VMSTATE_STRUCT_ARRAY(drives, FDCtrl, MAX_FD, 1,
vmstate_fdrive, FDrive),
VMSTATE_END_OF_LIST()
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 3d4b563556..f8fd7ee069 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -2442,12 +2442,12 @@ static const VMStateDescription qxl_vmstate = {
VMSTATE_UINT32(last_release_offset, PCIQXLDevice),
VMSTATE_UINT32(mode, PCIQXLDevice),
VMSTATE_UINT32(ssd.unique, PCIQXLDevice),
- VMSTATE_INT32_EQUAL(num_memslots, PCIQXLDevice, NULL),
+ VMSTATE_INT32_EQUAL(num_memslots, PCIQXLDevice),
VMSTATE_STRUCT_ARRAY(guest_slots, PCIQXLDevice, NUM_MEMSLOTS, 0,
qxl_memslot, struct guest_slots),
VMSTATE_STRUCT(guest_primary.surface, PCIQXLDevice, 0,
qxl_surface, QXLSurfaceCreate),
- VMSTATE_INT32_EQUAL(ssd.num_surfaces, PCIQXLDevice, NULL),
+ VMSTATE_INT32_EQUAL(ssd.num_surfaces, PCIQXLDevice),
VMSTATE_VARRAY_INT32(guest_surfaces.cmds, PCIQXLDevice,
ssd.num_surfaces, 0,
vmstate_info_uint64, uint64_t),
diff --git a/hw/display/vga.c b/hw/display/vga.c
index ee7d97b5c2..0d69a53f27 100644
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -2160,7 +2160,7 @@ const VMStateDescription vmstate_vga_common = {
VMSTATE_BUFFER(palette, VGACommonState),
VMSTATE_INT32(bank_offset, VGACommonState),
- VMSTATE_UINT8_EQUAL(is_vbe_vmstate, VGACommonState, NULL),
+ VMSTATE_UINT8_EQUAL(is_vbe_vmstate, VGACommonState),
VMSTATE_UINT16(vbe_index, VGACommonState),
VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState, VBE_DISPI_INDEX_NB),
VMSTATE_UINT32(vbe_start_addr, VGACommonState),
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index b998ce8324..dbb72bbb22 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1223,7 +1223,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = {
.fields = (const VMStateField[]) {
VMSTATE_INT32(parent_obj.enable, struct VirtIOGPU),
VMSTATE_UINT32_EQUAL(parent_obj.conf.max_outputs,
- struct VirtIOGPU, NULL),
+ struct VirtIOGPU),
VMSTATE_STRUCT_VARRAY_UINT32(parent_obj.scanout, struct VirtIOGPU,
parent_obj.conf.max_outputs, 1,
vmstate_virtio_gpu_scanout,
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index c2c6bc76e9..2b95787ddf 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -1209,7 +1209,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = {
.minimum_version_id = 0,
.post_load = vmsvga_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s, NULL),
+ VMSTATE_INT32_EQUAL(new_depth, struct vmsvga_state_s),
VMSTATE_INT32(enable, struct vmsvga_state_s),
VMSTATE_INT32(config, struct vmsvga_state_s),
VMSTATE_INT32(cursor.id, struct vmsvga_state_s),
diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
index c1aeeca0c9..417c3aecb9 100644
--- a/hw/i386/vmmouse.c
+++ b/hw/i386/vmmouse.c
@@ -278,7 +278,7 @@ static const VMStateDescription vmstate_vmmouse = {
.minimum_version_id = 0,
.post_load = vmmouse_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(queue_size, VMMouseState, NULL),
+ VMSTATE_INT32_EQUAL(queue_size, VMMouseState),
VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE),
VMSTATE_UINT16(nb_queue, VMMouseState),
VMSTATE_UINT16(status, VMMouseState),
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 08f51c8e36..c2b4432b94 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1795,7 +1795,7 @@ const VMStateDescription vmstate_ahci = {
VMSTATE_UINT32(control_regs.impl, AHCIState),
VMSTATE_UINT32(control_regs.version, AHCIState),
VMSTATE_UINT32(idp_index, AHCIState),
- VMSTATE_UINT32_EQUAL(ports, AHCIState, NULL),
+ VMSTATE_UINT32_EQUAL(ports, AHCIState),
VMSTATE_END_OF_LIST()
},
};
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index cd353a04f5..99d2a1e65e 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -1477,7 +1477,7 @@ static const VMStateDescription vmstate_openpic = {
VMSTATE_UINT32(max_irq, OpenPICState),
VMSTATE_STRUCT_VARRAY_UINT32(src, OpenPICState, max_irq, 0,
vmstate_openpic_irqsource, IRQSource),
- VMSTATE_UINT32_EQUAL(nb_cpus, OpenPICState, NULL),
+ VMSTATE_UINT32_EQUAL(nb_cpus, OpenPICState),
VMSTATE_STRUCT_VARRAY_UINT32(dst, OpenPICState, nb_cpus, 0,
vmstate_openpic_irqdest, IRQDest),
VMSTATE_STRUCT_ARRAY(timers, OpenPICState, OPENPIC_MAX_TMR, 0,
diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c
index 76ab476f59..c30dace4e2 100644
--- a/hw/intc/spapr_xive.c
+++ b/hw/intc/spapr_xive.c
@@ -578,7 +578,7 @@ static const VMStateDescription vmstate_spapr_xive = {
.pre_save = vmstate_spapr_xive_pre_save,
.post_load = NULL, /* handled at the machine level */
.fields = (const VMStateField[]) {
- VMSTATE_UINT32_EQUAL(nr_irqs, SpaprXive, NULL),
+ VMSTATE_UINT32_EQUAL(nr_irqs, SpaprXive),
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(eat, SpaprXive, nr_irqs,
vmstate_spapr_xive_eas, XiveEAS),
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(endt, SpaprXive, nr_ends,
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 1d40c4386d..c0a252d051 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -668,7 +668,7 @@ static const VMStateDescription vmstate_ics = {
.post_load = ics_post_load,
.fields = (const VMStateField[]) {
/* Sanity check */
- VMSTATE_UINT32_EQUAL(nr_irqs, ICSState, NULL),
+ VMSTATE_UINT32_EQUAL(nr_irqs, ICSState),
VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, ICSState, nr_irqs,
vmstate_ics_irq,
diff --git a/hw/intc/xive.c b/hw/intc/xive.c
index d702b58bd0..f473e6ac77 100644
--- a/hw/intc/xive.c
+++ b/hw/intc/xive.c
@@ -1565,7 +1565,7 @@ static const VMStateDescription vmstate_xive_source = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
- VMSTATE_UINT32_EQUAL(nr_irqs, XiveSource, NULL),
+ VMSTATE_UINT32_EQUAL(nr_irqs, XiveSource),
VMSTATE_VBUFFER_UINT32(status, XiveSource, 1, NULL, nr_irqs),
VMSTATE_END_OF_LIST()
},
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index a8fd60a8fb..73b3d248d4 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -144,7 +144,7 @@ static const VMStateDescription vmstate_eeprom = {
VMSTATE_UINT8(addrbits, eeprom_t),
VMSTATE_UINT16_HACK_TEST(size, eeprom_t, is_old_eeprom_version),
VMSTATE_UNUSED_TEST(is_old_eeprom_version, 1),
- VMSTATE_UINT16_EQUAL_V(size, eeprom_t, EEPROM_VERSION, NULL),
+ VMSTATE_UINT16_EQUAL_V(size, eeprom_t, EEPROM_VERSION),
VMSTATE_UINT16(data, eeprom_t),
VMSTATE_VARRAY_UINT16_UNSAFE(contents, eeprom_t, size, 0,
vmstate_info_uint16, uint16_t),
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 2c3657d00d..a0dbb81fd9 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -105,7 +105,7 @@ static const VMStateDescription vmstate_pcibus = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(nirq, PCIBus, NULL),
+ VMSTATE_INT32_EQUAL(nirq, PCIBus),
VMSTATE_VARRAY_INT32(irq_count, PCIBus,
nirq, 0, vmstate_info_int32,
int32_t),
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index 2c85a78fcd..22497b1fd6 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -820,7 +820,7 @@ const VMStateDescription vmstate_pcie_aer_log = {
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
VMSTATE_UINT16(log_num, PCIEAERLog),
- VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog, NULL),
+ VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog),
VMSTATE_VALIDATE("log_num <= log_max", pcie_aer_state_log_num_valid),
VMSTATE_STRUCT_VARRAY_POINTER_UINT16(log, PCIEAERLog, log_num,
vmstate_pcie_aer_err, PCIEAERErr),
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c
index c2432a0c00..e6264b0785 100644
--- a/hw/ppc/spapr_iommu.c
+++ b/hw/ppc/spapr_iommu.c
@@ -285,7 +285,7 @@ static const VMStateDescription vmstate_spapr_tce_table = {
.post_load = spapr_tce_table_post_load,
.fields = (const VMStateField []) {
/* Sanity check */
- VMSTATE_UINT32_EQUAL(liobn, SpaprTceTable, NULL),
+ VMSTATE_UINT32_EQUAL(liobn, SpaprTceTable),
/* IOMMU state */
VMSTATE_UINT32(mig_nb_table, SpaprTceTable),
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 1dc3b02659..c1d4b7806e 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -2051,7 +2051,7 @@ static const VMStateDescription vmstate_spapr_pci_lsi = {
.version_id = 1,
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
- VMSTATE_UINT32_EQUAL(irq, SpaprPciLsi, NULL),
+ VMSTATE_UINT32_EQUAL(irq, SpaprPciLsi),
VMSTATE_END_OF_LIST()
},
@@ -2129,7 +2129,7 @@ static const VMStateDescription vmstate_spapr_pci = {
.post_save = spapr_pci_post_save,
.post_load = spapr_pci_post_load,
.fields = (const VMStateField[]) {
- VMSTATE_UINT64_EQUAL(buid, SpaprPhbState, NULL),
+ VMSTATE_UINT64_EQUAL(buid, SpaprPhbState),
VMSTATE_STRUCT_ARRAY(lsi_table, SpaprPhbState, PCI_NUM_PINS, 0,
vmstate_spapr_pci_lsi, SpaprPciLsi),
VMSTATE_INT32(msi_devs_num, SpaprPhbState),
diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 501e82a766..3f05081bad 100644
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -609,8 +609,8 @@ const VMStateDescription vmstate_spapr_vio = {
.minimum_version_id = 1,
.fields = (const VMStateField[]) {
/* Sanity check */
- VMSTATE_UINT32_EQUAL(reg, SpaprVioDevice, NULL),
- VMSTATE_UINT32_EQUAL(irq, SpaprVioDevice, NULL),
+ VMSTATE_UINT32_EQUAL(reg, SpaprVioDevice),
+ VMSTATE_UINT32_EQUAL(irq, SpaprVioDevice),
/* General VIO device state */
VMSTATE_UINT64(signal_state, SpaprVioDevice),
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index df5f0bc27f..ecd28fed5c 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -199,15 +199,15 @@ const VMStateDescription vmstate_subch_dev = {
.post_load = subch_dev_post_load,
.pre_save = subch_dev_pre_save,
.fields = (const VMStateField[]) {
- VMSTATE_UINT8_EQUAL(cssid, SubchDev, NULL),
- VMSTATE_UINT8_EQUAL(ssid, SubchDev, NULL),
+ VMSTATE_UINT8_EQUAL(cssid, SubchDev),
+ VMSTATE_UINT8_EQUAL(ssid, SubchDev),
VMSTATE_UINT16(migrated_schid, SubchDev),
/*
* If devno mismatch on target, it may be due to some
* sequences of plug and unplug breaks migration for
* machine versions prior to 2.7 (known design flaw).
*/
- VMSTATE_UINT16_EQUAL(devno, SubchDev, NULL),
+ VMSTATE_UINT16_EQUAL(devno, SubchDev),
VMSTATE_BOOL(thinint_active, SubchDev),
VMSTATE_STRUCT(curr_status, SubchDev, 0, vmstate_schib, SCHIB),
VMSTATE_UINT8_ARRAY(sense_data, SubchDev, 32),
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index b2224c7f76..a7b9fe1317 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -364,7 +364,7 @@ static const VMStateDescription vmstate_uhci = {
.post_load = uhci_post_load,
.fields = (const VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, UHCIState),
- VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState, NULL),
+ VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState),
VMSTATE_STRUCT_ARRAY(ports, UHCIState, UHCI_PORTS, 1,
vmstate_uhci_port, UHCIPort),
VMSTATE_UINT16(cmd, UHCIState),
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 66c2e87bd3..d4a39aa794 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -182,7 +182,6 @@ typedef enum {
struct VMStateField {
const char *name;
- const char *err_hint;
size_t offset;
size_t size;
size_t start;
@@ -358,9 +357,8 @@ extern const VMStateInfo vmstate_info_qlist;
}
#define VMSTATE_SINGLE_FULL(_field, _state, _test, _version, _info, \
- _type, _err_hint) { \
+ _type) { \
.name = (stringify(_field)), \
- .err_hint = (_err_hint), \
.version_id = (_version), \
.field_exists = (_test), \
.size = sizeof(_type), \
@@ -1022,35 +1020,35 @@ extern const VMStateInfo vmstate_info_qlist;
#endif
-#define VMSTATE_UINT8_EQUAL(_f, _s, _err_hint) \
+#define VMSTATE_UINT8_EQUAL(_f, _s) \
VMSTATE_SINGLE_FULL(_f, _s, 0, 0, \
- vmstate_info_uint8_equal, uint8_t, _err_hint)
+ vmstate_info_uint8_equal, uint8_t)
-#define VMSTATE_UINT16_EQUAL(_f, _s, _err_hint) \
+#define VMSTATE_UINT16_EQUAL(_f, _s) \
VMSTATE_SINGLE_FULL(_f, _s, 0, 0, \
- vmstate_info_uint16_equal, uint16_t, _err_hint)
+ vmstate_info_uint16_equal, uint16_t)
-#define VMSTATE_UINT16_EQUAL_V(_f, _s, _v, _err_hint) \
+#define VMSTATE_UINT16_EQUAL_V(_f, _s, _v) \
VMSTATE_SINGLE_FULL(_f, _s, 0, _v, \
- vmstate_info_uint16_equal, uint16_t, _err_hint)
+ vmstate_info_uint16_equal, uint16_t)
-#define VMSTATE_INT32_EQUAL(_f, _s, _err_hint) \
+#define VMSTATE_INT32_EQUAL(_f, _s) \
VMSTATE_SINGLE_FULL(_f, _s, 0, 0, \
- vmstate_info_int32_equal, int32_t, _err_hint)
+ vmstate_info_int32_equal, int32_t)
-#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v, _err_hint) \
+#define VMSTATE_UINT32_EQUAL_V(_f, _s, _v) \
VMSTATE_SINGLE_FULL(_f, _s, 0, _v, \
- vmstate_info_uint32_equal, uint32_t, _err_hint)
+ vmstate_info_uint32_equal, uint32_t)
-#define VMSTATE_UINT32_EQUAL(_f, _s, _err_hint) \
- VMSTATE_UINT32_EQUAL_V(_f, _s, 0, _err_hint)
+#define VMSTATE_UINT32_EQUAL(_f, _s) \
+ VMSTATE_UINT32_EQUAL_V(_f, _s, 0)
-#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v, _err_hint) \
+#define VMSTATE_UINT64_EQUAL_V(_f, _s, _v) \
VMSTATE_SINGLE_FULL(_f, _s, 0, _v, \
- vmstate_info_uint64_equal, uint64_t, _err_hint)
+ vmstate_info_uint64_equal, uint64_t)
-#define VMSTATE_UINT64_EQUAL(_f, _s, _err_hint) \
- VMSTATE_UINT64_EQUAL_V(_f, _s, 0, _err_hint)
+#define VMSTATE_UINT64_EQUAL(_f, _s) \
+ VMSTATE_UINT64_EQUAL_V(_f, _s, 0)
#define VMSTATE_INT32_POSITIVE_LE(_f, _s) \
VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t)
diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c
index 89cb211472..033a2685c8 100644
--- a/migration/vmstate-types.c
+++ b/migration/vmstate-types.c
@@ -131,9 +131,6 @@ static int get_int32_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx32 " != %" PRIx32, *v, v2);
- if (field->err_hint) {
- error_printf("%s\n", field->err_hint);
- }
return -EINVAL;
}
@@ -280,9 +277,6 @@ static int get_uint32_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx32 " != %" PRIx32, *v, v2);
- if (field->err_hint) {
- error_printf("%s\n", field->err_hint);
- }
return -EINVAL;
}
@@ -391,9 +385,6 @@ static int get_uint64_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%" PRIx64 " != %" PRIx64, *v, v2);
- if (field->err_hint) {
- error_printf("%s\n", field->err_hint);
- }
return -EINVAL;
}
@@ -417,9 +408,6 @@ static int get_uint8_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%x != %x", *v, v2);
- if (field->err_hint) {
- error_printf("%s\n", field->err_hint);
- }
return -EINVAL;
}
@@ -443,9 +431,6 @@ static int get_uint16_equal(QEMUFile *f, void *pv, size_t size,
return 0;
}
error_report("%x != %x", *v, v2);
- if (field->err_hint) {
- error_printf("%s\n", field->err_hint);
- }
return -EINVAL;
}
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index 49cfdc6d67..9eae0ff647 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -564,7 +564,7 @@ static const VMStateDescription vmstate_tlb6xx = {
.minimum_version_id = 1,
.needed = tlb6xx_needed,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
+ VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlb6, PowerPCCPU,
env.nb_tlb,
vmstate_tlb6xx_entry,
@@ -603,7 +603,7 @@ static const VMStateDescription vmstate_tlbemb = {
.minimum_version_id = 1,
.needed = tlbemb_needed,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
+ VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbe, PowerPCCPU,
env.nb_tlb,
vmstate_tlbemb_entry,
@@ -639,7 +639,7 @@ static const VMStateDescription vmstate_tlbmas = {
.minimum_version_id = 1,
.needed = tlbmas_needed,
.fields = (const VMStateField[]) {
- VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU, NULL),
+ VMSTATE_INT32_EQUAL(env.nb_tlb, PowerPCCPU),
VMSTATE_STRUCT_VARRAY_POINTER_INT32(env.tlb.tlbm, PowerPCCPU,
env.nb_tlb,
vmstate_tlbmas_entry,
--
2.51.0
next prev parent reply other threads:[~2026-04-23 19:24 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-23 19:19 [PULL 00/43] Migration patches for 2026-04-23 Fabiano Rosas
2026-04-23 19:19 ` [PULL 01/43] checkpatch: Allow spaces after all coroutine annotations Fabiano Rosas
2026-04-23 19:19 ` [PULL 02/43] tests/functional: Make socat wait longer in migration exec test Fabiano Rosas
2026-04-23 19:19 ` [PULL 03/43] migration: vmstate_save_state_v: fix double error_setg Fabiano Rosas
2026-04-23 19:19 ` [PULL 04/43] migration: make vmstate_save_state_v() static Fabiano Rosas
2026-04-23 19:19 ` [PULL 05/43] migration: make .post_save() a void function Fabiano Rosas
2026-04-23 19:19 ` [PULL 06/43] migration: vmstate_load_state(): add some newlines Fabiano Rosas
2026-04-23 19:19 ` [PULL 07/43] migration: vmstate_save/load_state(): refactor tracing errors Fabiano Rosas
2026-04-23 19:19 ` [PULL 08/43] migration: factor out vmstate_pre_save() from vmstate_save_state() Fabiano Rosas
2026-04-23 19:19 ` [PULL 09/43] migration: factor out vmstate_save_field() " Fabiano Rosas
2026-04-23 19:19 ` [PULL 10/43] migration: factor out vmstate_pre_load() from vmstate_load_state() Fabiano Rosas
2026-04-23 19:19 ` [PULL 11/43] migration: factor out vmstate_load_field() " Fabiano Rosas
2026-04-23 19:19 ` [PULL 12/43] migration: factor out vmstate_post_load() " Fabiano Rosas
2026-04-23 19:19 ` [PULL 13/43] migration: convert vmstate_subsection_save/load functions to bool Fabiano Rosas
2026-04-23 19:19 ` [PULL 14/43] migration: VMStateInfo: introduce new handlers with errp Fabiano Rosas
2026-04-23 19:19 ` [PULL 15/43] migration: introduce vmstate_load_vmsd() and vmstate_save_vmsd() Fabiano Rosas
2026-04-23 19:19 ` [PULL 16/43] migration/cpr: move to new migration APIs Fabiano Rosas
2026-04-23 19:19 ` [PULL 17/43] migration/savevm: " Fabiano Rosas
2026-04-23 19:19 ` [PULL 18/43] hw/s390x/css: drop use of .err_hint for vmstate Fabiano Rosas
2026-04-23 19:19 ` Fabiano Rosas [this message]
2026-04-23 19:19 ` [PULL 20/43] migration/vmstate-types: move to new migration APIs Fabiano Rosas
2026-04-23 19:19 ` [PULL 21/43] migration: Tweak description of migration property multifd-compression Fabiano Rosas
2026-04-23 19:19 ` [PULL 22/43] tests/qtest/migration: Add mapped-ram/postcopy validation test Fabiano Rosas
2026-04-23 19:19 ` [PULL 23/43] migration: fix QIOChannelFile leak on error in file_connect_outgoing Fabiano Rosas
2026-04-23 19:19 ` [PULL 24/43] vmstate: Pass in struct itself for VMSTATE_ARRAY_OF_POINTER Fabiano Rosas
2026-04-23 19:19 ` [PULL 25/43] vmstate: Pass in struct itself for VMSTATE_VARRAY_OF_POINTER_UINT32 Fabiano Rosas
2026-04-23 19:19 ` [PULL 26/43] vmstate: Do not set size for VMS_ARRAY_OF_POINTER Fabiano Rosas
2026-04-23 19:19 ` [PULL 27/43] vmstate: Update max_elems early and check field compressable once Fabiano Rosas
2026-04-23 19:19 ` [PULL 28/43] vmstate: Rename VMS_NULLPTR_MARKER to VMS_MARKER_PTR_NULL Fabiano Rosas
2026-04-23 19:19 ` [PULL 29/43] vmstate: Introduce vmstate_save_field_with_vmdesc() Fabiano Rosas
2026-04-23 19:19 ` [PULL 30/43] vmstate: Allow vmstate_info_nullptr to emit non-NULL markers Fabiano Rosas
2026-04-23 19:19 ` [PULL 31/43] vmstate: Implement load of ptr marker in vmstate core Fabiano Rosas
2026-04-23 19:19 ` [PULL 32/43] vmstate: Implement VMS_ARRAY_OF_POINTER_AUTO_ALLOC Fabiano Rosas
2026-04-23 19:19 ` [PULL 33/43] vmstate: Stop checking size for nullptr compression Fabiano Rosas
2026-04-23 19:19 ` [PULL 34/43] tests/unit/test-vmstate: add tests for VMS_ARRAY_OF_POINTER_AUTO_ALLOC Fabiano Rosas
2026-04-23 19:19 ` [PULL 35/43] migration: validate page_size in mapped-ram header before use Fabiano Rosas
2026-04-23 19:19 ` [PULL 36/43] io/channel: introduce qio_channel_pread{v, }_all{, _eof}() Fabiano Rosas
2026-04-23 19:19 ` [PULL 37/43] io/channel: introduce qio_channel_pwrite{v,}_all() Fabiano Rosas
2026-04-23 19:19 ` [PULL 38/43] migration/file: fix type mismatch and NULL deref in multifd_file_recv_data Fabiano Rosas
2026-04-23 19:19 ` [PULL 39/43] tests/unit: add pread/pwrite _all tests for io channel file Fabiano Rosas
2026-04-23 19:19 ` [PULL 40/43] tests/qtest/migration: fix fd leak in ufd_version_check Fabiano Rosas
2026-04-23 19:19 ` [PULL 41/43] migration/qemu-file: switch buffer_at functions to positioned I/O _all helpers Fabiano Rosas
2026-04-23 19:19 ` [PULL 42/43] migration/file: switch file_write_ramblock_iov to pwritev_all Fabiano Rosas
2026-04-23 19:19 ` [PULL 43/43] migration/qemu-file: drop incorrect const from qemu_get_buffer_at buf Fabiano Rosas
2026-04-25 16:58 ` [PULL 00/43] Migration patches for 2026-04-23 Stefan Hajnoczi
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=20260423191958.1440-20-farosas@suse.de \
--to=farosas@suse.de \
--cc=farman@linux.ibm.com \
--cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@yandex-team.ru \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.