"Dr. David Alan Gilbert (git)" <dgilb...@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> Anthony reported that >4GB guests on Xen with 32bit QEMU
> broke after my 4ed023c (Round up RAMBlock sizes).
>
> In that patch I mask sizes against qemu_host_page_size/mask
> which are uintptr_t, and thus 32bit on a 32bit QEMU, even
> though the ram space might be bigger than 4GB on Xen.
>
> ram_addr_t is uintptr_t on KVM and uint64_t on Xen; so
> there should be no change on KVM, and on Xen we always get
> the larger size.
>
> Remove the ~10 year old scary comment that the type of these
> variables is probably wrong.
>
> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> Reported-by: Anthony PERARD <anthony.per...@citrix.com>
> Fixes: 4ed023ce2a39ab5812d33cf4d819def168965a7f
Reviewed-by: Juan Quintela <quint...@redhat.com>
If nobody complains, I will sent this on next migration pull requset.
Paolo, I think that I preffer this that trusting the intptr_t sign
extension, but I can be convinced either way. What do you think?
> ---
> include/exec/cpu-all.h | 9 ++++-----
> translate-all.c | 4 ++--
> translate-common.c | 4 ++--
> 3 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
> index f9998b9..e23b852 100644
> --- a/include/exec/cpu-all.h
> +++ b/include/exec/cpu-all.h
> @@ -174,11 +174,10 @@ extern unsigned long reserved_va;
> #define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1)
> #define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) &
> TARGET_PAGE_MASK)
>
> -/* ??? These should be the larger of uintptr_t and target_ulong. */
> -extern uintptr_t qemu_real_host_page_size;
> -extern uintptr_t qemu_real_host_page_mask;
> -extern uintptr_t qemu_host_page_size;
> -extern uintptr_t qemu_host_page_mask;
> +extern ram_addr_t qemu_real_host_page_size;
> +extern ram_addr_t qemu_real_host_page_mask;
> +extern ram_addr_t qemu_host_page_size;
> +extern ram_addr_t qemu_host_page_mask;
>
> #define HOST_PAGE_ALIGN(addr) (((addr) + qemu_host_page_size - 1) &
> qemu_host_page_mask)
> #define REAL_HOST_PAGE_ALIGN(addr) (((addr) + qemu_real_host_page_size - 1)
> & \
> diff --git a/translate-all.c b/translate-all.c
> index a940bd2..317f251 100644
> --- a/translate-all.c
> +++ b/translate-all.c
> @@ -117,8 +117,8 @@ typedef struct PageDesc {
>
> #define V_L1_SHIFT (L1_MAP_ADDR_SPACE_BITS - TARGET_PAGE_BITS - V_L1_BITS)
>
> -uintptr_t qemu_host_page_size;
> -uintptr_t qemu_host_page_mask;
> +ram_addr_t qemu_host_page_size;
> +ram_addr_t qemu_host_page_mask;
>
> /* The bottom level has pointers to PageDesc */
> static void *l1_map[V_L1_SIZE];
> diff --git a/translate-common.c b/translate-common.c
> index 619feb4..2fe2d1e 100644
> --- a/translate-common.c
> +++ b/translate-common.c
> @@ -20,8 +20,8 @@
> #include "qemu-common.h"
> #include "qom/cpu.h"
>
> -uintptr_t qemu_real_host_page_size;
> -uintptr_t qemu_real_host_page_mask;
> +ram_addr_t qemu_real_host_page_size;
> +ram_addr_t qemu_real_host_page_mask;
>
> #ifndef CONFIG_USER_ONLY
> /* mask must never be zero, except for A20 change call */
