Re: [PATCH v26 00/20] i386 cleanup PART 2 - Philippe Mathieu-Daudé

From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Claudio Fontana <cfontana@suse.de>,
	Eduardo Habkost <ehabkost@redhat.com>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Thomas Huth" <thuth@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	qemu-devel@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
	"Roman Bolshakov" <r.bolshakov@yadro.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PATCH v26 00/20] i386 cleanup PART 2
Date: Thu, 6 May 2021 11:33:50 +0200	[thread overview]
Message-ID: <19a1ed59-af39-3c20-2156-6bf4b3026973@redhat.com> (raw)
In-Reply-To: <a6f5e405-039a-a055-ffec-dd9e65bf209e@redhat.com>

On 5/6/21 11:10 AM, Philippe Mathieu-Daudé wrote:
> On 5/6/21 9:55 AM, Claudio Fontana wrote:
>> On 5/5/21 9:31 PM, Eduardo Habkost wrote:
>>> On Wed, May 05, 2021 at 02:15:29PM +0200, Philippe Mathieu-Daudé wrote:
>>>> On 5/5/21 12:04 PM, Alex Bennée wrote:
>>>>> Claudio Fontana <cfontana@suse.de> writes:
>>>>>> On 3/8/21 3:02 PM, Alex Bennée wrote:
>>>>>>> Claudio Fontana <cfontana@suse.de> writes:
>>>>>>>
>>>>>>>> Hi,
>>>>>>>>
>>>>>>>> anything else for me to do here?
>>>>>>>
>>>>>>> It looks to me that this series is looking pretty good. Every patch has
>>>>>>> at least one review so I think it's just waiting on the maintainers to
>>>>>>> pick it up.
>>>>>>>
>>>>>>> Paolo/Richard - are you intending to take the series as is or are you
>>>>>>> waiting for something else? I'd like to see the patch delta reduced for
>>>>>>> the ARM cleanup work which is still ongoing.
>>>>>>
>>>>>> I am a bit at a loss here, as this has been reviewed for a while, but nothing is happening.
>>>>>> Rebasing is starting to become more and more draining;
>>>>>
>>>>> This is still the latest re-factor right?
>>>>>
>>>>>   Subject: [PATCH v28 00/23] i386 cleanup PART 2
>>>>>   Date: Mon, 22 Mar 2021 14:27:36 +0100
>>>>>   Message-Id: <20210322132800.7470-1-cfontana@suse.de>
>>>>>
>>>>>> I am seeing some changes from Phil that redo some of the patches here (like target arch user),
>>>>>> maybe you would like to drive this?
>>>>>
>>>>> AIUI his changes where to get qtest passing.
>>>>
>>>> I hadn't read Claudio's mail, I think he's mentioning commit 46369b50ee3
>>>>
>>>>     meson: Introduce meson_user_arch source set for arch-specific user-mode
>>>>
>>>>     Similarly to the 'target_softmmu_arch' source set which allows
>>>>     to restrict target-specific sources to system emulation, add
>>>>     the equivalent 'target_user_arch' set for user emulation.
>>>>
>>>> The patch only contains 6 lines in 2 hunks, if it introduced a conflict
>>>> it should be trivial to resolve (I wasn't expecting it to conflict with
>>>> your work when I merged it TBH).
> 
>> I'd suggest to move the discussions about the ARM series to the arm series thread.
>>
>> I am concerned here about the groundwork and x86 part.
> 
> OK sorry, I was explaining the IRC chat.
> 
> Is there any issue rebasing the groundwork on top of commit 46369b50ee3?
> 
> Maybe my qtest/accel series is irrelevant to your x86 part, TBH I don't
> remember.

So far I could rebase this series on top of commit 229a834518b
(Mon Mar 8 15:45:48 2021).

First trivial conflict with 2cc1a90166b ("Remove deprecated
target tilegx"), removing target/tilegx/meson.build resolves it.

Then apparently commit b8184135835 ("target/i386: allow modifying
TCG phys-addr-bits") which is not trivial (to me).

Finally "meson: add target_user_arch" indeed clashes with commit
46369b50ee3 ("meson: Introduce meson_user_arch source set for
arch-specific user-mode"). I am sorry I didn't notice your patch,
but am glad we both sent a similar patch :) Mine allows optional
sourceset, so you can simplify your patch, only keeping the x86
part:

-- >8 --

diff --git a/target/i386/meson.build b/target/i386/meson.build
index fd24479590..cac26a4581 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -19,6 +19,7 @@ i386_softmmu_ss.add(files(
   'machine.c',
   'monitor.c',
 ))
+i386_user_ss = ss.source_set()

 subdir('kvm')
 subdir('hax')
@@ -28,3 +29,4 @@ subdir('tcg')

 target_arch += {'i386': i386_ss}
 target_softmmu_arch += {'i386': i386_softmmu_ss}
+target_user_arch += {'i386': i386_user_ss}
---

Regards,

Phil.


