From: Yanan Wang <wangyanan55@huawei.com>
To: "Eduardo Habkost" <ehabkost@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Andrew Jones" <drjones@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Pierre Morel <pmorel@linux.ibm.com>,
Pankaj Gupta <pankaj.gupta.linux@gmail.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org, Yanan Wang <wangyanan55@huawei.com>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org,
"Michael S . Tsirkin" <mst@redhat.com>,
wanghaibin.wang@huawei.com, qemu-ppc@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v12 10/16] machine: Use ms instead of global current_machine in sanity-check
Date: Wed, 29 Sep 2021 10:58:10 +0800 [thread overview]
Message-ID: <20210929025816.21076-11-wangyanan55@huawei.com> (raw)
In-Reply-To: <20210929025816.21076-1-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.
Signed-off-by: Yanan Wang <wangyanan55@huawei.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.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 f2a34d98c0..12d7416053 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -881,7 +881,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);
}
--
2.19.1
next prev parent reply other threads:[~2021-09-29 3:06 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 2:58 [PATCH v12 00/16] machine: smp parsing fixes and improvement Yanan Wang
2021-09-29 2:58 ` [PATCH v12 01/16] qapi/machine: Fix an incorrect comment of SMPConfiguration Yanan Wang
2021-09-29 2:58 ` [PATCH v12 02/16] machine: Deprecate "parameter=0" SMP configurations Yanan Wang
2021-09-29 2:58 ` [PATCH v12 03/16] machine: Minor refactor/fix for the smp parsers Yanan Wang
2021-09-29 2:58 ` [PATCH v12 04/16] machine: Uniformly use maxcpus to calculate the omitted parameters Yanan Wang
2021-09-29 2:58 ` [PATCH v12 05/16] machine: Set the value of cpus to match maxcpus if it's omitted Yanan Wang
2021-09-29 2:58 ` [PATCH v12 06/16] machine: Improve the error reporting of smp parsing Yanan Wang
2021-09-29 2:58 ` [PATCH v12 07/16] qtest/numa-test: Use detailed -smp CLIs in pc_dynamic_cpu_cfg Yanan Wang
2021-09-29 2:58 ` [PATCH v12 08/16] qtest/numa-test: Use detailed -smp CLIs in test_def_cpu_split Yanan Wang
2021-09-29 2:58 ` [PATCH v12 09/16] machine: Prefer cores over sockets in smp parsing since 6.2 Yanan Wang
2021-09-29 2:58 ` Yanan Wang [this message]
2021-09-29 2:58 ` [PATCH v12 11/16] machine: Tweak the order of topology members in struct CpuTopology Yanan Wang
2021-09-29 2:58 ` [PATCH v12 12/16] machine: Make smp_parse generic enough for all arches Yanan Wang
2021-09-29 2:58 ` [PATCH v12 13/16] machine: Remove smp_parse callback from MachineClass Yanan Wang
2021-09-29 2:58 ` [PATCH v12 14/16] machine: Move smp_prefer_sockets to struct SMPCompatProps Yanan Wang
2021-09-29 2:58 ` [PATCH v12 15/16] machine: Put all sanity-check in the generic SMP parser Yanan Wang
2021-09-29 2:58 ` [PATCH v12 16/16] machine: Make smp_parse return a boolean Yanan Wang
2021-09-29 8:27 ` Philippe Mathieu-Daudé
2021-09-29 8:28 ` Daniel P. Berrangé
2021-09-29 11:22 ` Markus Armbruster
2021-10-01 17:08 ` Paolo Bonzini
2021-10-01 17:15 ` Daniel P. Berrangé
2021-10-02 5:26 ` Markus Armbruster
2021-10-02 6:40 ` Paolo Bonzini
2021-10-02 11:27 ` Markus Armbruster
2021-10-07 3:44 ` wangyanan (Y)
2021-10-07 8:30 ` Paolo Bonzini
2021-10-07 8:29 ` Paolo Bonzini
2021-10-07 12:03 ` Markus Armbruster
2021-09-29 12:39 ` [PATCH v12 00/16] machine: smp parsing fixes and improvement Paolo Bonzini
2021-09-29 14:46 ` Markus Armbruster
2021-09-29 14:57 ` Paolo Bonzini
2021-09-30 1:02 ` wangyanan (Y)
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=20210929025816.21076-11-wangyanan55@huawei.com \
--to=wangyanan55@huawei.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=drjones@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pankaj.gupta.linux@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=wanghaibin.wang@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).