| Message ID | 20200601142930.29408-8-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw: Fix some incomplete memory region size | expand |
> -----Original Message----- > From: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> On Behalf Of Philippe Mathieu-Daudé > Sent: 01 June 2020 15:29 > To: qemu-devel@nongnu.org > Cc: xen-devel@lists.xenproject.org; Anthony Perard <anthony.perard@citrix.com>; Paolo Bonzini > <pbonzini@redhat.com>; Hervé Poussineau <hpoussin@reactos.org>; Helge Deller <deller@gmx.de>; qemu- > arm@nongnu.org; Marcel Apfelbaum <marcel.apfelbaum@gmail.com>; Stefano Stabellini > <sstabellini@kernel.org>; Michael S. Tsirkin <mst@redhat.com>; Eduardo Habkost <ehabkost@redhat.com>; > Paul Durrant <paul@xen.org>; Andrew Jeffery <andrew@aj.id.au>; qemu-trivial@nongnu.org; Peter Maydell > <peter.maydell@linaro.org>; Joel Stanley <joel@jms.id.au>; Cédric Le Goater <clg@kaod.org>; qemu- > ppc@nongnu.org; Richard Henderson <rth@twiddle.net>; Philippe Mathieu-Daudé <f4bug@amsat.org> > Subject: [PATCH v2 7/8] hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions > > IEC binary prefixes ease code review: the unit is explicit. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Paul Durrant <paul@xen.org> > --- > hw/i386/xen/xen-hvm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index 82ece6b9e7..94fe5d65e9 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -9,6 +9,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > > #include "cpu.h" > #include "hw/pci/pci.h" > @@ -230,7 +231,7 @@ static void xen_ram_init(PCMachineState *pcms, > * Xen does not allocate the memory continuously, it keeps a > * hole of the size computed above or passed in. > */ > - block_len = (1ULL << 32) + x86ms->above_4g_mem_size; > + block_len = (4 * GiB) + x86ms->above_4g_mem_size; > } > memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, > &error_fatal); > -- > 2.21.3
On 6/1/20 7:29 AM, Philippe Mathieu-Daudé wrote: > IEC binary prefixes ease code review: the unit is explicit. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/i386/xen/xen-hvm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Le 01/06/2020 à 16:29, Philippe Mathieu-Daudé a écrit : > IEC binary prefixes ease code review: the unit is explicit. > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/i386/xen/xen-hvm.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index 82ece6b9e7..94fe5d65e9 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -9,6 +9,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/units.h" > > #include "cpu.h" > #include "hw/pci/pci.h" > @@ -230,7 +231,7 @@ static void xen_ram_init(PCMachineState *pcms, > * Xen does not allocate the memory continuously, it keeps a > * hole of the size computed above or passed in. > */ > - block_len = (1ULL << 32) + x86ms->above_4g_mem_size; > + block_len = (4 * GiB) + x86ms->above_4g_mem_size; > } > memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, > &error_fatal); > Applied to my trivial-patches branch. Thanks, Laurent
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 82ece6b9e7..94fe5d65e9 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "hw/pci/pci.h" @@ -230,7 +231,7 @@ static void xen_ram_init(PCMachineState *pcms, * Xen does not allocate the memory continuously, it keeps a * hole of the size computed above or passed in. */ - block_len = (1ULL << 32) + x86ms->above_4g_mem_size; + block_len = (4 * GiB) + x86ms->above_4g_mem_size; } memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, &error_fatal);