Re: [Qemu-devel] [PATCH v3 1/3] loader: rename in_ram/has_mr

[Paolo Bonzini]

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 <address@hidden>
> ---
>  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 <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), "/address@hidden", 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), "/address@hidden", 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