From: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
To: Yanan Wang <wangyanan55@huawei.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Andrew Jones" <drjones@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Pierre Morel" <pmorel@linux.ibm.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Qemu Developers" <qemu-devel@nongnu.org>,
"Greg Kurz" <groug@kaod.org>, "Halil Pasic" <pasic@linux.ibm.com>,
wanghaibin.wang@huawei.com, "Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH for-6.2 v3 07/11] machine: Use ms instead of global current_machine in sanity-check
Date: Wed, 28 Jul 2021 06:37:23 +0200 [thread overview]
Message-ID: <CAM9Jb+iEbhm91cH=aWnicX1eQOE+5Yvskkfq_+5FtFh3mB29ug@mail.gmail.com> (raw)
In-Reply-To: <20210728034848.75228-8-wangyanan55@huawei.com>
> In the sanity-check of smp_cpus and max_cpus against mc in function
> machine_set_smp(), we are now using ms->smp.max_cpus for the check
> but using current_machine->smp.max_cpus in the error message.
> Tweak this by uniformly using the local ms.
>
> Reviewed-by: Andrew Jones <drjones@redhat.com>
> Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
> ---
> hw/core/machine.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index a8173a0f45..e13a8f2f34 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -878,7 +878,7 @@ static void machine_set_smp(Object *obj, Visitor *v, const char *name,
> } else if (ms->smp.max_cpus > mc->max_cpus) {
> error_setg(errp, "Invalid SMP CPUs %d. The max CPUs "
> "supported by machine '%s' is %d",
> - current_machine->smp.max_cpus,
> + ms->smp.max_cpus,
> mc->name, mc->max_cpus);
> }
>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
next prev parent reply other threads:[~2021-07-28 4:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 3:48 [PATCH for-6.2 v3 00/11] machine: smp parsing fixes and improvement Yanan Wang
2021-07-28 3:48 ` [PATCH for-6.2 v3 01/11] machine: Minor refactor/cleanup for the smp parsers Yanan Wang
2021-07-28 20:16 ` Andrew Jones
2021-07-29 6:24 ` wangyanan (Y)
2021-07-28 3:48 ` [PATCH for-6.2 v3 02/11] machine: Uniformly use maxcpus to calculate the omitted parameters Yanan Wang
2021-07-28 3:48 ` [PATCH for-6.2 v3 03/11] machine: Set the value of cpus to match maxcpus if it's omitted Yanan Wang
2021-07-28 20:22 ` Andrew Jones
2021-07-29 6:30 ` wangyanan (Y)
2021-07-28 3:48 ` [PATCH for-6.2 v3 04/11] machine: Improve the error reporting of smp parsing Yanan Wang
2021-07-28 20:24 ` Andrew Jones
2021-07-28 3:48 ` [PATCH for-6.2 v3 05/11] hw: Add compat machines for 6.2 Yanan Wang
2021-07-28 3:48 ` [PATCH for-6.2 v3 06/11] machine: Prefer cores over sockets in smp parsing since 6.2 Yanan Wang
2021-07-28 20:28 ` Andrew Jones
2021-07-29 9:12 ` Cornelia Huck
2021-07-28 3:48 ` [PATCH for-6.2 v3 07/11] machine: Use ms instead of global current_machine in sanity-check Yanan Wang
2021-07-28 4:37 ` Pankaj Gupta [this message]
2021-07-29 9:12 ` Cornelia Huck
2021-07-28 3:48 ` [PATCH for-6.2 v3 08/11] machine: Tweak the order of topology members in struct CpuTopology Yanan Wang
2021-07-28 3:48 ` [PATCH for-6.2 v3 09/11] machine: Make smp_parse generic enough for all arches Yanan Wang
2021-07-28 20:38 ` Andrew Jones
2021-07-28 20:41 ` Andrew Jones
2021-07-28 3:48 ` [PATCH for-6.2 v3 10/11] machine: Remove smp_parse callback from MachineClass Yanan Wang
2021-07-28 20:39 ` Andrew Jones
2021-07-28 3:48 ` [PATCH for-6.2 v3 11/11] machine: Move smp_prefer_sockets to struct SMPCompatProps Yanan Wang
2021-07-28 5:09 ` David Gibson
2021-07-28 20:40 ` Andrew Jones
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='CAM9Jb+iEbhm91cH=aWnicX1eQOE+5Yvskkfq_+5FtFh3mB29ug@mail.gmail.com' \
--to=pankaj.gupta.linux@gmail.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wanghaibin.wang@huawei.com \
--cc=wangyanan55@huawei.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).