[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/18] tcg queued patches
From: |
Richard Henderson |
Subject: |
Re: [Qemu-devel] [PULL 00/18] tcg queued patches |
Date: |
Fri, 15 Jun 2018 07:54:47 -1000 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
On 06/15/2018 04:01 AM, Emilio G. Cota wrote:
> On Fri, Jun 15, 2018 at 11:41:28 +0100, Peter Maydell wrote:
>> Hi; I get compile failures with clang I'm afraid
>> (seen on x86-64 Linux, OSX and FreeBSD):
>>
>> /home/petmay01/linaro/qemu-for-merges/accel/tcg/translate-all.c:1800:44:
>> error: incompatible integer to pointer conversion passing 'uintptr_t'
>> (aka 'unsigned long') to parameter of type 'void *'
>> [-Werror,-Wint-conversion]
>> atomic_set(&tcg_ctx->code_gen_ptr, orig_aligned);
>
> Fixed with:
>
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -1797,7 +1797,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
> uintptr_t orig_aligned = (uintptr_t)gen_code_buf;
>
> orig_aligned -= ROUND_UP(sizeof(*tb), qemu_icache_linesize);
> - atomic_set(&tcg_ctx->code_gen_ptr, orig_aligned);
> + atomic_set(&tcg_ctx->code_gen_ptr, (void *)orig_aligned);
> return existing_tb;
> }
> tcg_tb_insert(tb);
>
> This applies to patch 14/18 ("translate-all: discard TB when
> tb_link_page returns an existing matching TB") of the pull request.
>
> The rest compiles OK for me on clang 7.0.0.
>
> Richard: can you fold this fixup into patch 14?
Will do.
r~
- [Qemu-devel] [PULL 11/18] translate-all: use per-page locking in !user-mode, (continued)
- [Qemu-devel] [PULL 11/18] translate-all: use per-page locking in !user-mode, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 13/18] translate-all: introduce assert_no_pages_locked, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 12/18] translate-all: add page_locked assertions, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 14/18] translate-all: discard TB when tb_link_page returns an existing matching TB, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 15/18] translate-all: protect TB jumps with a per-destination-TB lock, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 16/18] cputlb: remove tb_lock from tlb_flush functions, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 17/18] translate-all: remove tb_lock mention from cpu_restore_state_from_tb, Richard Henderson, 2018/06/14
- [Qemu-devel] [PULL 18/18] tcg: remove tb_lock, Richard Henderson, 2018/06/14
- Re: [Qemu-devel] [PULL 00/18] tcg queued patches, Peter Maydell, 2018/06/15