qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Zhao Liu" <zhao1.liu@intel.com>,
	"Sunil Muthuswamy" <sunilmut@microsoft.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 27/30] target/i386/WHPX: Fix error message when fail to set ProcessorCount
Date: Wed, 28 Jun 2023 17:53:10 +0200	[thread overview]
Message-ID: <20230628155313.71594-28-philmd@linaro.org> (raw)
In-Reply-To: <20230628155313.71594-1-philmd@linaro.org>

From: Zhao Liu <zhao1.liu@intel.com>

003f230e37d7 ("machine: Tweak the order of topology members in struct
CpuTopology") changes the meaning of MachineState.smp.cores from "the
number of cores in one package" to "the number of cores in one die"
and doesn't fix other uses of MachineState.smp.cores. And because of
the introduction of cluster, now smp.cores just means "the number of
cores in one cluster". This clearly does not fit the semantics here.

And before this error message, WHvSetPartitionProperty() is called to
set prop.ProcessorCount.

So the error message should show the prop.ProcessorCount other than
"cores per cluster" or "cores per package".

Cc: Sunil Muthuswamy <sunilmut@microsoft.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230529124331.412822-1-zhao1.liu@linux.intel.com>
[PMD: Use '%u' format for ProcessorCount]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 target/i386/whpx/whpx-all.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 9ee04ee650..57580ca383 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -2598,8 +2598,8 @@ static int whpx_accel_init(MachineState *ms)
         sizeof(WHV_PARTITION_PROPERTY));
 
     if (FAILED(hr)) {
-        error_report("WHPX: Failed to set partition core count to %d,"
-                     " hr=%08lx", ms->smp.cores, hr);
+        error_report("WHPX: Failed to set partition processor count to %u,"
+                     " hr=%08lx", prop.ProcessorCount, hr);
         ret = -EINVAL;
         goto error;
     }
-- 
2.38.1



  parent reply	other threads:[~2023-06-28 15:58 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28 15:52 [PULL 00/30] Accelerator patches for 2023-06-28 Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 01/30] MAINTAINERS: Update Roman Bolshakov email address Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 02/30] docs/devel/testing: Update the 'Docker Debugging' section Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 03/30] accel: Re-enable WHPX cross-build on case sensitive filesystems Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 04/30] accel: Document generic accelerator headers Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 05/30] accel: Remove unused hThread variable on TCG/WHPX Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 06/30] accel: Fix a leak on Windows HAX Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 07/30] accel: Destroy HAX vCPU threads once done Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 08/30] accel: Rename 'hax_vcpu' as 'accel' in CPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 09/30] accel: Rename HAX 'struct hax_vcpu_state' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 10/30] accel: Move HAX hThread to accelerator context Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 11/30] accel: Remove NVMM unreachable error path Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 12/30] accel: Rename NVMM 'struct qemu_vcpu' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 13/30] accel: Inline NVMM get_qemu_vcpu() Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 14/30] accel: Remove WHPX unreachable error path Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 15/30] accel: Rename WHPX 'struct whpx_vcpu' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:52 ` [PULL 16/30] accel: Inline WHPX get_whpx_vcpu() Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 17/30] accel: Rename 'cpu_state' -> 'cs' Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 18/30] accel: Rename HVF 'struct hvf_vcpu_state' -> AccelCPUState Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 19/30] accel/kvm: Re-include "exec/memattrs.h" header Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 20/30] accel/kvm: Declare kvm_direct_msi_allowed in stubs Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 21/30] hw/intc/arm_gic: Un-inline GIC*/ITS class_name() helpers Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 22/30] hw/intc/arm_gic: Rename 'first_cpu' argument Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 23/30] hw/arm/sbsa-ref: Include missing 'sysemu/kvm.h' header Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 24/30] target/arm: Restrict KVM-specific fields from ArchCPU Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 25/30] target/ppc: " Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 26/30] target/riscv: " Philippe Mathieu-Daudé
2023-06-28 15:53 ` Philippe Mathieu-Daudé [this message]
2023-06-28 15:53 ` [PULL 28/30] exec/memory: Add symbolic value for memory listener priority for accel Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 29/30] exec/memory: Add symbol for memory listener priority for device backend Philippe Mathieu-Daudé
2023-06-28 15:53 ` [PULL 30/30] exec/memory: Add symbol for the min value of memory listener priority Philippe Mathieu-Daudé
2023-06-29 11:15 ` [PULL 00/30] Accelerator patches for 2023-06-28 Richard Henderson

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=20230628155313.71594-28-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sunilmut@microsoft.com \
    --cc=zhao1.liu@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).