From nobody Tue Feb 10 05:46:24 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603315178; cv=none; d=zohomail.com; s=zohoarc; b=UfAmhNMACTG6z+8avWHKRgpYuedx5cKtOIEfemJuXp7fdBR4vokAFYPxZhVy5Hy4RCc3secgAx1O4w+UtNmDt3jmc/iWRJdHBQRC7W9m5nUJByHrFVXv7xL9Y3JyUipXC2BBX1s/g5Kv3LLOW6yZyUnykHKIeQM7qCogNQ4pPQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603315178; 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=e0egizT1LhBTypV0Z8jUS6/aYGmVEDSIu03qH+texvk=; b=GEBFWdCtJ+ib8JAI/qH5N08LQhh7fxrCzJc6khoFPAFGlYfsoCl/i2J5U1PYGmhWeZgeFRW+Dky0+XgwgqJBPETPTyqazj0mGN6pLufRwl8LpB+y1jNtGCc33pDdfMzgZTFXKW3nd0zY0Ro387RH5HkqkaoGWk4+yEBkxoYqWi4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 160331517841941.41418490832382; Wed, 21 Oct 2020 14:19:38 -0700 (PDT) Received: from localhost ([::1]:57612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVLWC-0003WF-Ly for importer@patchew.org; Wed, 21 Oct 2020 17:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVLB4-0005nc-A5 for qemu-devel@nongnu.org; Wed, 21 Oct 2020 16:57:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVLAx-0006gP-Cw for qemu-devel@nongnu.org; Wed, 21 Oct 2020 16:57:45 -0400 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-494-EsPWbHgVNbKl-iQGy-ONqg-1; Wed, 21 Oct 2020 16:57:30 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4CA4186DD48 for ; Wed, 21 Oct 2020 20:57:28 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 353326EF62; Wed, 21 Oct 2020 20:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603313851; 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=e0egizT1LhBTypV0Z8jUS6/aYGmVEDSIu03qH+texvk=; b=K3GajrGLKgcpe8xr9tiepTUUAUE1Ld6bPleBTtBd3h/cSicHgHwMlJeKZQnbmterQ3Mg/H u5Byf++idpzaZdlesWzUDqtDgQQs23sJeBXpZ2UtNui3sjtOZsOX1a2NtgPT5VmnDqkkYa fXc6fxotmmIHMTN1vZqd9T/PIaShb08= X-MC-Unique: EsPWbHgVNbKl-iQGy-ONqg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/22] vl: move bios_name out of softmmu/vl.c Date: Wed, 21 Oct 2020 16:57:06 -0400 Message-Id: <20201021205716.2359430-13-pbonzini@redhat.com> In-Reply-To: <20201021205716.2359430-1-pbonzini@redhat.com> References: <20201021205716.2359430-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 22:12:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: jsnow@redhat.com, berrange@redhat.com, ehabkost@redhat.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" bios_name is a legacy variable used by machine code. Hide it from softmmu/vl.c. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/machine.c | 5 +++++ softmmu/vl.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 3c674bb05e..e4dac350d4 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -212,6 +212,8 @@ GlobalProperty hw_compat_2_1[] =3D { }; const size_t hw_compat_2_1_len =3D G_N_ELEMENTS(hw_compat_2_1); =20 +const char *bios_name =3D NULL; + static char *machine_get_kernel(Object *obj, Error **errp) { MachineState *ms =3D MACHINE(obj); @@ -396,6 +398,9 @@ static void machine_set_firmware(Object *obj, const cha= r *value, Error **errp) =20 g_free(ms->firmware); ms->firmware =3D g_strdup(value); + + /* HACK */ + bios_name =3D ms->firmware; } =20 static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **e= rrp) diff --git a/softmmu/vl.c b/softmmu/vl.c index 52e7d317d7..e32e209a82 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -123,7 +123,6 @@ static int data_dir_idx; static const char *mem_path; static const char *boot_order; static const char *boot_once; -const char *bios_name =3D NULL; enum vga_retrace_method vga_retrace_method =3D VGA_RETRACE_DUMB; int display_opengl; const char* keyboard_layout =3D NULL; @@ -4314,7 +4313,6 @@ void qemu_init(int argc, char **argv, char **envp) kernel_filename =3D qemu_opt_get(machine_opts, "kernel"); initrd_filename =3D qemu_opt_get(machine_opts, "initrd"); kernel_cmdline =3D qemu_opt_get(machine_opts, "append"); - bios_name =3D qemu_opt_get(machine_opts, "firmware"); =20 opts =3D qemu_opts_find(qemu_find_opts("boot-opts"), NULL); if (opts) { --=20 2.26.2