qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro
@ 2016-03-08  0:23 Peter Maydell
  2016-03-08 23:14 ` Laszlo Ersek
  2016-03-09  9:34 ` Michael S. Tsirkin
  0 siblings, 2 replies; 4+ messages in thread
From: Peter Maydell @ 2016-03-08  0:23 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, Michael S. Tsirkin, Jens Wiklander, patches

From: Jens Wiklander <jens.wiklander@linaro.org>

Fix a typo in the load_image_mr() macro: 'mr' was written when
the parameter name is '_mr'. (This had no visible effects since
the single use of the macro used 'mr' as the argument.)

Fixes 76151cacfe956248a25b38b5e8429465584f47bb "loader: Add
load_image_mr() to load ROM image to a MemoryRegion"

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[PMM: tweaked commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Oops...

 include/hw/loader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/loader.h b/include/hw/loader.h
index 0ba7808..b3d1358 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -137,7 +137,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
 #define rom_add_blob_fixed(_f, _b, _l, _a)      \
     rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL)
 #define rom_add_file_mr(_f, _mr, _i)            \
-    rom_add_file(_f, NULL, 0, _i, false, mr)
+    rom_add_file(_f, NULL, 0, _i, false, _mr)
 
 #define PC_ROM_MIN_VGA     0xc0000
 #define PC_ROM_MIN_OPTION  0xc8000
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro
  2016-03-08  0:23 [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro Peter Maydell
@ 2016-03-08 23:14 ` Laszlo Ersek
  2016-03-09  9:34 ` Michael S. Tsirkin
  1 sibling, 0 replies; 4+ messages in thread
From: Laszlo Ersek @ 2016-03-08 23:14 UTC (permalink / raw)
  To: Peter Maydell, qemu-devel
  Cc: Paolo Bonzini, patches, Jens Wiklander, Michael S. Tsirkin

On 03/08/16 01:23, Peter Maydell wrote:
> From: Jens Wiklander <jens.wiklander@linaro.org>
> 
> Fix a typo in the load_image_mr() macro: 'mr' was written when
> the parameter name is '_mr'. (This had no visible effects since
> the single use of the macro used 'mr' as the argument.)
> 
> Fixes 76151cacfe956248a25b38b5e8429465584f47bb "loader: Add
> load_image_mr() to load ROM image to a MemoryRegion"
> 
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> [PMM: tweaked commit message]
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> Oops...
> 
>  include/hw/loader.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/loader.h b/include/hw/loader.h
> index 0ba7808..b3d1358 100644
> --- a/include/hw/loader.h
> +++ b/include/hw/loader.h
> @@ -137,7 +137,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
>  #define rom_add_blob_fixed(_f, _b, _l, _a)      \
>      rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL)
>  #define rom_add_file_mr(_f, _mr, _i)            \
> -    rom_add_file(_f, NULL, 0, _i, false, mr)
> +    rom_add_file(_f, NULL, 0, _i, false, _mr)
>  
>  #define PC_ROM_MIN_VGA     0xc0000
>  #define PC_ROM_MIN_OPTION  0xc8000
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro
  2016-03-08  0:23 [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro Peter Maydell
  2016-03-08 23:14 ` Laszlo Ersek
@ 2016-03-09  9:34 ` Michael S. Tsirkin
  2016-03-09  9:39   ` Peter Maydell
  1 sibling, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2016-03-09  9:34 UTC (permalink / raw)
  To: Peter Maydell; +Cc: Paolo Bonzini, Jens Wiklander, qemu-devel, patches

On Tue, Mar 08, 2016 at 12:23:43AM +0000, Peter Maydell wrote:
> From: Jens Wiklander <jens.wiklander@linaro.org>
> 
> Fix a typo in the load_image_mr() macro: 'mr' was written when
> the parameter name is '_mr'. (This had no visible effects since
> the single use of the macro used 'mr' as the argument.)
> 
> Fixes 76151cacfe956248a25b38b5e8429465584f47bb "loader: Add
> load_image_mr() to load ROM image to a MemoryRegion"
> 
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> [PMM: tweaked commit message]
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Peter, you are merging this, right?

> Oops...
> 
>  include/hw/loader.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/loader.h b/include/hw/loader.h
> index 0ba7808..b3d1358 100644
> --- a/include/hw/loader.h
> +++ b/include/hw/loader.h
> @@ -137,7 +137,7 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
>  #define rom_add_blob_fixed(_f, _b, _l, _a)      \
>      rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL)
>  #define rom_add_file_mr(_f, _mr, _i)            \
> -    rom_add_file(_f, NULL, 0, _i, false, mr)
> +    rom_add_file(_f, NULL, 0, _i, false, _mr)
>  
>  #define PC_ROM_MIN_VGA     0xc0000
>  #define PC_ROM_MIN_OPTION  0xc8000
> -- 
> 1.9.1

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro
  2016-03-09  9:34 ` Michael S. Tsirkin
@ 2016-03-09  9:39   ` Peter Maydell
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2016-03-09  9:39 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Paolo Bonzini, Jens Wiklander, QEMU Developers, Patch Tracking

On 9 March 2016 at 16:34, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Tue, Mar 08, 2016 at 12:23:43AM +0000, Peter Maydell wrote:
>> From: Jens Wiklander <jens.wiklander@linaro.org>
>>
>> Fix a typo in the load_image_mr() macro: 'mr' was written when
>> the parameter name is '_mr'. (This had no visible effects since
>> the single use of the macro used 'mr' as the argument.)
>>
>> Fixes 76151cacfe956248a25b38b5e8429465584f47bb "loader: Add
>> load_image_mr() to load ROM image to a MemoryRegion"
>>
>> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>> [PMM: tweaked commit message]
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
>
> Peter, you are merging this, right?

Yes, I'll put it in via target-arm.next.

thanks
-- PMM

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-09  9:39 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-08  0:23 [Qemu-devel] [PATCH] loader: Fix incorrect parameter name in load_image_mr() macro Peter Maydell
2016-03-08 23:14 ` Laszlo Ersek
2016-03-09  9:34 ` Michael S. Tsirkin
2016-03-09  9:39   ` Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).