From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41026)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1aTBfK-0004nQ-8w
	for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:01:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1aTBfG-00039r-8t
	for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:01:26 -0500
Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:35085)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rth7680@gmail.com>) id 1aTBfG-00039J-20
	for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:01:22 -0500
Received: by mail-pa0-x230.google.com with SMTP id ho8so94021802pac.2
	for <qemu-devel@nongnu.org>; Tue, 09 Feb 2016 09:01:21 -0800 (PST)
Sender: Richard Henderson <rth7680@gmail.com>
References: <1455020031-8268-1-git-send-email-pbonzini@redhat.com>
	<CAFEAcA8WFRj8-_fEu6y1QSY+8nHw8Z59bVbv37PNy9ofR3tGGw@mail.gmail.com>
	<56B9FA80.6010704@redhat.com>
From: Richard Henderson <rth@twiddle.net>
Message-ID: <56BA1B59.1080707@twiddle.net>
Date: Wed, 10 Feb 2016 04:01:13 +1100
MIME-Version: 1.0
In-Reply-To: <56B9FA80.6010704@redhat.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Subject: Re: [Qemu-devel] [PULL v2 00/32] Misc changes for 2016-02-08
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>

On 02/10/2016 01:41 AM, Paolo Bonzini wrote:
>
>
> On 09/02/2016 15:20, Peter Maydell wrote:
>> Compilation failure I'm afraid (all hosts):
>>
>> /home/pm215/qemu/target-i386/translate.c: In function ‘tcg_x86_init’:
>> /home/pm215/qemu/target-i386/translate.c:7724:34: error: passing
>> argument 1 of ‘tcg_global_mem_new_i32’ makes pointer from integer
>> without a cast [-Werror]
>>                                    seg_base_names[i]);
>>                                    ^
>> In file included from /home/pm215/qemu/tcg/tcg-op.h:25:0,
>>                   from /home/pm215/qemu/target-i386/translate.c:24:
>> /home/pm215/qemu/tcg/tcg.h:644:24: note: expected ‘TCGv_ptr’ but
>> argument is of type ‘int’
>>   static inline TCGv_i32 tcg_global_mem_new_i32(TCGv_ptr reg, intptr_t offset,
>>                          ^
>
> Hmm, not on my host and I don't see what's going on:
>
>      static const char seg_base_names[6][8] = {
>          [R_CS] = "cs_base",
>          [R_DS] = "ds_base",
>          [R_ES] = "es_base",
>          [R_FS] = "fs_base",
>          [R_GS] = "gs_base",
>          [R_SS] = "ss_base",
>      };
>
>          cpu_seg_base[i]
>              = tcg_global_mem_new(TCG_AREG0,
>                                   offsetof(CPUX86State, segs[i].base),
>                                   seg_base_names[i]);
>
>
> There's no difference between that and e.g.
>
>      cpu_cc_src2 = tcg_global_mem_new(TCG_AREG0,
>                                       offsetof(CPUX86State, cc_src2),
>                                       "cc_src2");

Merge conflict.  s/TCG_AREG0/cpu_env/ after my latest tcg patch set.


r~