| Message ID | 20200531173814.8734-8-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | Superseded |
| 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: 31 May 2020 18:38 > To: qemu-devel@nongnu.org > Cc: Andrew Jeffery <andrew@aj.id.au>; Helge Deller <deller@gmx.de>; Peter Maydell > <peter.maydell@linaro.org>; Richard Henderson <rth@twiddle.net>; Eduardo Habkost > <ehabkost@redhat.com>; Paul Durrant <paul@xen.org>; Hervé Poussineau <hpoussin@reactos.org>; Marcel > Apfelbaum <marcel.apfelbaum@gmail.com>; xen-devel@lists.xenproject.org; Paolo Bonzini > <pbonzini@redhat.com>; Stefano Stabellini <sstabellini@kernel.org>; Cédric Le Goater <clg@kaod.org>; > qemu-trivial@nongnu.org; Joel Stanley <joel@jms.id.au>; qemu-arm@nongnu.org; Michael S. Tsirkin > <mst@redhat.com>; Anthony Perard <anthony.perard@citrix.com>; qemu-ppc@nongnu.org; Philippe Mathieu- > Daudé <f4bug@amsat.org> > Subject: [PATCH 7/8] hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions > > IEC binary prefixes ease code review: the unit is explicit. > > 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..679d74e6a3 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; Not strictly necessary but could we retain the brackets please? Paul > } > memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, > &error_fatal); > -- > 2.21.3
On 6/1/20 9:26 AM, Paul Durrant wrote: >> -----Original Message----- >> From: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> On Behalf Of Philippe Mathieu-Daudé >> Sent: 31 May 2020 18:38 >> To: qemu-devel@nongnu.org >> Cc: Andrew Jeffery <andrew@aj.id.au>; Helge Deller <deller@gmx.de>; Peter Maydell >> <peter.maydell@linaro.org>; Richard Henderson <rth@twiddle.net>; Eduardo Habkost >> <ehabkost@redhat.com>; Paul Durrant <paul@xen.org>; Hervé Poussineau <hpoussin@reactos.org>; Marcel >> Apfelbaum <marcel.apfelbaum@gmail.com>; xen-devel@lists.xenproject.org; Paolo Bonzini >> <pbonzini@redhat.com>; Stefano Stabellini <sstabellini@kernel.org>; Cédric Le Goater <clg@kaod.org>; >> qemu-trivial@nongnu.org; Joel Stanley <joel@jms.id.au>; qemu-arm@nongnu.org; Michael S. Tsirkin >> <mst@redhat.com>; Anthony Perard <anthony.perard@citrix.com>; qemu-ppc@nongnu.org; Philippe Mathieu- >> Daudé <f4bug@amsat.org> >> Subject: [PATCH 7/8] hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions >> >> IEC binary prefixes ease code review: the unit is explicit. >> >> 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..679d74e6a3 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; > > Not strictly necessary but could we retain the brackets please? Sure. Laurent, if this can go via your trivial@ tree, can you do the change or you rather I resend the whole series? > > Paul > >> } >> memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, >> &error_fatal); >> -- >> 2.21.3 > > >
On 6/1/20 10:33 AM, Philippe Mathieu-Daudé wrote: > On 6/1/20 9:26 AM, Paul Durrant wrote: >>> -----Original Message----- >>> From: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> On Behalf Of Philippe Mathieu-Daudé >>> Sent: 31 May 2020 18:38 >>> To: qemu-devel@nongnu.org >>> Cc: Andrew Jeffery <andrew@aj.id.au>; Helge Deller <deller@gmx.de>; Peter Maydell >>> <peter.maydell@linaro.org>; Richard Henderson <rth@twiddle.net>; Eduardo Habkost >>> <ehabkost@redhat.com>; Paul Durrant <paul@xen.org>; Hervé Poussineau <hpoussin@reactos.org>; Marcel >>> Apfelbaum <marcel.apfelbaum@gmail.com>; xen-devel@lists.xenproject.org; Paolo Bonzini >>> <pbonzini@redhat.com>; Stefano Stabellini <sstabellini@kernel.org>; Cédric Le Goater <clg@kaod.org>; >>> qemu-trivial@nongnu.org; Joel Stanley <joel@jms.id.au>; qemu-arm@nongnu.org; Michael S. Tsirkin >>> <mst@redhat.com>; Anthony Perard <anthony.perard@citrix.com>; qemu-ppc@nongnu.org; Philippe Mathieu- >>> Daudé <f4bug@amsat.org> >>> Subject: [PATCH 7/8] hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions >>> >>> IEC binary prefixes ease code review: the unit is explicit. >>> >>> 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..679d74e6a3 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; >> >> Not strictly necessary but could we retain the brackets please? > > Sure. > > Laurent, if this can go via your trivial@ tree, can you do the change or > you rather I resend the whole series? I understood reading another thread that contributor should not overload maintainer, so I'll simply repost this as v2. https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg00066.html > >> >> Paul >> >>> } >>> memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, >>> &error_fatal); >>> -- >>> 2.21.3 >> >> >> >
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 82ece6b9e7..679d74e6a3 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);
IEC binary prefixes ease code review: the unit is explicit. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/i386/xen/xen-hvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)