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 89E8DC33CA9 for ; Tue, 14 Jan 2020 02:00:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5533920CC7 for ; Tue, 14 Jan 2020 02:00:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F/2EGDDC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729470AbgANCA6 (ORCPT ); Mon, 13 Jan 2020 21:00:58 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:44273 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729427AbgANCA6 (ORCPT ); Mon, 13 Jan 2020 21:00:58 -0500 Received: by mail-lf1-f67.google.com with SMTP id v201so8465738lfa.11 for ; Mon, 13 Jan 2020 18:00:57 -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=jIOw/CbzXybkeMH1o84BTHPma96iahA5s5mXf7EbPk0=; b=F/2EGDDC2WMeINqtbvPOP6hek9GQs8wGt5hGy2hjzrUb+9ElYoc0NdDXkcStJx3NUM dY+yg5+BJY9/galzSJ6/BnzwwDlHVHm7vY+3lCjUlap+A/NRZyB8XrhB2CbucKLr2ICo NXi6qbwodf9FCH/h1Rgs5hAULbEk5h+wWwdJXAffR9ukxUykbQ0ClU687A0xvKGB0dxM 3GCEOgcMaPrcOjCyPGKR7kooF/lagCH882ycJtKvvAY2qhCQ1V9UdwNECGVZffPyZRqc XGxqgretv6V6c/cs1s/DYMUqTDmAyTXxO6CZvHp4yBtmdAThPBr7BjDDZBwAIrbjY8Ug XBNA== 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=jIOw/CbzXybkeMH1o84BTHPma96iahA5s5mXf7EbPk0=; b=FBIzndNjcafHvOWCyQ2HelFxeK9l/6vFqUPlsBVZJOhlksgq2QnPva86/0llg+d7OW 2YedV36LjAc8sOfbiTmUiuoXESGy5NpZeNm0pSXtte30v7kkbS6rlS87B1WeIlpABDvj mTB1xPLV0rTTgZJ9IQux0Dynw9HSuimKWfDQvM8frG/8J4xIXX46M+9awvVDP6EMjMRq kqXllQwxo5gdgxno2CVzSV9/BjQmxyU7KwRy3+M9W5v5VtCS119n5EY7vgvbNs+zeWxS dj+S36liJNsYueEi2oSxmLdHxkkR8pUpT5eIUh055oxu2CZdHrDXPvf0WZRwy6fwnVkv bQPA== X-Gm-Message-State: APjAAAUKPm/KUyZydym7l1ejqNpa8EmbbVsovMozvNI0Texblo5BZVls bg6r9iAjpepSXu7XgT3G6jmsjwA+nEQIjgGkWHI= X-Google-Smtp-Source: APXvYqy0yOxpo2ZhrAVQmvYzqkDqXbC7rHMR28Xir3J+/oJ9W0WgJXcuHpsQDEKYMEI20F51m0GHIdp0kwKp1u+TE+I= X-Received: by 2002:a19:4ac2:: with SMTP id x185mr215459lfa.131.1578967256625; Mon, 13 Jan 2020 18:00:56 -0800 (PST) MIME-Version: 1.0 References: <20200109152133.23649-1-philmd@redhat.com> <20200109152133.23649-16-philmd@redhat.com> In-Reply-To: <20200109152133.23649-16-philmd@redhat.com> From: Alistair Francis Date: Tue, 14 Jan 2020 12:00:30 +1000 Message-ID: Subject: Re: [PATCH 15/15] vl: Make current_machine a local variable 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:34 AM Philippe Mathieu-Daud=C3=A9 wrote: > > Since we now only use current_machine in vl.c, stop exporting > it as a global variable in "hw/board.h", and make it static > to vl.c. > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > include/hw/boards.h | 2 -- > vl.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 61f8bb8e5a..b0c0d4376d 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -59,8 +59,6 @@ void memory_region_allocate_system_memory(MemoryRegion = *mr, Object *owner, > #define MACHINE_CLASS(klass) \ > OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) > > -extern MachineState *current_machine; > - > void machine_run_board_init(MachineState *machine); > bool machine_usb(MachineState *machine); > int machine_phandle_start(MachineState *machine); > diff --git a/vl.c b/vl.c > index 3ff3548183..7a69af4bef 100644 > --- a/vl.c > +++ b/vl.c > @@ -214,6 +214,8 @@ static int default_sdcard =3D 1; > static int default_vga =3D 1; > static int default_net =3D 1; > > +static MachineState *current_machine; > + > static struct { > const char *driver; > int *flag; > @@ -1164,8 +1166,6 @@ static int usb_parse(const char *cmdline) > /***********************************************************/ > /* machine registration */ > > -MachineState *current_machine; > - > static MachineClass *find_machine(const char *name, GSList *machines) > { > GSList *el; > -- > 2.21.1 > >