From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNKrY-00021T-Jr for qemu-devel@nongnu.org; Tue, 11 Mar 2014 07:28:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNKrS-0002AC-Ke for qemu-devel@nongnu.org; Tue, 11 Mar 2014 07:28:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45880) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNKrS-0002A7-Cb for qemu-devel@nongnu.org; Tue, 11 Mar 2014 07:28:42 -0400 Date: Tue, 11 Mar 2014 13:28:39 +0200 From: "Michael S. Tsirkin" Message-ID: <20140311112839.GA18346@redhat.com> References: <1394388381-22813-1-git-send-email-mst@redhat.com> <531D7ECE.8080006@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <531D7ECE.8080006@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 1/3] loader: rename in_ram/has_mr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: jeff.nelson@redhat.com, lersek@redhat.com, qemu-devel@nongnu.org, Anthony Liguori , dgilbert@redhat.com On Mon, Mar 10, 2014 at 09:58:54AM +0100, Paolo Bonzini wrote: > Il 09/03/2014 19:06, Michael S. Tsirkin ha scritto: > >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 > >--- > > include/hw/loader.h | 2 +- > > hw/core/loader.c | 6 +++--- > > hw/i386/pc_piix.c | 2 +- > > hw/i386/pc_q35.c | 2 +- > > 4 files changed, 6 insertions(+), 6 deletions(-) > > > >diff --git a/include/hw/loader.h b/include/hw/loader.h > >index aaf08c3..3dc5b94 100644 > >--- a/include/hw/loader.h > >+++ b/include/hw/loader.h > >@@ -49,7 +49,7 @@ void pstrcpy_targphys(const char *name, > > hwaddr dest, int buf_size, > > 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, > > hwaddr addr, int32_t bootindex); > >diff --git a/hw/core/loader.c b/hw/core/loader.c > >index b323c0c..13e98d8 100644 > >--- a/hw/core/loader.c > >+++ b/hw/core/loader.c > >@@ -54,7 +54,7 @@ > > > > #include > > > >-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; > >diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > >index ae1699d..fb2d636 100644 > >--- a/hw/i386/pc_piix.c > >+++ b/hw/i386/pc_piix.c > >@@ -272,7 +272,7 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args) > > { > > pc_compat_1_7(args); > > has_pci_info = false; > >- rom_file_in_ram = false; > >+ rom_file_has_mr = false; > > has_acpi_build = false; > > } > > > >diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > >index a7f6260..eb55ae4 100644 > >--- a/hw/i386/pc_q35.c > >+++ b/hw/i386/pc_q35.c > >@@ -250,7 +250,7 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args) > > { > > pc_compat_1_7(args); > > has_pci_info = false; > >- rom_file_in_ram = false; > >+ rom_file_has_mr = false; > > has_acpi_build = false; > > } > > > > > > Series looks good, but please squash patch 3 into patch 2. > > Paolo done. Already merged so won't repost here.