From nobody Tue Feb 10 00:22:55 2026 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579795816; cv=none; d=zohomail.com; s=zohoarc; b=IDYtpDjAoBnrUC3P9WSxDPR7Lak1TIun8LXv3LpXGvnLIEEHS4YP5LY5/RcYqfGf1Xp6XwBBgN/EuURgchJOvp/lXWvO7HpPya5NQxjDB66TU2kElPR0elHplTh97i+OGvPRaPCAOlIiJieKIs+Q5Gu/8DA+DsIcKh2CBJvxr1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579795816; 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=/n6fsNYCgUUz+As71BcAONX0z/kz1Ylr8LtgTEjsS5g=; b=It9A2XZ8OGFjURUJHIWhBXTSXXwHaWTEIsA42sBKWgJZzQsp1h2jPLbYZvRLCFJJWLRBIasVsfVhYfsuVQqC6DnkHw8muEukpCht0ZkaACsTR2clCAFIB2VXWb02/Y6rLoJ0BCPuCs7IdKUqmSxNfLAWt2dZp+sWSbp/t88Iivg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1579795816967462.20706886725293; Thu, 23 Jan 2020 08:10:16 -0800 (PST) Received: from localhost ([::1]:60076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuf3f-0003lO-Dt for importer@patchew.org; Thu, 23 Jan 2020 11:10:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51494) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucrR-00054X-Q0 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iucrQ-0003U7-Jc for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:29 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:35562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iucrQ-0003Sc-DA for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:49:28 -0500 Received: by mail-wr1-x42f.google.com with SMTP id g17so3163223wro.2 for ; Thu, 23 Jan 2020 05:49:28 -0800 (PST) Received: from 640k.localdomain.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s15sm3073171wrp.4.2020.01.23.05.49.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jan 2020 05:49:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/n6fsNYCgUUz+As71BcAONX0z/kz1Ylr8LtgTEjsS5g=; b=snbU6Z9mUj4plDzrnUMTaGH5GhASijPgXmAb3gJJD0N8+2bfH/T+2sqFD8fYG+olyz nesy4KzDawR15+8qHL3/CnhjtVF5LQGMAO71z0OPZHrYR698eszA+9SJkE3gf7KkBVvx 2OKFsXFHnZ1Xsq3hGsvJp8W+/rmOkDoLG4fPt8WFh6eZAkYAmvpOv5mqCFXSLIgEACqh j+SmVWblTrUMZdiQHmEpkWOX+KbuxYUgxmYR3q7365QVUQsSYl3phL7IPTeKpQYcfEX/ ZnYHn6MhqI8//uwbJtUygpTslkTBjD5dTwoQJE+MGyi5FwXnKTDDONjdR6Ta0WjGAlEw nv5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/n6fsNYCgUUz+As71BcAONX0z/kz1Ylr8LtgTEjsS5g=; b=MbWE+rKaUd3V/e23Kf6gLcP8J/tI+c/bvb+SMup9NDUnIUsJhfMYbEv4QQlDxFK8bd BC3uw9zQvKQZk1EhDWb128TZOFoK4XHgTR0ATYgvbOrLE4Xm1imBtIMISe1pj1tpd/9G qWbBWF1cVvRpAgE6s1u5ZoX+H05KrW4cvzGIZYbe0nNBYYV+p9LbbNLMWNJd5m3kupIk Gvdvxj4Z0zfrfB+KqlUgBN5DgoDOW4RbRKQo10Uq2wuPzWZVgLdSVW9jKOYYQOUm6+Ex udnEsLQG/dnDN7qiuN9HR9OZmoPLum9ZDqzFHUvpmSv8cwMwOY0owhwFsjVQxMSXV0N6 GT/Q== X-Gm-Message-State: APjAAAX+AwQLNhDTXvAo88o5eeptRRAjYtg/AZ+ZVWsJB+s352OcREuP u/asAFW501EF8TawJsZgr0DS4oEp X-Google-Smtp-Source: APXvYqzRFC3ttRI7vgAqJaBtp88XDmxF7e105HOQO9kDKnHMwlA49LU4uGKQS2tO1QaK4rimee16nQ== X-Received: by 2002:adf:ca07:: with SMTP id o7mr17216943wrh.49.1579787367209; Thu, 23 Jan 2020 05:49:27 -0800 (PST) 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:48:26 +0100 Message-Id: <1579787342-27146-24-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1579787342-27146-1-git-send-email-pbonzini@redhat.com> References: <1579787342-27146-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f 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: fail (Header signature does not verify) 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