Message ID | 20240308160148.3130837-1-zhao1.liu@linux.intel.com (mailing list archive) |
---|---|
Headers | show |
Series | Cleanup on SMP and its test | expand |
Hi Zhao, On 8/3/24 17:01, Zhao Liu wrote: > --- > Zhao Liu (13): > hw/core/machine-smp: Remove deprecated "parameter=0" SMP > configurations > hw/core/machine-smp: Deprecate unsupported "parameter=1" SMP > configurations > hw/core/machine-smp: Calculate total CPUs once in > machine_parse_smp_config() > tests/unit/test-smp-parse: Drop the unsupported "dies=1" case > tests/unit/test-smp-parse: Use CPU number macros in invalid topology > case > tests/unit/test-smp-parse: Bump max_cpus to 4096 > tests/unit/test-smp-parse: Make test cases aware of the book/drawer > tests/unit/test-smp-parse: Test "books" parameter in -smp > tests/unit/test-smp-parse: Test "drawers" parameter in -smp > tests/unit/test-smp-parse: Test "drawers" and "books" combination case > tests/unit/test-smp-parse: Test the full 7-levels topology hierarchy > tests/unit/test-smp-parse: Test smp_props.has_clusters > tests/unit/test-smp-parse: Test "parameter=0" SMP configurations 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
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. Thanks, Zhao
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.
> 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. Thanks for your queuing! -Zhao
On 12/03/2024 07.46, Zhao Liu wrote: > 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é <philmd@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. ;-) Yes, please send a patch to clean it up! Thanks Thomas
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é <philmd@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
From: Zhao Liu <zhao1.liu@intel.com> Hi, This is v2 to cleanup SMP and its test cases. Compared with v1, v2 have these changes: * Dropped the patch [2] about making default initialization based on SMPConfiguration members. (Thomas) * Fixed typos. (Thomas) This series includes: * [Patch 1] Remove deprecated "parameter=0" SMP configurations, which is marked as deprecated in v6.2. * [Patch 2] Deprecate unsupported "parameter=1" SMP configurations. * [Patch 3] Minor code cleanup for machine_parse_smp_config(). * [Patch 4 ~ 13] Test case enhancements to cover more SMP API changes. [1]: https://lore.kernel.org/qemu-devel/20240306095407.3058909-1-zhao1.liu@linux.intel.com/ [2]: https://lore.kernel.org/qemu-devel/20240306095407.3058909-4-zhao1.liu@linux.intel.com/ Thanks for your review! Best Regards, Zhao --- Zhao Liu (13): hw/core/machine-smp: Remove deprecated "parameter=0" SMP configurations hw/core/machine-smp: Deprecate unsupported "parameter=1" SMP configurations hw/core/machine-smp: Calculate total CPUs once in machine_parse_smp_config() tests/unit/test-smp-parse: Drop the unsupported "dies=1" case tests/unit/test-smp-parse: Use CPU number macros in invalid topology case tests/unit/test-smp-parse: Bump max_cpus to 4096 tests/unit/test-smp-parse: Make test cases aware of the book/drawer tests/unit/test-smp-parse: Test "books" parameter in -smp tests/unit/test-smp-parse: Test "drawers" parameter in -smp tests/unit/test-smp-parse: Test "drawers" and "books" combination case tests/unit/test-smp-parse: Test the full 7-levels topology hierarchy tests/unit/test-smp-parse: Test smp_props.has_clusters tests/unit/test-smp-parse: Test "parameter=0" SMP configurations docs/about/deprecated.rst | 30 +- docs/about/removed-features.rst | 15 + hw/core/machine-smp.c | 76 ++-- tests/unit/test-smp-parse.c | 612 ++++++++++++++++++++++++++++++-- 4 files changed, 669 insertions(+), 64 deletions(-)