ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loader: rename in_ram/has_mr 

we put copy of ROMs in MR for migration.
but the name rom_in_ram makes one think we
load it in guest RAM.
Rename has_mr to make intent clearer.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2014-03-09 18:42:06 +02:00
parent 220c8ed536
commit 98bc3ab0f2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/core/loader.c
View File

@ -54,7 +54,7 @@
#include <zlib.h> #include <zlib.h>
bool rom_file_in_ram = true; bool rom_file_has_mr = true;
static int roms_loaded; static int roms_loaded;
@ -694,7 +694,7 @@ int rom_add_file(const char *file, const char *fw_dir,
basename); basename);
snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name); snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name);
if (rom_file_in_ram) { if (rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath); data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else { } else {
data = rom->data; data = rom->data;
@ -738,7 +738,7 @@ void *rom_add_blob(const char *name, const void *blob, size_t len,
snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name); snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name);
if (rom_file_in_ram) { if (rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath); data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else { } else {
data = rom->data; data = rom->data;

2
hw/i386/pc_piix.c
View File

@ -272,7 +272,7 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args)
{ {
pc_compat_1_7(args); pc_compat_1_7(args);
has_pci_info = false; has_pci_info = false;
rom_file_in_ram = false; rom_file_has_mr = false;
has_acpi_build = false; has_acpi_build = false;
} }

2
hw/i386/pc_q35.c
View File

@ -250,7 +250,7 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args)
{ {
pc_compat_1_7(args); pc_compat_1_7(args);
has_pci_info = false; has_pci_info = false;
rom_file_in_ram = false; rom_file_has_mr = false;
has_acpi_build = false; has_acpi_build = false;
} }

2
include/hw/loader.h
View File

@ -49,7 +49,7 @@ void pstrcpy_targphys(const char *name,
hwaddr dest, int buf_size, hwaddr dest, int buf_size,
const char *source); const char *source);
extern bool rom_file_in_ram; extern bool rom_file_has_mr;
int rom_add_file(const char *file, const char *fw_dir, int rom_add_file(const char *file, const char *fw_dir,
hwaddr addr, int32_t bootindex); hwaddr addr, int32_t bootindex);