From nobody Fri Mar 27 04:54:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1772659623; cv=none; d=zohomail.com; s=zohoarc; b=ECcNg2htjr7p8lPi9+I66eWdFhFoMqx6tkp67klTUUhgJFiO11k27CDXvyGfFO5DeBDNyhkHQSWw11WBZeyWffBuECemaVvuawF2G9AUjSAszj746d/KF9GnUeCHhZcOR4K4x1kMoG7qMqxv1gt4yPBYLvUx8uKzwitiRFy+ZiE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772659623; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2+r8N3ETSUrim8PedcZAmsSYgGQ1jO/Vw/eLNDq0igU=; b=BuETxVnufsarX2TEixmn5U7AKAgvS56SgObXMNaQmYySJcM7zs8Ueo3F4G132GdU4isU5seAJGi9HR6BaK8iQ3B7e6ymuHrhB8XFCu4sr7VW+o2AmOPJBTuApAfdv1Smo0NJM2PlkyAXoehjJAuTkY1pBImd4FU63BTPXMQrBkA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772659623944872.8099251495868; Wed, 4 Mar 2026 13:27:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxth7-0004p3-5E; Wed, 04 Mar 2026 16:23:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxtgm-0004mL-Kw; Wed, 04 Mar 2026 16:23:30 -0500 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vxtgj-0003Ve-4s; Wed, 04 Mar 2026 16:23:28 -0500 Received: from mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:bf1f:0:640:c739:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 9362FC01EB; Thu, 05 Mar 2026 00:23:20 +0300 (MSK) Received: from vsementsov-lin (unknown [2a02:6bf:8080:921::1:1b]) by mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 5NwBA90AmW20-jDmN2qrO; Thu, 05 Mar 2026 00:23:19 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1772659399; bh=2+r8N3ETSUrim8PedcZAmsSYgGQ1jO/Vw/eLNDq0igU=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=UWAka9Vkp0iZDW+jJ3Why98OHmn4jIvr1yshyuDMlsaOmWzFPoiIb3Gy1LOqoHmoL Alnt7n5lA0FKghCvUQNYiRrOFoShLyuJR4mxLgE1VbF6n1akbA4TzZOIGDr6yixdvB 3iwv4FwXHQCvMMZ7GsztXiYkxQWzqedp1SFpO1jg= Authentication-Results: mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: farosas@suse.de, vsementsov@yandex-team.ru, qemu-devel@nongnu.org, John Snow , Kevin Wolf , Hanna Reitz , Gerd Hoffmann , "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , Dmitry Fleytman , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Mark Cave-Ayland , Gautam Menghani , Glenn Miles , Nicholas Piggin , Harsh Prateek Bora , Stefan Weil , Halil Pasic , Christian Borntraeger , Eric Farman , Farhan Ali , Matthew Rosato , Ilya Leoshkevich , David Hildenbrand , Thomas Huth , Chinmay Rath , qemu-block@nongnu.org (open list:Floppy), qemu-ppc@nongnu.org (open list:XIVE), qemu-s390x@nongnu.org (open list:S390 channel subs...) Subject: [PATCH v3 17/18] migration: drop VMStateField.err_hint Date: Thu, 5 Mar 2026 00:23:01 +0300 Message-ID: <20260304212303.667141-18-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260304212303.667141-1-vsementsov@yandex-team.ru> References: <20260304212303.667141-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1772659626924139100 Content-Type: text/plain; charset="utf-8" The field is unused, all users of VMSTATE_*_EQUAL pass _err_hint=3DNULL. Signed-off-by: Vladimir Sementsov-Ogievskiy Acked-by: Eric Farman # s390 Reviewed-by: Akihiko Odaki Reviewed-by: Peter Xu --- 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 4585640af92..2c1681b7d0a 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1051,7 +1051,7 @@ const VMStateDescription vmstate_fdc =3D { 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 0551b38230b..a63b70f4ebc 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -2442,12 +2442,12 @@ static const VMStateDescription qxl_vmstate =3D { 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 59a65cbbff5..f936f47ad22 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -2160,7 +2160,7 @@ const VMStateDescription vmstate_vga_common =3D { VMSTATE_BUFFER(palette, VGACommonState), =20 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 643e91ca2a7..9aeeef16410 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1211,7 +1211,7 @@ static const VMStateDescription vmstate_virtio_gpu_sc= anouts =3D { .fields =3D (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 ea7a9fca04e..d97a60cdf75 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -1209,7 +1209,7 @@ static const VMStateDescription vmstate_vmware_vga_in= ternal =3D { .minimum_version_id =3D 0, .post_load =3D vmsvga_post_load, .fields =3D (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 c1aeeca0c9a..417c3aecb92 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -278,7 +278,7 @@ static const VMStateDescription vmstate_vmmouse =3D { .minimum_version_id =3D 0, .post_load =3D vmmouse_post_load, .fields =3D (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 08f51c8e361..c2b4432b947 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1795,7 +1795,7 @@ const VMStateDescription vmstate_ahci =3D { 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 cd353a04f53..99d2a1e65ec 100644 --- a/hw/intc/openpic.c +++ b/hw/intc/openpic.c @@ -1477,7 +1477,7 @@ static const VMStateDescription vmstate_openpic =3D { 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 76ab476f59a..c30dace4e25 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -578,7 +578,7 @@ static const VMStateDescription vmstate_spapr_xive =3D { .pre_save =3D vmstate_spapr_xive_pre_save, .post_load =3D NULL, /* handled at the machine level */ .fields =3D (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 1d40c4386d1..c0a252d0519 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -668,7 +668,7 @@ static const VMStateDescription vmstate_ics =3D { .post_load =3D ics_post_load, .fields =3D (const VMStateField[]) { /* Sanity check */ - VMSTATE_UINT32_EQUAL(nr_irqs, ICSState, NULL), + VMSTATE_UINT32_EQUAL(nr_irqs, ICSState), =20 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 d702b58bd0a..f473e6ac77e 100644 --- a/hw/intc/xive.c +++ b/hw/intc/xive.c @@ -1565,7 +1565,7 @@ static const VMStateDescription vmstate_xive_source = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (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 a8fd60a8fb5..73b3d248d44 100644 --- a/hw/nvram/eeprom93xx.c +++ b/hw/nvram/eeprom93xx.c @@ -144,7 +144,7 @@ static const VMStateDescription vmstate_eeprom =3D { 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 90d6d71efdc..8868d6ad387 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -106,7 +106,7 @@ static const VMStateDescription vmstate_pcibus =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (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 2c85a78fcde..22497b1fd65 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -820,7 +820,7 @@ const VMStateDescription vmstate_pcie_aer_log =3D { .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { VMSTATE_UINT16(log_num, PCIEAERLog), - VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog, NULL), + VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog), VMSTATE_VALIDATE("log_num <=3D log_max", pcie_aer_state_log_num_va= lid), 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 c2432a0c00c..e6264b07854 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -285,7 +285,7 @@ static const VMStateDescription vmstate_spapr_tce_table= =3D { .post_load =3D spapr_tce_table_post_load, .fields =3D (const VMStateField []) { /* Sanity check */ - VMSTATE_UINT32_EQUAL(liobn, SpaprTceTable, NULL), + VMSTATE_UINT32_EQUAL(liobn, SpaprTceTable), =20 /* IOMMU state */ VMSTATE_UINT32(mig_nb_table, SpaprTceTable), diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 1dc3b02659f..c1d4b7806e4 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -2051,7 +2051,7 @@ static const VMStateDescription vmstate_spapr_pci_lsi= =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (const VMStateField[]) { - VMSTATE_UINT32_EQUAL(irq, SpaprPciLsi, NULL), + VMSTATE_UINT32_EQUAL(irq, SpaprPciLsi), =20 VMSTATE_END_OF_LIST() }, @@ -2129,7 +2129,7 @@ static const VMStateDescription vmstate_spapr_pci =3D= { .post_save =3D spapr_pci_post_save, .post_load =3D spapr_pci_post_load, .fields =3D (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 501e82a7665..3f05081bada 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -609,8 +609,8 @@ const VMStateDescription vmstate_spapr_vio =3D { .minimum_version_id =3D 1, .fields =3D (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), =20 /* General VIO device state */ VMSTATE_UINT64(signal_state, SpaprVioDevice), diff --git a/hw/s390x/css.c b/hw/s390x/css.c index df5f0bc27f1..ecd28fed5c3 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -199,15 +199,15 @@ const VMStateDescription vmstate_subch_dev =3D { .post_load =3D subch_dev_post_load, .pre_save =3D subch_dev_pre_save, .fields =3D (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 b2224c7f766..a7b9fe13175 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -364,7 +364,7 @@ static const VMStateDescription vmstate_uhci =3D { .post_load =3D uhci_post_load, .fields =3D (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 3c1d84f2d67..ca702765020 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -182,7 +182,6 @@ typedef enum { =20 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; } =20 #define VMSTATE_SINGLE_FULL(_field, _state, _test, _version, _info, \ - _type, _err_hint) { \ + _type) { \ .name =3D (stringify(_field)), \ - .err_hint =3D (_err_hint), \ .version_id =3D (_version), \ .field_exists =3D (_test), \ .size =3D sizeof(_type), \ @@ -1012,35 +1010,35 @@ extern const VMStateInfo vmstate_info_qlist; =20 #endif =20 -#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) =20 -#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) =20 -#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) =20 -#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) =20 -#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) =20 -#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) =20 -#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) =20 -#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) =20 #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 89cb2114721..033a2685c8f 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 " !=3D %" PRIx32, *v, v2); - if (field->err_hint) { - error_printf("%s\n", field->err_hint); - } return -EINVAL; } =20 @@ -280,9 +277,6 @@ static int get_uint32_equal(QEMUFile *f, void *pv, size= _t size, return 0; } error_report("%" PRIx32 " !=3D %" PRIx32, *v, v2); - if (field->err_hint) { - error_printf("%s\n", field->err_hint); - } return -EINVAL; } =20 @@ -391,9 +385,6 @@ static int get_uint64_equal(QEMUFile *f, void *pv, size= _t size, return 0; } error_report("%" PRIx64 " !=3D %" PRIx64, *v, v2); - if (field->err_hint) { - error_printf("%s\n", field->err_hint); - } return -EINVAL; } =20 @@ -417,9 +408,6 @@ static int get_uint8_equal(QEMUFile *f, void *pv, size_= t size, return 0; } error_report("%x !=3D %x", *v, v2); - if (field->err_hint) { - error_printf("%s\n", field->err_hint); - } return -EINVAL; } =20 @@ -443,9 +431,6 @@ static int get_uint16_equal(QEMUFile *f, void *pv, size= _t size, return 0; } error_report("%x !=3D %x", *v, v2); - if (field->err_hint) { - error_printf("%s\n", field->err_hint); - } return -EINVAL; } =20 diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 49cfdc6d674..9eae0ff647d 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -564,7 +564,7 @@ static const VMStateDescription vmstate_tlb6xx =3D { .minimum_version_id =3D 1, .needed =3D tlb6xx_needed, .fields =3D (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 =3D { .minimum_version_id =3D 1, .needed =3D tlbemb_needed, .fields =3D (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 =3D { .minimum_version_id =3D 1, .needed =3D tlbmas_needed, .fields =3D (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, --=20 2.52.0