From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96AA7C32771 for ; Sun, 12 Jan 2020 09:47:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6632322314 for ; Sun, 12 Jan 2020 09:47:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mngArEu9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732465AbgALJrf (ORCPT ); Sun, 12 Jan 2020 04:47:35 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:43405 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732374AbgALJrf (ORCPT ); Sun, 12 Jan 2020 04:47:35 -0500 Received: by mail-lj1-f195.google.com with SMTP id a13so6714878ljm.10 for ; Sun, 12 Jan 2020 01:47:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=RDLnJ4qJFqQy+U2F1GzxeKsnp0OT/5UfLwjGUAO8yps=; b=mngArEu9hEfT+he2g+EY39i8voXyGMVQyKHnLGrN07fzeQ1oIjuJ/uT0rE67m9W0b5 1B+ijvVUx/OhDdfb1W5aANqY0iG9CNXuRz5sR70kDZgbkmqHKEvaUX6gG7DOJe7HCqWk EPl5PVbwgppO8o6+HhV+afhC2eeefiQdrYMxKIubn0AMyt94q4JklFzFY6iBJLZim+q+ lxQrbiWgNHaYT0sE8GOwUkn4je2IxgK4CHpN4LnMvnGDDZvsGKRwVruyume7Vt7D2r89 Tj9Cg4v2YHHE1KOUEZv6+irkvJCrwZwUBUmMEhDodr++MSsyQSgwpySIIGmBs5M8ZBjE PtqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=RDLnJ4qJFqQy+U2F1GzxeKsnp0OT/5UfLwjGUAO8yps=; b=ekEJe0kDsnTPJoJ50Wr6oMcdZnvTPeHpKKhUPEhfr3NW5wsyQf5O5m0p8O28pW7abC UzIDPfsMzO+jwIdyhUFoGE4qsai7buIZWzh6CQN+yUy9xi94bkZzE9mAhu/SSSGJfV+1 bodn/bEmXOffo0ybIoqtOlAiSj4nPSVifFhTIp1fiNTGLLbS/mgPtx4zs6IAjrWR4tYj pqZxCuqcLVNJ3ccepEn8yWJjmgoIo1xzhK+mm4J66n2rcSI2HRkqBVGXXPz+qxkA50Y4 Jr9kmhi7SyfAMiO/kyZHGo22rkhcWSfgp0ZjFk+FBxxgzsnCzzLjNAjnoe6cUkUGaQqS YkDg== X-Gm-Message-State: APjAAAVBABEG5Id9B11DoWdq5A6qmEwRf96sF4nQg/1reEQFxc1G0sOd qfb7hdj+PyP2x+4Y0fTov5SJ9YkusJ2nYV0LfcY= X-Google-Smtp-Source: APXvYqzvRwD0wTNL3ge0fIaHzVy8ssKZyDWXWui59E3SmT+L+JPpV/KxHTsDtelWxlfc754pdzRavhGgWEDG2TwsVLU= X-Received: by 2002:a2e:9a51:: with SMTP id k17mr7529135ljj.206.1578822453192; Sun, 12 Jan 2020 01:47:33 -0800 (PST) MIME-Version: 1.0 References: <20200109152133.23649-1-philmd@redhat.com> <20200109152133.23649-9-philmd@redhat.com> In-Reply-To: <20200109152133.23649-9-philmd@redhat.com> From: Alistair Francis Date: Sun, 12 Jan 2020 17:47:04 +0800 Message-ID: Subject: Re: [PATCH 08/15] target/arm/monitor: Replace current_machine by qdev_get_machine() To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Cc: "qemu-devel@nongnu.org Developers" , Peter Maydell , Eduardo Habkost , "open list:Overall" , Juan Quintela , "open list:New World" , Marcelo Tosatti , "Dr. David Alan Gilbert" , qemu-arm , Alistair Francis , Paolo Bonzini , David Gibson , Richard Henderson Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, Jan 9, 2020 at 11:23 PM Philippe Mathieu-Daud=C3=A9 wrote: > > As we want to remove the global current_machine, > replace 'current_machine' by MACHINE(qdev_get_machine()). > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > target/arm/monitor.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/target/arm/monitor.c b/target/arm/monitor.c > index fa054f8a36..bcbf69802d 100644 > --- a/target/arm/monitor.c > +++ b/target/arm/monitor.c > @@ -136,7 +136,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(= CpuModelExpansionType type, > } > > if (kvm_enabled()) { > - const char *cpu_type =3D current_machine->cpu_type; > + MachineState *ms =3D MACHINE(qdev_get_machine()); > + const char *cpu_type =3D ms->cpu_type; > int len =3D strlen(cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX); > bool supported =3D false; > > -- > 2.21.1 > >