From patchwork Tue Sep 1 18:34:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 1355320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=JBQwzPAu; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bgwtq38bTz9sSP for ; Wed, 2 Sep 2020 04:43:15 +1000 (AEST) Received: from localhost ([::1]:46266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDBFQ-0005YH-Lb for incoming@patchwork.ozlabs.org; Tue, 01 Sep 2020 14:43:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDB7l-0001iZ-OW for qemu-devel@nongnu.org; Tue, 01 Sep 2020 14:35:17 -0400 Received: from mout.gmx.net ([212.227.15.15]:49869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDB7i-0008Dg-Av for qemu-devel@nongnu.org; Tue, 01 Sep 2020 14:35:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1598985296; bh=vw8bGZyavPiuNJqGPu8Pu9oaZpooKHADWrXrJJKoI0U=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JBQwzPAuJpJyfsEfmtyTJPi7g2POkVV4cotISU7cdrikbkVfBUm5n38moNPslSgsJ +x08gAWD26EKS0Dxsnm+o2dFfr4/jYpO7sr5zgx2ZkXlMz+tDQDODS4JCd4FxPr48f koClgYWro1qQ33tUGoggNlYPeEeaJXZr+cb4iirc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from ls3530.fritz.box ([92.116.187.2]) by mail.gmx.com (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M8QS2-1kHYpc1qHg-004RFL; Tue, 01 Sep 2020 20:34:56 +0200 From: Helge Deller To: qemu-devel@nongnu.org Subject: [PATCH 3/7] hw/hppa: Store boot device in fw_cfg section Date: Tue, 1 Sep 2020 20:34:48 +0200 Message-Id: <20200901183452.24967-4-deller@gmx.de> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200901183452.24967-1-deller@gmx.de> References: <20200901183452.24967-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:MxtCg/LyBZXTgnO42TujnqCuaFJ19+UMg539NSzGgSEqd5cNt02 cjCzyytQDd6BYhYDssuByGSexWOjStAgUxYPMxEtYNbQvKscFDD42MrbUDEiwNCDVgEdGLZ b3ain4UNDrBNjuh10DfrfLhKzaJMyb5PagVcsJnc8+wzBYlAN/GV1ugSPn0IlcH2MU7SOro aPPzSuYWFyd/wNAVnfJmg== X-UI-Out-Filterresults: notjunk:1;V03:K0:SBkjwtQO7y0=:BKsZWsrNhgN7mboytvvLL4 u6OytDN0FjlvVOr5Cd5ipSG1r4PcgERwFg8lYIVHWVklVAK15B/4VVYz5UMhkubqhcrs1C33f zVY9OiAiQOKU6NimY1M1HlkhXtPTIxKnYvFUzhic4DnfdClFi0rGGHcHRBPUr33nRPYABKdWo Y3nuNEwI/dWeKQryYcvQYbFW5ZCgMjDpY+euTvXS3zxpaRbLLlRkq7TJBU5YDU9sQx8IJ+I4G s6nV8LF7r5l1AXcbtV/oenzjEa+WGhx9b12aiRznqwG3hb609CF0zA/yaFlhASRUA16oMNEoD O+w2SPssuNO9RRPl5GKkdHQjTlM/oY5wGJfm7lKxxr97yyz/hs443vAwu9Our9FdbRO4Y7vs/ GpTFUy4sZVEGAkxEx5d1mgMzyg2yllql64VeFqJdKPltyvJ8Y5kzERblBAntaPiDZNJorKTmx nCoP4mnIjeYPit76I7JE+K2b333u1PfU1TtxmBBJntD1UQKc43+HgktbB+NhsAIxAwfJbIAg1 fQE6UNzDFjg6kGKMURYmOfKktj/plvwq7dRMiGdedGrjbPx6prqe9pHvXErGHHk4ufjGu5+wq aMyI2L5MZO4XZiuCWZbuZ3+0Hhejj8jmytamAfIAOXcRN974FjzO/PTipiv56qekw4KX+vugJ Fvmrndzm1yyDDgRXa6p7M1Fe5znH/YqW6wUjfjeWKqBJrgr1nO/zDvFDs9P7uBuX2JTf0VmTI 96Qcmedc8I3DEXZBC24dAlkpZbFBDcdv38xb+TKvUnUr8VzR7CVeLZt+KOjeQQuabDXa6eUdI orjxfl3JWPpisGqbB9kXcGpSqywODge2ClfSrv1Mmhy/SXS0Oh4w/TAaT+P6nvBq9T+pKcA/S j3zRJOCZj9l+fqSp4fs41QEankT6ch9JKw5kkuD0FwiEmoCa58vXFG9WjtFNbFXpWY+08OgqR DPJJfpbjEmJYJgBU+rBntRgAjPgHI63yYIGNS0Wl1z2uCXQJh3IjOM6w8JFgyZP6v2e0q2ZzW O7sJp2++UDthRJkD7TZnKy8rqDYwdRFcJkON0zzvopMmjIlsdspahc0UnYrqR3N1CZauXh5tk Tb6noAkaL7I0gGW+0AQTbUwHdUVy5UvX5YSDfrbonpbrhwaDTkFBjtHhAra+zHpYVm/mfZueh J0nSuSbPVV41WyHBuCkC/SfamNVQ64jg/+x9gJFHDlwbiFtnp5OyGlm2ZGh4a7RgbDtPXhBys IS3D0JEZs61wvMPkC Received-SPF: pass client-ip=212.227.15.15; envelope-from=deller@gmx.de; helo=mout.gmx.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 14:35:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Helge Deller , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- hw/hppa/machine.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.21.3 diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index e9d84d0f03..4b35afc9d5 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -58,6 +58,12 @@ static uint64_t cpu_hppa_to_phys(void *opaque, uint64_t addr) static HPPACPU *cpu[HPPA_MAX_CPUS]; static uint64_t firmware_entry; +static void fw_cfg_boot_set(void *opaque, const char *boot_device, + Error **errp) +{ + fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]); +} + static FWCfgState *create_fw_cfg(MachineState *ms) { FWCfgState *fw_cfg; @@ -80,6 +86,9 @@ static FWCfgState *create_fw_cfg(MachineState *ms) fw_cfg_add_file(fw_cfg, "/etc/cpu/btlb_entries", g_memdup(&val, sizeof(val)), sizeof(val)); + fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, ms->boot_order[0]); + qemu_register_boot_set(fw_cfg_boot_set, fw_cfg); + return fw_cfg; }