From nobody Tue Feb 10 00:22:43 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606142600; cv=none; d=zohomail.com; s=zohoarc; b=EzcrfUb4HyYLxbQSjQ4/Z7addoHD6Iwilbg8+VPa9GZYtgLmKGuOSz/L6GVrMBqL8K7kEgf66VTPtc2GX9V4yo9fjySyhT35byBATdiET/n8RIezUnSJn5Yz+rqJvIzWRe3KQXmqkz6Aipn+Q5/TbjGG5OdBVjLDL+oltCSVA4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606142600; h=Content-Type:Content-Transfer-Encoding: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=+v7k+u/1BuxYQ9O89C5h4ygnZ/IZtmV8MnoYxWKwlU0=; b=gJ2i68Q7m9YFjtaUvpu3DGS4ai8HjSVtZw830xCXJRrqD6mvy3I2Bm/pcnJmi9ECEsLCptCyHQ3+xlQMImSMh3f2zMZ1Wqgg4tNvcRcY0ALSEYJI3hMdNsP0mzZAvFrLsUcVn3rg/cFh/zDnNcu4hzHGvwVzAkWBPmkBVtWsx/4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1606142600678131.15545019739739; Mon, 23 Nov 2020 06:43:20 -0800 (PST) Received: from localhost ([::1]:52780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khD3n-00068G-Jd for importer@patchew.org; Mon, 23 Nov 2020 09:43:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khCdS-0005Eh-Us for qemu-devel@nongnu.org; Mon, 23 Nov 2020 09:16:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khCdQ-0008Ny-QA for qemu-devel@nongnu.org; Mon, 23 Nov 2020 09:16:06 -0500 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-407-yBxNn2NEOaSNA9s-4CiZhg-1; Mon, 23 Nov 2020 09:14:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B07825221 for ; Mon, 23 Nov 2020 14:14:58 +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 7406D60C13 for ; Mon, 23 Nov 2020 14:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606140964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+v7k+u/1BuxYQ9O89C5h4ygnZ/IZtmV8MnoYxWKwlU0=; b=TaNDxB2BOrSL8DebpERGlFXOJCp3a/tEyNpzOhAILaihs/UZFy/S/UONhHmqzykKjRlhfI Lvs/y7T0dC4XeF6EaCRZWMxL6PAgbuw5AYTxKd0Wj3ZTWbUTS/sevWtEoGwMRjQQrSxRVY sc0oekHQPo27kLvE0HEfeWY5s1FIJ7E= X-MC-Unique: yBxNn2NEOaSNA9s-4CiZhg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 35/36] vl: clean up -boot variables Date: Mon, 23 Nov 2020 09:14:34 -0500 Message-Id: <20201123141435.2726558-36-pbonzini@redhat.com> In-Reply-To: <20201123141435.2726558-1-pbonzini@redhat.com> References: <20201123141435.2726558-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H3=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move more of them into MachineState, in preparation for moving initializati= on of the machine out of vl.c. Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov --- include/hw/boards.h | 1 + softmmu/vl.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 4537cfb5c6..b9233af54a 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -283,6 +283,7 @@ struct MachineState { ram_addr_t maxram_size; uint64_t ram_slots; const char *boot_order; + const char *boot_once; char *kernel_filename; char *kernel_cmdline; char *initrd_filename; diff --git a/softmmu/vl.c b/softmmu/vl.c index d76f87028d..aeb988bcad 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -132,8 +132,6 @@ typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) Bloc= kdevOptionsQueue; =20 static const char *cpu_option; static const char *mem_path; -static const char *boot_order; -static const char *boot_once; static const char *incoming; static const char *loadvm; static ram_addr_t maxram_size; @@ -1733,6 +1731,8 @@ static void qemu_apply_machine_options(void) { MachineClass *machine_class =3D MACHINE_GET_CLASS(current_machine); QemuOpts *machine_opts =3D qemu_get_machine_opts(); + const char *boot_order =3D NULL; + const char *boot_once =3D NULL; QemuOpts *opts; =20 qemu_opt_foreach(machine_opts, machine_set_property, current_machine, @@ -1762,6 +1762,7 @@ static void qemu_apply_machine_options(void) } =20 current_machine->boot_order =3D boot_order; + current_machine->boot_once =3D boot_once; } =20 static void qemu_create_early_backends(void) @@ -2444,9 +2445,9 @@ static void qemu_machine_creation_done(void) =20 qdev_prop_check_globals(); =20 - if (boot_once) { - qemu_boot_set(boot_once, &error_fatal); - qemu_register_reset(restore_boot_order, g_strdup(boot_order)); + if (current_machine->boot_once) { + qemu_boot_set(current_machine->boot_once, &error_fatal); + qemu_register_reset(restore_boot_order, g_strdup(current_machine->= boot_order)); } =20 if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { --=20 2.26.2