]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
hw/hppa: Store boot device in fw_cfg section
authorHelge Deller <deller@gmx.de>
Sun, 9 Aug 2020 15:06:50 +0000 (17:06 +0200)
committerHelge Deller <deller@gmx.de>
Wed, 2 Sep 2020 21:16:49 +0000 (23:16 +0200)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Helge Deller <deller@gmx.de>
hw/hppa/machine.c

index e9d84d0f032d20f418810e38556414ae86fcf59b..4b35afc9d50b66ac1b01885548f3eb879e325148 100644 (file)
@@ -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;
 }