diff options
| author | Gerd Hoffmann | 2016-04-07 16:12:58 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2016-04-07 18:57:33 +0200 |
| commit | bab47d9a75a33de747420e6b74fd157b708c890b (patch) | |
| tree | b0fc9ff72b93c3c07effe43a59b83b3ab4ce8dbe /hw/i386/pc_piix.c | |
| parent | xen: piix reuse pci generic class init function (diff) | |
| download | qemu-bab47d9a75a33de747420e6b74fd157b708c890b.tar.gz qemu-bab47d9a75a33de747420e6b74fd157b708c890b.tar.xz qemu-bab47d9a75a33de747420e6b74fd157b708c890b.zip | |
Sort the fw_cfg file list
Entries are inserted in filename order instead of being
appended to the end in case sorting is enabled.
This will avoid any future issues of moving the file creation
around, it doesn't matter what order they are created now,
the will always be in filename order.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Added machine type handling for compatibility. This was
a fairly complex change, this will preserve the order of fw_cfg
for older versions no matter what order the firmware files
actually come in. A list is kept of the correct legacy order
and the entries will be inserted based upon their order in
the list. Except that some entries are ordered (in a specific
area of the list) based upon what order they appear on the
command line. Special handling is added for those entries.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6a69b23abc..7f50116bc7 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -434,6 +434,7 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) m->alias = NULL; m->is_default = 0; pcmc->save_tsc_khz = false; + m->legacy_fw_cfg_order = 1; SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); } |