qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: "Zhao Liu" <zhao1.liu@linux.intel.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Yanan Wang" <wangyanan55@huawei.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Prasad Pandit" <ppandit@redhat.com>,
	qemu-devel@nongnu.org, "Xiaoling Song" <xiaoling.song@intel.com>,
	"Zhao Liu" <zhao1.liu@intel.com>
Subject: Re: [PATCH v2 00/13] Cleanup on SMP and its test
Date: Tue, 12 Mar 2024 07:43:03 +0100	[thread overview]
Message-ID: <f044de44-2ea8-4f67-bf93-22dee805c387@redhat.com> (raw)
In-Reply-To: <Ze/6R0kT++CKfaGP@intel.com>

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




      reply	other threads:[~2024-03-12  6:44 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08 16:01 [PATCH v2 00/13] Cleanup on SMP and its test Zhao Liu
2024-03-08 16:01 ` [PATCH v2 01/13] hw/core/machine-smp: Remove deprecated "parameter=0" SMP configurations Zhao Liu
2024-03-08 16:01 ` [PATCH v2 02/13] hw/core/machine-smp: Deprecate unsupported "parameter=1" " Zhao Liu
2024-03-08 16:12   ` Thomas Huth
2024-03-08 16:01 ` [PATCH v2 03/13] hw/core/machine-smp: Calculate total CPUs once in machine_parse_smp_config() Zhao Liu
2024-03-08 16:01 ` [PATCH v2 04/13] tests/unit/test-smp-parse: Drop the unsupported "dies=1" case Zhao Liu
2024-03-08 16:01 ` [PATCH v2 05/13] tests/unit/test-smp-parse: Use CPU number macros in invalid topology case Zhao Liu
2024-03-08 16:01 ` [PATCH v2 06/13] tests/unit/test-smp-parse: Bump max_cpus to 4096 Zhao Liu
2024-03-08 16:01 ` [PATCH v2 07/13] tests/unit/test-smp-parse: Make test cases aware of the book/drawer Zhao Liu
2024-03-08 16:01 ` [PATCH v2 08/13] tests/unit/test-smp-parse: Test "books" parameter in -smp Zhao Liu
2024-03-08 16:01 ` [PATCH v2 09/13] tests/unit/test-smp-parse: Test "drawers" " Zhao Liu
2024-03-08 16:01 ` [PATCH v2 10/13] tests/unit/test-smp-parse: Test "drawers" and "books" combination case Zhao Liu
2024-03-08 16:01 ` [PATCH v2 11/13] tests/unit/test-smp-parse: Test the full 7-levels topology hierarchy Zhao Liu
2024-03-08 16:01 ` [PATCH v2 12/13] tests/unit/test-smp-parse: Test smp_props.has_clusters Zhao Liu
2024-03-08 16:01 ` [PATCH v2 13/13] tests/unit/test-smp-parse: Test "parameter=0" SMP configurations Zhao Liu
2024-03-08 16:31 ` [PATCH v2 00/13] Cleanup on SMP and its test Philippe Mathieu-Daudé
2024-03-09  0:46   ` Zhao Liu
2024-03-09 13:49     ` Philippe Mathieu-Daudé
2024-03-10 13:03       ` Zhao Liu
2024-03-12  6:46       ` Zhao Liu
2024-03-12  6:43         ` Thomas Huth [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f044de44-2ea8-4f67-bf93-22dee805c387@redhat.com \
    --to=thuth@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=imammedo@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=philmd@linaro.org \
    --cc=ppandit@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=wangyanan55@huawei.com \
    --cc=xiaoling.song@intel.com \
    --cc=zhao1.liu@intel.com \
    --cc=zhao1.liu@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).