Hi Philippe, On Sat, Mar 09, 2024 at 02:49:17PM +0100, Philippe Mathieu-Daudé wrote: > Date: Sat, 9 Mar 2024 14:49:17 +0100 > From: Philippe Mathieu-Daudé <phi...@linaro.org> > Subject: Re: [PATCH v2 00/13] Cleanup on SMP and its test > > On 9/3/24 01:46, Zhao Liu wrote: > > Hi Philippe, > > > > > > > > Can you share your base commit please? > > > > > > Applying: hw/core/machine-smp: Remove deprecated "parameter=0" SMP > > > configurations > > > Applying: hw/core/machine-smp: Deprecate unsupported "parameter=1" SMP > > > configurations > > > error: patch failed: docs/about/deprecated.rst:47 > > > error: docs/about/deprecated.rst: patch does not apply > > > Patch failed at 0002 hw/core/machine-smp: Deprecate unsupported > > > "parameter=1" SMP configurations > > > > > > > The base commit is e1007b6bab5cf ("Merge tag 'pull-request-2024-03-01' > > of https://gitlab.com/thuth/qemu into staging"). > > > > But I think this conflict is because of the first 4 patches of mudule > > series you picked. Let me rebase this series on that module series and > > refresh a v3. > > Ah no, it is due to commit 01e449809b ("*-user: Deprecate and > disable -p pagesize"). > > No need to respin this series, I queued it in favor of the 4 other > patches.
In the commit 54c4ea8f3ae6 ("hw/core/machine-smp: Deprecate unsupported 'parameter=1' SMP configurations"), the smp related thing is put under the section "User-mode emulator command line arguments" instead of "System emulator command line arguments". Is this not quite right...or does it need to be fixed? If so I can tweak and clean it up with a minor patch. ;-) Thanks, Zhao