| Message ID | 1457396623-27738-1-git-send-email-peter.maydell@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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>
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
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
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