From nobody Thu Apr 25 11:08:48 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562938003; cv=none; d=zoho.com; s=zohoarc; b=kRI9wKib3ZoN93dyeOqB6XJylRf1yEf5lSj61Gm0tr9yrz57mFUgPMOTodS9gK03nVzjHtNnyrf6MKcr9Kz1BbV8x1fM5UxVUeDuHPAsOh7GJt2GZdW2kmksFBGEgaxLovIE9+OJz7n/xrNRmE0auIeRDLKaAGW2tpAE5cC2UL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562938003; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=wrNONXkW4FIPethCl5ICYNNIRIjBZz6GWLyhC9RDyd0=; b=VJI+5+eC60Mr5XUePvfkd4vg4HwUyiomsM4MPHmRC/AIGAKAt0+11jBFiHWqX+41GnVJwuPLv+1PxEaz1lI5icrkVxHs/8OZYioXh8ytMYHjkqoUdZY5Ht8YIVjPT6j9UXCMntLG4FbsuVxqvEPvgOV2TLVuo3LQyjcOTkBdgeg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562938003696322.72070585203653; Fri, 12 Jul 2019 06:26:43 -0700 (PDT) Received: from localhost ([::1]:49356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlvZR-0003y8-Uc for importer@patchew.org; Fri, 12 Jul 2019 09:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53411) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlvZG-0003Zv-94 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 09:26:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlvZA-0000c6-AZ for qemu-devel@nongnu.org; Fri, 12 Jul 2019 09:26:29 -0400 Received: from mail.weilnetz.de ([37.120.169.71]:40888 helo=v2201612906741603.powersrv.de) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlvZ9-0000O5-U9 for qemu-devel@nongnu.org; Fri, 12 Jul 2019 09:26:24 -0400 Received: from localhost (localhost [127.0.0.1]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 04B1FDB8610; Fri, 12 Jul 2019 15:26:22 +0200 (CEST) Received: from v2201612906741603.powersrv.de ([127.0.0.1]) by localhost (v2201612906741603.powersrv.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tsKf-iIv6hc1; Fri, 12 Jul 2019 15:26:21 +0200 (CEST) Received: from qemu.weilnetz.de (qemu.weilnetz.de [188.68.58.204]) by v2201612906741603.powersrv.de (Postfix) with ESMTP id 5D6E9DB8602; Fri, 12 Jul 2019 15:26:21 +0200 (CEST) Received: by qemu.weilnetz.de (Postfix, from userid 1000) id 3FCF746004F; Fri, 12 Jul 2019 15:26:21 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at v2201612906741603.powersrv.de From: Stefan Weil To: qemu-devel@nongnu.org Date: Fri, 12 Jul 2019 15:26:11 +0200 Message-Id: <20190712132611.20411-1-sw@weilnetz.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 37.120.169.71 Subject: [Qemu-devel] [PATCH for 4.1] Fix broken build with WHPX enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Stefan Weil , Eduardo Habkost , Like Xu , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Stefan Weil --- target/i386/whpx-all.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 31d47320e4..ed95105eae 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -1396,7 +1396,7 @@ static int whpx_accel_init(MachineState *ms) } =20 memset(&prop, 0, sizeof(WHV_PARTITION_PROPERTY)); - prop.ProcessorCount =3D smp_cpus; + prop.ProcessorCount =3D ms->smp.cpus; hr =3D whp_dispatch.WHvSetPartitionProperty( whpx->partition, WHvPartitionPropertyCodeProcessorCount, @@ -1405,7 +1405,7 @@ static int whpx_accel_init(MachineState *ms) =20 if (FAILED(hr)) { error_report("WHPX: Failed to set partition core count to %d," - " hr=3D%08lx", smp_cores, hr); + " hr=3D%08lx", ms->smp.cores, hr); ret =3D -EINVAL; goto error; } --=20 2.20.1