From nobody Sat Apr 27 12:38:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642502827036438.1771344070812; Tue, 18 Jan 2022 02:47:07 -0800 (PST) Received: from localhost ([::1]:45354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9m13-0007RL-Ui for importer@patchew.org; Tue, 18 Jan 2022 05:47:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9lz0-0005Dq-I3 for qemu-devel@nongnu.org; Tue, 18 Jan 2022 05:44:58 -0500 Received: from [2a00:1450:4864:20::330] (port=39763 helo=mail-wm1-x330.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n9lyi-0001yk-Iq for qemu-devel@nongnu.org; Tue, 18 Jan 2022 05:44:57 -0500 Received: by mail-wm1-x330.google.com with SMTP id d18-20020a05600c251200b0034974323cfaso4638781wma.4 for ; Tue, 18 Jan 2022 02:44:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v13sm18778694wro.90.2022.01.18.02.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 02:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=12vMxq55Y3U+9+h1tBchFHOl0I3ELQYNeTIBQgT3/8Y=; b=jUSbMBc5WUYM3OncjdWaj8yAus+4QqFETImuc1Z0F78OwZEACuPoHaCa047WwI0vxu neyQmKzndxwM6OPFCtYQMqLVxeHh/kfJibG3/zH4HBSfRPUYY4hilcAdes5lkvGd3eTh o+ESSYjxIsBLqdgpurddO/xy7oNErVNQqWVhlqFizcIVveLCiU28mHNXVgLTUaQ8IIY3 6egYy7aOY+8XkbFbClVM9iVxIhJRkSEVzcOPOFUZkUK94e3mRzuLgsJnLcwtilzje9JY Sh+SvgipmdVZq+A5rDiyVGS02aLoYq37ruYPt/AJAlinGTTlPircSAsyTPTzMYG0pyD1 YQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=12vMxq55Y3U+9+h1tBchFHOl0I3ELQYNeTIBQgT3/8Y=; b=rA+TH6/A5cBYk4mTPRja7b4IUCglhlWoIejFfAx33uoK4JypHVNFazoBBjVWEXFm2R gROnWAvgS/fjKv1FTHFRYwiWOnXeCmb+U7fT+WeDO0pi2WHFbKVMtu9hU13P39QS5mFp PBTjKrdD5q3LeclGfgUxs+F9pNp3ReKbwPlF04K5xIkYsnw1U80oxLeC2TaVXL1b/LYx 5zgMTHQVdchjtk+Hw4QXo3SqAN+Qpl+lA7V3e5c/DyMtBr4vAokWidmAG1q9g4KeNpmU QLW/On/3Ck9i7qd0ZSFumvMtugeluDLmwwXnzHUfQ5IPWnEeiUHX7UEZY+gUkPrgRkS6 r6Qg== X-Gm-Message-State: AOAM533+C7SNigs0KHk2rsTIEhSgl0Mkqt2kY+xzNmEjU8LXM50lCjV3 CSYtLu6nmtlhns8gVSG/1A6TYBlWyqQXWQ== X-Google-Smtp-Source: ABdhPJyKCgNpCcDo7TSF3RzCp9LnNDdTeUlDqduu/YAdSJAAhpYzS0oIUk22PxAFo26IOdpxX64Y3A== X-Received: by 2002:adf:fb42:: with SMTP id c2mr22723042wrs.168.1642502676933; Tue, 18 Jan 2022 02:44:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH] Remove unnecessary minimum_version_id_old fields Date: Tue, 18 Jan 2022 10:44:34 +0000 Message-Id: <20220118104434.4117879-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::330 (failed) 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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr . David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642502828667100001 Content-Type: text/plain; charset="utf-8" The migration code will not look at a VMStateDescription's minimum_version_id_old field unless that VMSD has set the load_state_old field to something non-NULL. (The purpose of minimum_version_id_old is to specify what migration version is needed for the code in the function pointed to by load_state_old to be able to handle it on incoming migration.) We have exactly one VMSD which still has a load_state_old, in the PPC CPU; every other VMSD which sets minimum_version_id_old is doing so unnecessarily. Delete all the unnecessary ones. Commit created with: sed -i '/\.minimum_version_id_old/d' $(git grep -l '\.minimum_version_id_= old') with the one legitimate use then hand-edited back in. Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- hw/acpi/cpu.c | 2 -- hw/acpi/ich9.c | 3 --- hw/acpi/memory_hotplug.c | 2 -- hw/acpi/piix4.c | 2 -- hw/acpi/tco.c | 1 - hw/audio/pcspk.c | 1 - hw/display/macfb.c | 1 - hw/dma/xlnx-zdma.c | 1 - hw/dma/xlnx_csu_dma.c | 1 - hw/gpio/imx_gpio.c | 1 - hw/misc/bcm2835_mbox.c | 1 - hw/net/can/can_kvaser_pci.c | 1 - hw/net/can/can_mioe3680_pci.c | 1 - hw/net/can/can_pcm3680_pci.c | 1 - hw/net/can/can_sja1000.c | 2 -- hw/net/can/ctucan_core.c | 2 -- hw/net/can/ctucan_pci.c | 1 - hw/ppc/ppc.c | 1 - hw/scsi/megasas.c | 1 - hw/scsi/mptsas.c | 1 - hw/virtio/virtio-mmio.c | 1 - hw/virtio/virtio-pci.c | 1 - hw/virtio/virtio.c | 1 - target/openrisc/machine.c | 1 - target/ppc/machine.c | 1 - target/sparc/machine.c | 4 ---- 26 files changed, 36 deletions(-) diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index b20903ea303..3646dbfe68a 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -297,7 +297,6 @@ static const VMStateDescription vmstate_cpuhp_sts =3D { .name =3D "CPU hotplug device state", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_BOOL(is_inserting, AcpiCpuStatus), VMSTATE_BOOL(is_removing, AcpiCpuStatus), @@ -311,7 +310,6 @@ const VMStateDescription vmstate_cpu_hotplug =3D { .name =3D "CPU hotplug state", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(selector, CPUHotplugState), VMSTATE_UINT8(command, CPUHotplugState), diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index ebe08ed831f..bd9bbade705 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -163,7 +163,6 @@ static const VMStateDescription vmstate_memhp_state =3D= { .name =3D "ich9_pm/memhp", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D vmstate_test_use_memhp, .fields =3D (VMStateField[]) { VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, ICH9LPCPMRegs), @@ -181,7 +180,6 @@ static const VMStateDescription vmstate_tco_io_state = =3D { .name =3D "ich9_pm/tco", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D vmstate_test_use_tco, .fields =3D (VMStateField[]) { VMSTATE_STRUCT(tco_regs, ICH9LPCPMRegs, 1, vmstate_tco_io_sts, @@ -208,7 +206,6 @@ static const VMStateDescription vmstate_cpuhp_state =3D= { .name =3D "ich9_pm/cpuhp", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D vmstate_test_use_cpuhp, .pre_load =3D vmstate_cpuhp_pre_load, .fields =3D (VMStateField[]) { diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index d0fffcf7870..a581a2183b2 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -318,7 +318,6 @@ static const VMStateDescription vmstate_memhp_sts =3D { .name =3D "memory hotplug device state", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_BOOL(is_enabled, MemStatus), VMSTATE_BOOL(is_inserting, MemStatus), @@ -332,7 +331,6 @@ const VMStateDescription vmstate_memory_hotplug =3D { .name =3D "memory hotplug state", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(selector, MemHotplugState), VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, MemHotplugState, dev_co= unt, diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index f0b5fac44a1..cc37fa34168 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -230,7 +230,6 @@ static const VMStateDescription vmstate_memhp_state =3D= { .name =3D "piix4_pm/memhp", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D vmstate_test_use_memhp, .fields =3D (VMStateField[]) { VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, PIIX4PMState), @@ -255,7 +254,6 @@ static const VMStateDescription vmstate_cpuhp_state =3D= { .name =3D "piix4_pm/cpuhp", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D vmstate_test_use_cpuhp, .pre_load =3D vmstate_cpuhp_pre_load, .fields =3D (VMStateField[]) { diff --git a/hw/acpi/tco.c b/hw/acpi/tco.c index cf1e68a5393..4783721e4e7 100644 --- a/hw/acpi/tco.c +++ b/hw/acpi/tco.c @@ -239,7 +239,6 @@ const VMStateDescription vmstate_tco_io_sts =3D { .name =3D "tco io device status", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT16(tco.rld, TCOIORegs), VMSTATE_UINT8(tco.din, TCOIORegs), diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index b056c05387c..dfc7ebca4e1 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -209,7 +209,6 @@ static const VMStateDescription vmstate_spk =3D { .name =3D "pcspk", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D migrate_needed, .fields =3D (VMStateField[]) { VMSTATE_UINT8(data_on, PCSpkState), diff --git a/hw/display/macfb.c b/hw/display/macfb.c index 4bd7c3ad6a5..2eeb80cc3f0 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -616,7 +616,6 @@ static const VMStateDescription vmstate_macfb =3D { .name =3D "macfb", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .post_load =3D macfb_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT8_ARRAY(color_palette, MacfbState, 256 * 3), diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index a5a92b4ff8c..4eb7f66e9f8 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -806,7 +806,6 @@ static const VMStateDescription vmstate_zdma =3D { .name =3D TYPE_XLNX_ZDMA, .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, XlnxZDMA, ZDMA_R_MAX), VMSTATE_UINT32(state, XlnxZDMA), diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c index 896bb3574dd..5b62a2f74f7 100644 --- a/hw/dma/xlnx_csu_dma.c +++ b/hw/dma/xlnx_csu_dma.c @@ -663,7 +663,6 @@ static const VMStateDescription vmstate_xlnx_csu_dma = =3D { .name =3D TYPE_XLNX_CSU_DMA, .version_id =3D 0, .minimum_version_id =3D 0, - .minimum_version_id_old =3D 0, .fields =3D (VMStateField[]) { VMSTATE_PTIMER(src_timer, XlnxCSUDMA), VMSTATE_UINT16(width, XlnxCSUDMA), diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index 7a591804a99..c7f98b7bb15 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -277,7 +277,6 @@ static const VMStateDescription vmstate_imx_gpio =3D { .name =3D TYPE_IMX_GPIO, .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(dr, IMXGPIOState), VMSTATE_UINT32(gdir, IMXGPIOState), diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c index 9f73cbd5e41..04e53c98282 100644 --- a/hw/misc/bcm2835_mbox.c +++ b/hw/misc/bcm2835_mbox.c @@ -271,7 +271,6 @@ static const VMStateDescription vmstate_bcm2835_mbox = =3D { .name =3D TYPE_BCM2835_MBOX, .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_BOOL_ARRAY(available, BCM2835MboxState, MBOX_CHAN_COUNT), VMSTATE_STRUCT_ARRAY(mbox, BCM2835MboxState, 2, 1, diff --git a/hw/net/can/can_kvaser_pci.c b/hw/net/can/can_kvaser_pci.c index 168b3a620d9..94b3a534f84 100644 --- a/hw/net/can/can_kvaser_pci.c +++ b/hw/net/can/can_kvaser_pci.c @@ -266,7 +266,6 @@ static const VMStateDescription vmstate_kvaser_pci =3D { .name =3D "kvaser_pci", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, KvaserPCIState), /* Load this before sja_state. */ diff --git a/hw/net/can/can_mioe3680_pci.c b/hw/net/can/can_mioe3680_pci.c index 7a79e2605ae..29dc696f7c8 100644 --- a/hw/net/can/can_mioe3680_pci.c +++ b/hw/net/can/can_mioe3680_pci.c @@ -203,7 +203,6 @@ static const VMStateDescription vmstate_mioe3680_pci = =3D { .name =3D "mioe3680_pci", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, Mioe3680PCIState), VMSTATE_STRUCT(sja_state[0], Mioe3680PCIState, 0, vmstate_can_sja, diff --git a/hw/net/can/can_pcm3680_pci.c b/hw/net/can/can_pcm3680_pci.c index 8ef4e74af02..e8e57f4f33e 100644 --- a/hw/net/can/can_pcm3680_pci.c +++ b/hw/net/can/can_pcm3680_pci.c @@ -204,7 +204,6 @@ static const VMStateDescription vmstate_pcm3680i_pci = =3D { .name =3D "pcm3680i_pci", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, Pcm3680iPCIState), VMSTATE_STRUCT(sja_state[0], Pcm3680iPCIState, 0, diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c index 34eea684ced..3ba803e947d 100644 --- a/hw/net/can/can_sja1000.c +++ b/hw/net/can/can_sja1000.c @@ -928,7 +928,6 @@ const VMStateDescription vmstate_qemu_can_filter =3D { .name =3D "qemu_can_filter", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(can_id, qemu_can_filter), VMSTATE_UINT32(can_mask, qemu_can_filter), @@ -952,7 +951,6 @@ const VMStateDescription vmstate_can_sja =3D { .name =3D "can_sja", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .post_load =3D can_sja_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT8(mode, CanSJA1000State), diff --git a/hw/net/can/ctucan_core.c b/hw/net/can/ctucan_core.c index d171c372e00..f2c3b6a7061 100644 --- a/hw/net/can/ctucan_core.c +++ b/hw/net/can/ctucan_core.c @@ -617,7 +617,6 @@ const VMStateDescription vmstate_qemu_ctucan_tx_buffer = =3D { .name =3D "qemu_ctucan_tx_buffer", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT8_ARRAY(data, CtuCanCoreMsgBuffer, CTUCAN_CORE_MSG_MAX= _LEN), VMSTATE_END_OF_LIST() @@ -636,7 +635,6 @@ const VMStateDescription vmstate_ctucan =3D { .name =3D "ctucan", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .post_load =3D ctucan_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINT32(mode_settings.u32, CtuCanCoreState), diff --git a/hw/net/can/ctucan_pci.c b/hw/net/can/ctucan_pci.c index f1c86cd06a7..50f4ea6cd63 100644 --- a/hw/net/can/ctucan_pci.c +++ b/hw/net/can/ctucan_pci.c @@ -215,7 +215,6 @@ static const VMStateDescription vmstate_ctucan_pci =3D { .name =3D "ctucan_pci", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, CtuCanPCIState), VMSTATE_STRUCT(ctucan_state[0], CtuCanPCIState, 0, vmstate_ctucan, diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index bb5bee9a338..462c87dba8b 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -1049,7 +1049,6 @@ const VMStateDescription vmstate_ppc_timebase =3D { .name =3D "timebase", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .pre_save =3D timebase_pre_save, .fields =3D (VMStateField []) { VMSTATE_UINT64(guest_timebase, PPCTimebase), diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dc9bbdb740e..1a72e52396a 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2293,7 +2293,6 @@ static const VMStateDescription vmstate_megasas_gen2 = =3D { .name =3D "megasas-gen2", .version_id =3D 0, .minimum_version_id =3D 0, - .minimum_version_id_old =3D 0, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, MegasasState), VMSTATE_MSIX(parent_obj, MegasasState), diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 5181b0c0b0d..706cf0df3a1 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -1363,7 +1363,6 @@ static const VMStateDescription vmstate_mptsas =3D { .name =3D "mptsas", .version_id =3D 0, .minimum_version_id =3D 0, - .minimum_version_id_old =3D 0, .post_load =3D mptsas_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(dev, MPTSASState), diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 72da12fea59..688eccda94d 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -592,7 +592,6 @@ static const VMStateDescription vmstate_virtio_mmio =3D= { .name =3D "virtio_mmio", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_END_OF_LIST() }, diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 750aa47ec14..f9cf9592fdf 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -131,7 +131,6 @@ static const VMStateDescription vmstate_virtio_pci =3D { .name =3D "virtio_pci", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_END_OF_LIST() }, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index aae72fb8b73..9e8f51dfb03 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2808,7 +2808,6 @@ static const VMStateDescription vmstate_virtio =3D { .name =3D "virtio", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_END_OF_LIST() }, diff --git a/target/openrisc/machine.c b/target/openrisc/machine.c index 6239725c4f5..b7d73886401 100644 --- a/target/openrisc/machine.c +++ b/target/openrisc/machine.c @@ -25,7 +25,6 @@ static const VMStateDescription vmstate_tlb_entry =3D { .name =3D "tlb_entry", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINTTL(mr, OpenRISCTLBEntry), VMSTATE_UINTTL(tr, OpenRISCTLBEntry), diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 756d8de5d8d..a46aa96e9d8 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -532,7 +532,6 @@ static const VMStateDescription vmstate_tm =3D { .name =3D "cpu/tm", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .needed =3D tm_needed, .fields =3D (VMStateField []) { VMSTATE_UINTTL_ARRAY(env.tm_gpr, PowerPCCPU, 32), diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 917375c3a17..44b9e7d75d6 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -10,7 +10,6 @@ static const VMStateDescription vmstate_cpu_timer =3D { .name =3D "cpu_timer", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT32(frequency, CPUTimer), VMSTATE_UINT32(disabled, CPUTimer), @@ -30,7 +29,6 @@ static const VMStateDescription vmstate_trap_state =3D { .name =3D "trap_state", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT64(tpc, trap_state), VMSTATE_UINT64(tnpc, trap_state), @@ -44,7 +42,6 @@ static const VMStateDescription vmstate_tlb_entry =3D { .name =3D "tlb_entry", .version_id =3D 1, .minimum_version_id =3D 1, - .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_UINT64(tag, SparcTLBEntry), VMSTATE_UINT64(tte, SparcTLBEntry), @@ -113,7 +110,6 @@ const VMStateDescription vmstate_sparc_cpu =3D { .name =3D "cpu", .version_id =3D SPARC_VMSTATE_VER, .minimum_version_id =3D SPARC_VMSTATE_VER, - .minimum_version_id_old =3D SPARC_VMSTATE_VER, .pre_save =3D cpu_pre_save, .fields =3D (VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gregs, SPARCCPU, 8), --=20 2.25.1