summaryrefslogtreecommitdiffstats
path: root/hw/core
diff options
context:
space:
mode:
authorMichael S. Tsirkin2014-03-09 17:42:06 +0100
committerMichael S. Tsirkin2014-03-09 20:09:38 +0100
commit98bc3ab0f256cb983700089770db0823e59c7ceb (patch)
treeb79bb1825b24136253e55449a8719a012e6e8fa8 /hw/core
parentqemu: x86: ignore ioapic polarity (diff)
downloadqemu-98bc3ab0f256cb983700089770db0823e59c7ceb.tar.gz
qemu-98bc3ab0f256cb983700089770db0823e59c7ceb.tar.xz
qemu-98bc3ab0f256cb983700089770db0823e59c7ceb.zip
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>
Diffstat (limited to 'hw/core')
-rw-r--r--hw/core/loader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c
index b323c0c7b8..13e98d8dbb 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -54,7 +54,7 @@
#include <zlib.h>
-bool rom_file_in_ram = true;
+bool rom_file_has_mr = true;
static int roms_loaded;
@@ -694,7 +694,7 @@ int rom_add_file(const char *file, const char *fw_dir,
basename);
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);
} else {
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);
- if (rom_file_in_ram) {
+ if (rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else {
data = rom->data;