[PATCH v2 1/7] hw/nvram/fw_cfg: Remove acpi-mr-restore

The acpi-mr-restore property exists only for migration compatibility
with QEMU 4.2, which is no longer a supported migration source.

Signed-off-by: Akihiko Odaki <[email protected]>
---
 include/hw/nvram/fw_cfg.h | 1 -
 hw/core/machine.c         | 1 -
 hw/nvram/fw_cfg.c         | 8 +-------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 56f17a0bdcf7..6aad9aad7694 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -73,7 +73,6 @@ struct FWCfgState {
     MemoryRegion dma_iomem;
 
     /* restore during migration */
-    bool acpi_mr_restore;
     uint64_t table_mr_size;
     uint64_t linker_mr_size;
     uint64_t rsdp_mr_size;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 9a10e45aabd5..44803e884140 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -214,7 +214,6 @@ GlobalProperty hw_compat_4_2[] = {
     { "usb-redir", "suppress-remote-wake", "off" },
     { "qxl", "revision", "4" },
     { "qxl-vga", "revision", "4" },
-    { "fw_cfg", "acpi-mr-restore", "false" },
     { "virtio-device", "use-disabled-flag", "false" },
 };
 const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 1d7d83542137..f4e3e50224ca 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -612,7 +612,7 @@ static bool fw_cfg_acpi_mr_restore(void *opaque)
     mr_aligned = QEMU_IS_ALIGNED(s->table_mr_size, qemu_real_host_page_size()) &&
                  QEMU_IS_ALIGNED(s->linker_mr_size, qemu_real_host_page_size()) &&
                  QEMU_IS_ALIGNED(s->rsdp_mr_size, qemu_real_host_page_size());
-    return s->acpi_mr_restore && !mr_aligned;
+    return !mr_aligned;
 }
 
 static void fw_cfg_update_mr(FWCfgState *s, uint16_t key, size_t size)
@@ -987,10 +987,6 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data)
     qemu_register_reset(fw_cfg_machine_reset, s);
 }
 
-static const Property fw_cfg_properties[] = {
-    DEFINE_PROP_BOOL("acpi-mr-restore", FWCfgState, acpi_mr_restore, true),
-};
-
 static void fw_cfg_common_realize(DeviceState *dev, Error **errp)
 {
     FWCfgState *s = FW_CFG(dev);
@@ -1149,8 +1145,6 @@ static void fw_cfg_class_init(ObjectClass *klass, const void *data)
 
     device_class_set_legacy_reset(dc, fw_cfg_reset);
     dc->vmsd = &vmstate_fw_cfg;
-
-    device_class_set_props(dc, fw_cfg_properties);
 }
 
 static const TypeInfo fw_cfg_info = {

-- 
2.54.0