From nobody Thu Nov 13 12:02:49 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=1579794934; cv=none; d=zohomail.com; s=zohoarc; b=PGXc8Lw+neUfscMVqGzBB+ntzTPLlUF8aQYSObKgg+xCmspM4eCzkqXLr0IFSHRfbVSnUI2F5cRw8KWWjLl+iVYTmxd7meXmQQHHHO4kVyg+IwvL81NNtCexEoo9JCAKmU3j+AW2Do9fM3GI7QR6ITbHih0/PmF6pmzlZ3jq5T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579794934; 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=7ZAKcaYK/1ruN2bloXbMQjJI12mYPfN7fiiBhG4qly8=; b=TEtQKal1HR6V9qjAJKBcRYQiHLBi6SW9il4w08uR8t1ctKXbRWdp9c8Ps4u/iH73U0Op0D5JHHZ+uuuKBdxcoEK9M9nqYnKeAe92a/VLjMLZbEKJs+4EdWblXySBdimfvQIAl2ajT3HyyMY0xGm+pEH7/ZNc6aXh6hW7hsUAdQc= 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 1579794934529564.5513863524552; Thu, 23 Jan 2020 07:55:34 -0800 (PST) Received: from localhost ([::1]:59841 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuepQ-0007SO-UN for importer@patchew.org; Thu, 23 Jan 2020 10:55:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52585) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuctd-00008P-TE for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuctc-0008Lo-UJ for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:45 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:40808 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 1iuctc-0008L4-RT for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:51:44 -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-44-Kanf8ig4PnKlizzvcjDxTw-1; Thu, 23 Jan 2020 08:51:42 -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 2979818CA25B for ; Thu, 23 Jan 2020 13:51:42 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 775BD85785; Thu, 23 Jan 2020 13:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579787504; 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=7ZAKcaYK/1ruN2bloXbMQjJI12mYPfN7fiiBhG4qly8=; b=Z2jwf1BMjnEvJmCzXJ+dF9LHr5OHJwQxyXtHiUW2vVU3YEm+3EbFq6WdgZ/hKrgx3jxsJL zpnFE5ZBsPo1OCI2QfN1iClBnStfpiGjkYJV6rDnlliahAQTjKIZUCm8p9l5HF4moY5h8u Py0sNvtraMwd/DbQtCbLB02w+VImNQk= From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/59] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument Date: Thu, 23 Jan 2020 14:50:14 +0100 Message-Id: <1579787449-27599-25-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: Kanf8ig4PnKlizzvcjDxTw-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: 205.139.110.61 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 We received a SpaprMachineState argument. Since SpaprMachineState inherits of MachineState, use it instead of calling qdev_get_machine. Reviewed-by: Greg Kurz Acked-by: David Gibson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200121110349.25842-3-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 e88bb19..6f06e9d 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -267,7 +267,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *c= pu, uint32_t nret, target_ulong rets) { PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); - MachineState *ms =3D MACHINE(qdev_get_machine()); + MachineState *ms =3D MACHINE(spapr); unsigned int max_cpus =3D ms->smp.max_cpus; target_ulong parameter =3D rtas_ld(args, 0); target_ulong buffer =3D rtas_ld(args, 1); --=20 1.8.3.1