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 A52B9C33CA2 for ; Sun, 12 Jan 2020 09:45:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7B6532187F for ; Sun, 12 Jan 2020 09:45:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EsExOqT+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732534AbgALJpK (ORCPT ); Sun, 12 Jan 2020 04:45:10 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:35229 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732531AbgALJpJ (ORCPT ); Sun, 12 Jan 2020 04:45:09 -0500 Received: by mail-lf1-f66.google.com with SMTP id 15so4727460lfr.2 for ; Sun, 12 Jan 2020 01:45:08 -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=mvEyv8WsHK+y4lyiLI8T8Cwz0UxNsAP1n8oZu5GDpas=; b=EsExOqT+WaKoepgqT7oBU0FbwwVcObGIbJj0xCQa354MC9I0rlak12h/IOaCdVNjOM TS9B4peK4Wy1n3LNE7VUeZeAiNxuJMTDtOlZkmLlTMxebjdYlkuArnnwDHlyNP/IgbIY NE+3m9HIEl6y3exSWSEKN+obmsDn4n6eauER6SWszp2tmiqxez40m7fCaai4EScYBfzI CzshAOOXWob9ahNuiw+zOgiUw5FULJnXuY+LvF6XF9nIkmJCenbXBL9D1p8t4YMmXDdC hm93ccuX8jC1DQoRT3nOGwRFAxnKTMb6OsT7WPYMCJ9Rrtsmll0xv1zh+fKXXf/vNghk 2iwg== 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=mvEyv8WsHK+y4lyiLI8T8Cwz0UxNsAP1n8oZu5GDpas=; b=W8x2KeZaVs+B50+ZOFghQqrqBaf/YQ8toV8QKWbvV61tNcgSnNsjfx2gUu7OjY0hWb 3H1NxhoePFZmmr6vAtoOpk5B3axXyz/vavkwejO3waeb/bPeuPe2JiGICRQXatp7EZzx X/XRTuShhnmdIinZK11/KWv+Iq85igQK9NeZsg68l4oo8BJHHHdIirHKlPe1RSDnbZyL XYlsJWrwfdfAY/vHN3m3lPdkJMad0s3AWv69n+skmcA7F3hMjuc3ovVq1ndjKxepDF1d IKP0OWBjzzU24Jvhx+ZcLuDT/xPuepqh2YohnLb7xrQo7T69FR8J9KUT0uwHhV6iAlPs KMQg== X-Gm-Message-State: APjAAAW39C1r1RIDpm9xsnXUvgCqX4b0YgggPxeQy4jOGonWtbnvqKBh wM4sG9GeYr2B0HgqRBsvsk4byQ14+w3eUk5J+wQ= X-Google-Smtp-Source: APXvYqxBsmT3/S/ksEIf8xngcs0t6C+b9DJlHarA6JCrshF+M3Qvub4y4aPAefRQPsUZqr5EcjM401Rlfz38uhniS/w= X-Received: by 2002:ac2:5498:: with SMTP id t24mr7132155lfk.84.1578822307837; Sun, 12 Jan 2020 01:45:07 -0800 (PST) MIME-Version: 1.0 References: <20200109152133.23649-1-philmd@redhat.com> <20200109152133.23649-8-philmd@redhat.com> In-Reply-To: <20200109152133.23649-8-philmd@redhat.com> From: Alistair Francis Date: Sun, 12 Jan 2020 17:44:40 +0800 Message-ID: Subject: Re: [PATCH 07/15] hw/core/machine-qmp-cmds: 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:30 PM Philippe Mathieu-Daud=C3=A9 wrote: > > As we want to remove the global current_machine, > replace MACHINE_GET_CLASS(current_machine) by > MACHINE_GET_CLASS(qdev_get_machine()). > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > hw/core/machine-qmp-cmds.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c > index eed5aeb2f7..5a04d00e4f 100644 > --- a/hw/core/machine-qmp-cmds.c > +++ b/hw/core/machine-qmp-cmds.c > @@ -280,9 +280,9 @@ void qmp_cpu_add(int64_t id, Error **errp) > { > MachineClass *mc; > > - mc =3D MACHINE_GET_CLASS(current_machine); > + mc =3D MACHINE_GET_CLASS(qdev_get_machine()); > if (mc->hot_add_cpu) { > - mc->hot_add_cpu(current_machine, id, errp); > + mc->hot_add_cpu(MACHINE(qdev_get_machine()), id, errp); > } else { > error_setg(errp, "Not supported"); > } > -- > 2.21.1 > >