diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-05-12 10:39:40 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-05-30 09:52:08 +0200 |
| commit | 6160ce208419e6e218db644433528aaa5d4f5024 (patch) | |
| tree | 0ec4a2d4ee86d8de4106bc4709c85a16e5ffcac0 /system/vl.c | |
| parent | 42cbccfcb0635257721aa6a0e55cb80e85756ecf (diff) | |
| download | focaccia-qemu-6160ce208419e6e218db644433528aaa5d4f5024.tar.gz focaccia-qemu-6160ce208419e6e218db644433528aaa5d4f5024.zip | |
hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE
The MachineClass::legacy_fw_cfg_order boolean was only used by the pc-q35-2.5 and pc-i440fx-2.5 machines, which got removed. Remove it along with: - FW_CFG_ORDER_OVERRIDE_* definitions - fw_cfg_set_order_override() - fw_cfg_reset_order_override() - fw_cfg_order[] - rom_set_order_override() - rom_reset_order_override() Simplify CLI and pc_vga_init() / pc_nic_init(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Message-ID: <20250512083948.39294-12-philmd@linaro.org> [thuth: Fix error from check_patch.pl wrt to an empty "for" loop] Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | system/vl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/system/vl.c b/system/vl.c index fd402b8ff8..3b7057e6c6 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1192,10 +1192,7 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp) return -1; } } - /* For legacy, keep user files in a specific global order. */ - fw_cfg_set_order_override(fw_cfg, FW_CFG_ORDER_OVERRIDE_USER); fw_cfg_add_file(fw_cfg, name, buf, size); - fw_cfg_reset_order_override(fw_cfg); return 0; } @@ -2745,7 +2742,6 @@ static void qemu_create_cli_devices(void) } /* init generic devices */ - rom_set_order_override(FW_CFG_ORDER_OVERRIDE_DEVICE); qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, &error_fatal); QTAILQ_FOREACH(opt, &device_opts, next) { @@ -2756,7 +2752,6 @@ static void qemu_create_cli_devices(void) assert(ret_data == NULL); /* error_fatal aborts */ loc_pop(&opt->loc); } - rom_reset_order_override(); } static bool qemu_machine_creation_done(Error **errp) |