@samitouri / QOSamiQemu / commits / 1a893d5a5c

hw/s390x/css: drop use of .err_hint for vmstate

That's the only usage through the whole base. Doesn't worth keeping the whole complexity. And 2.7 machines were long ago. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru> Reviewed-by: Eric Farman <farman@linux.ibm.com> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260304212303.667141-17-vsementsov@yandex-team.ru Signed-off-by: Fabiano Rosas <farosas@suse.de>

Vladimir Sementsov-Ogievskiy committed Mar 5, 2026 at 00:23 UTC 1a893d5a5cc2f4ddf07b227becfa5b46526a6a49
1 file changed +8 -7
hw/s390x/css.c
+8 -7
@@ -192,10 +192,6 @@ static const VMStateDescription vmstate_schdev_orb = {
192 static int subch_dev_post_load(void *opaque, int version_id);
193 static int subch_dev_pre_save(void *opaque);
194
195 -const char err_hint_devno[] = "Devno mismatch, tried to load wrong section!"
196 - " Likely reason: some sequences of plug and unplug can break"
197 - " migration for machine versions prior to 2.7 (known design flaw).";
198 -
195 const VMStateDescription vmstate_subch_dev = {
196 .name = "s390_subch_dev",
197 .version_id = 1,
@@ -203,10 +199,15 @@ const VMStateDescription vmstate_subch_dev = {
199 .post_load = subch_dev_post_load,
200 .pre_save = subch_dev_pre_save,
201 .fields = (const VMStateField[]) {
206 - VMSTATE_UINT8_EQUAL(cssid, SubchDev, "Bug!"),
207 - VMSTATE_UINT8_EQUAL(ssid, SubchDev, "Bug!"),
202 + VMSTATE_UINT8_EQUAL(cssid, SubchDev, NULL),
203 + VMSTATE_UINT8_EQUAL(ssid, SubchDev, NULL),
204 VMSTATE_UINT16(migrated_schid, SubchDev),
209 - VMSTATE_UINT16_EQUAL(devno, SubchDev, err_hint_devno),
205 + /*
206 + * If devno mismatch on target, it may be due to some
207 + * sequences of plug and unplug breaks migration for
208 + * machine versions prior to 2.7 (known design flaw).
209 + */
210 + VMSTATE_UINT16_EQUAL(devno, SubchDev, NULL),
211 VMSTATE_BOOL(thinint_active, SubchDev),
212 VMSTATE_STRUCT(curr_status, SubchDev, 0, vmstate_schib, SCHIB),
213 VMSTATE_UINT8_ARRAY(sense_data, SubchDev, 32),