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 3E2ADC33CA9 for ; Tue, 14 Jan 2020 02:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D9E420CC7 for ; Tue, 14 Jan 2020 02:00:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uRmU8IrV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729437AbgANCAY (ORCPT ); Mon, 13 Jan 2020 21:00:24 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:36709 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729427AbgANCAY (ORCPT ); Mon, 13 Jan 2020 21:00:24 -0500 Received: by mail-lf1-f68.google.com with SMTP id n12so8481925lfe.3 for ; Mon, 13 Jan 2020 18:00:22 -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=8TABIaesLWHDdS8DK0RdBcbOgWuOS8JDBz9kVGBhjg8=; b=uRmU8IrV2Kwgz/8qAURHetLcRDt3Xpz+7Q+UEKS2zWcNKTiiWfpPHx5mdVxEnoixfX 36yfOm0yDR879p/RKRBHVx8EtNtQJ5qBPMyzweYPSU2w+444J8Jt9SRsRZG0wvAu9hQu TauGzJurlrQNCk4DOMnvefBI8pHg2UTDjnnbZcoTeTZtYnTGE6HYxiAN5+0wQmhB3I+n o4c7A5cNIUw0C+gAcNQHLOeJ9jUE9sSW0fPJgXejwbEVaD6zo5fCH+HvVYL1Jf6Of71+ Rjmp2ryhqLzn2vcPE2we56FnkGK8xyLaeHLN5XaF7oeaqGv5nHLLzbbx3EBoF93P34/N bkxg== 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=8TABIaesLWHDdS8DK0RdBcbOgWuOS8JDBz9kVGBhjg8=; b=sm8SxzbIeb82HWHMSUYrc5tcYHJT3EEpFmQ2j7QdNZ6FG5NktugybDiFn6oMqjmVxB tfix7SA82KaPKXGu8wPAoFJpkI0Hl08LhGzhG81yK7+ETWDICrntHS7K/u6FNAusIvqS t95QA2EIfEWNqLIa/EJRjaek/ATFCC4QyDUXmEu947cgUkJar9DFBZ9w+60KFVfO3Ny9 xXtU5JrzNWzrFuK3fey3mWlL0XcQ0tlIEPQUP+y53xbM0g/SJZdaiMz5haUkTP6ukk2v gU8UuogHZ9Cy1ULCoAOyK0LG82xLnop7IKtOVOf1zH4Gu/WeuH8EGQVTUaZRqB2+ZnLo hA1g== X-Gm-Message-State: APjAAAXi7Ld0XxSc4L8WK4RtKDhO0cggXO8FSFXKvHBUqZDjOlU7n6s2 P1cSNk/LzmWQaOOMBOJfR74l1YA1e0GU4OQgUhU= X-Google-Smtp-Source: APXvYqwUIQSiQcj1gBt1vZS9VSYTqmqQ5Z0LwWrxO9JJb50ZRngJxt2wHTwfjP90rCFRNHVqaZezjew947fjp7tLGnk= X-Received: by 2002:ac2:5498:: with SMTP id t24mr250782lfk.84.1578967222098; Mon, 13 Jan 2020 18:00:22 -0800 (PST) MIME-Version: 1.0 References: <20200109152133.23649-1-philmd@redhat.com> <20200109152133.23649-15-philmd@redhat.com> In-Reply-To: <20200109152133.23649-15-philmd@redhat.com> From: Alistair Francis Date: Tue, 14 Jan 2020 11:59:55 +1000 Message-ID: Subject: Re: [PATCH 14/15] accel/accel: 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 Fri, Jan 10, 2020 at 1:40 AM 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 I feel like this could be squashed with the one that adds this function, but either way: Reviewed-by: Alistair Francis Alistair > --- > accel/accel.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/accel/accel.c b/accel/accel.c > index cb555e3b06..777d6ba119 100644 > --- a/accel/accel.c > +++ b/accel/accel.c > @@ -65,7 +65,9 @@ int accel_init_machine(AccelState *accel, MachineState = *ms) > > AccelState *current_accel(void) > { > - return current_machine->accelerator; > + MachineState *ms =3D MACHINE(qdev_get_machine()); > + > + return ms->accelerator; > } > > void accel_setup_post(MachineState *ms) > -- > 2.21.1 > >