From nobody Thu Nov 13 12:01:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579794812; cv=none; d=zohomail.com; s=zohoarc; b=RMz6srJaYMrQ73T/YC+jNOA7/b7U5GA7G3zESxfV4KW1BwdxC5Kwp/lC2VCV2Xtp9OzVDQZ4O4UhIlTE2b8TeLEZus1QTyqCAPR6LP9CfIfmD4DI9vgnWSW8RIWix7JtGQ9q4moJ4PXfd9g5vjleeyiGCGW42P9gAn/ftCWLTJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579794812; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4nZPBPEpS4N93wi4NNoDHelrGdOiS+pGdinBjcODOW8=; b=U4E/goW2GDit6YJv4kCg2LHcH63To5KlJTlo0wrK6u5V4vyiggH8Wli3GXgh9xBBWgMnMjPGm3MTDDY0UF4PPZ93JP7heyW6maQzCgENtFthxHOses1vTMqcWkCH0Fw4aEpmLfLnYVhW/W35mMu5I/8+obI9zBFDU5Xv5kyD9lM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579794812150481.04231490586926; Thu, 23 Jan 2020 07:53:32 -0800 (PST) Received: from localhost ([::1]:59812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuenS-0004JU-HQ for importer@patchew.org; Thu, 23 Jan 2020 10:53:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52566) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuctY-0008Rk-Lp for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuctX-0008CH-MI for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:40 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39833 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuctX-0008C7-Jg for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-ilGF7TiLOGKOksutP83hDA-1; Thu, 23 Jan 2020 08:51:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03C101137853 for ; Thu, 23 Jan 2020 13:51:36 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D66B8575A; Thu, 23 Jan 2020 13:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579787499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4nZPBPEpS4N93wi4NNoDHelrGdOiS+pGdinBjcODOW8=; b=DdfOhXYTMrn4qk2KUjxv19wkRUCZS9hc19A8BWhTYcFEIn9MMM3yq7S5uymrm1bPCTAflN Nw3LmSa6hVj9nXBpqFiH5cMwZFE/SpBYV6/e0HFAzo8lXPbWy0kSXY9qCWNr+/H9syjZIe BrPozi5LvgMLo4dirJ+0wFQk1bfGOgU= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/59] hw/ppc/spapr_rtas: Use local MachineState variable Date: Thu, 23 Jan 2020 14:50:13 +0100 Message-Id: <1579787449-27599-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> References: <1579787449-27599-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ilGF7TiLOGKOksutP83hDA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 Since we have the MachineState already available locally, use it instead of the global current_machine. Reviewed-by: Greg Kurz Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200121110349.25842-2-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- hw/ppc/spapr_rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 8d8d8cd..e88bb19 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -281,7 +281,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *c= pu, "DesProcs=3D%d," "MaxPlatProcs=3D%d", max_cpus, - current_machine->ram_size / MiB, + ms->ram_size / MiB, ms->smp.cpus, max_cpus); if (pcc->n_host_threads > 0) { --=20 1.8.3.1