|
 |
0a122b |
From 478b5f940bb1898c2bdc8dce560f82da3b55e78f Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Michael S. Tsirkin <mst@redhat.com>
|
|
|
0a122b |
Date: Wed, 12 Mar 2014 07:00:11 +0100
|
|
|
0a122b |
Subject: [PATCH 09/16] loader: rename in_ram/has_mr
|
|
|
0a122b |
|
|
|
0a122b |
Message-id: <1394390868-24135-1-git-send-email-mst@redhat.com>
|
|
|
0a122b |
Patchwork-id: 58053
|
|
|
0a122b |
O-Subject: [PATCH qemu-kvm RHEL7.0 v3 1/2] loader: rename in_ram/has_mr
|
|
|
0a122b |
Bugzilla: 1064018
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
we put copy of ROMs in MR for migration.
|
|
|
0a122b |
but the name rom_in_ram makes one think we
|
|
|
0a122b |
load it in guest RAM.
|
|
|
0a122b |
Rename has_mr to make intent clearer.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Upstream: posted
|
|
|
0a122b |
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7173355
|
|
|
0a122b |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1064018#c6
|
|
|
0a122b |
Tested: by developer
|
|
|
0a122b |
---
|
|
|
0a122b |
include/hw/loader.h | 2 +-
|
|
|
0a122b |
hw/core/loader.c | 6 +++---
|
|
|
0a122b |
hw/i386/pc_piix.c | 2 +-
|
|
|
0a122b |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/core/loader.c | 6 +++---
|
|
|
0a122b |
hw/i386/pc_piix.c | 2 +-
|
|
|
0a122b |
include/hw/loader.h | 2 +-
|
|
|
0a122b |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/core/loader.c b/hw/core/loader.c
|
|
|
0a122b |
index 4e72e01..c363aef 100644
|
|
|
0a122b |
--- a/hw/core/loader.c
|
|
|
0a122b |
+++ b/hw/core/loader.c
|
|
|
0a122b |
@@ -54,7 +54,7 @@
|
|
|
0a122b |
|
|
|
0a122b |
#include <zlib.h>
|
|
|
0a122b |
|
|
|
0a122b |
-bool rom_file_in_ram = true;
|
|
|
0a122b |
+bool rom_file_has_mr = true;
|
|
|
0a122b |
|
|
|
0a122b |
static int roms_loaded;
|
|
|
0a122b |
|
|
|
0a122b |
@@ -642,7 +642,7 @@ int rom_add_file(const char *file, const char *fw_dir,
|
|
|
0a122b |
basename);
|
|
|
0a122b |
snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name);
|
|
|
0a122b |
|
|
|
0a122b |
- if (rom_file_in_ram) {
|
|
|
0a122b |
+ if (rom_file_has_mr) {
|
|
|
0a122b |
data = rom_set_mr(rom, devpath);
|
|
|
0a122b |
} else {
|
|
|
0a122b |
data = rom->data;
|
|
|
0a122b |
@@ -686,7 +686,7 @@ void *rom_add_blob(const char *name, const void *blob, size_t len,
|
|
|
0a122b |
|
|
|
0a122b |
snprintf(devpath, sizeof(devpath), "/rom@%s", fw_file_name);
|
|
|
0a122b |
|
|
|
0a122b |
- if (rom_file_in_ram) {
|
|
|
0a122b |
+ if (rom_file_has_mr) {
|
|
|
0a122b |
data = rom_set_mr(rom, devpath);
|
|
|
0a122b |
} else {
|
|
|
0a122b |
data = rom->data;
|
|
|
0a122b |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
0a122b |
index 6773fff..be68098 100644
|
|
|
0a122b |
--- a/hw/i386/pc_piix.c
|
|
|
0a122b |
+++ b/hw/i386/pc_piix.c
|
|
|
0a122b |
@@ -948,7 +948,7 @@ static void pc_compat_rhel650(QEMUMachineInitArgs *args)
|
|
|
0a122b |
|
|
|
0a122b |
disable_kvm_pv_unhalt();
|
|
|
0a122b |
|
|
|
0a122b |
- rom_file_in_ram = false;
|
|
|
0a122b |
+ rom_file_has_mr = false;
|
|
|
0a122b |
has_acpi_build = false;
|
|
|
0a122b |
gigabyte_align = false;
|
|
|
0a122b |
}
|
|
|
0a122b |
diff --git a/include/hw/loader.h b/include/hw/loader.h
|
|
|
0a122b |
index 50a017b..7ceccce 100644
|
|
|
0a122b |
--- a/include/hw/loader.h
|
|
|
0a122b |
+++ b/include/hw/loader.h
|
|
|
0a122b |
@@ -23,7 +23,7 @@ void pstrcpy_targphys(const char *name,
|
|
|
0a122b |
hwaddr dest, int buf_size,
|
|
|
0a122b |
const char *source);
|
|
|
0a122b |
|
|
|
0a122b |
-extern bool rom_file_in_ram;
|
|
|
0a122b |
+extern bool rom_file_has_mr;
|
|
|
0a122b |
|
|
|
0a122b |
int rom_add_file(const char *file, const char *fw_dir,
|
|
|
0a122b |
hwaddr addr, int32_t bootindex);
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|