On Sun, Nov 14, 2010 at 3:39 PM, Gleb Natapov <g...@redhat.com> wrote: > > Signed-off-by: Gleb Natapov <g...@redhat.com> > --- > hw/fw_cfg.c | 14 ++++++++++++++ > hw/fw_cfg.h | 4 +++- > sysemu.h | 1 + > vl.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 69 insertions(+), 1 deletions(-) > > diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c > index 7b9434f..f6a67db 100644 > --- a/hw/fw_cfg.c > +++ b/hw/fw_cfg.c > @@ -53,6 +53,7 @@ struct FWCfgState { > FWCfgFiles *files; > uint16_t cur_entry; > uint32_t cur_offset; > + Notifier machine_ready; > }; > > static void fw_cfg_write(FWCfgState *s, uint8_t value) > @@ -315,6 +316,15 @@ int fw_cfg_add_file(FWCfgState *s, const char > *filename, uint8_t *data, > return 1; > } > > +static void fw_cfg_machine_ready(struct Notifier* n) > +{ > + uint32_t len; > + char *bootindex = get_boot_devices_list(&len); > + > + fw_cfg_add_bytes(container_of(n, FWCfgState, machine_ready), > + FW_CFG_BOOTINDEX, (uint8_t*)bootindex, len); > +} > + > FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, > target_phys_addr_t ctl_addr, target_phys_addr_t > data_addr) > { > @@ -343,6 +353,10 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t > data_port, > fw_cfg_add_i16(s, FW_CFG_MAX_CPUS, (uint16_t)max_cpus); > fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu); > > + > + s->machine_ready.notify = fw_cfg_machine_ready; > + qemu_add_machine_init_done_notifier(&s->machine_ready); > + > return s; > } > > diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h > index 856bf91..4d61410 100644 > --- a/hw/fw_cfg.h > +++ b/hw/fw_cfg.h > @@ -30,7 +30,9 @@ > > #define FW_CFG_FILE_FIRST 0x20 > #define FW_CFG_FILE_SLOTS 0x10 > -#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) > +#define FW_CFG_FILE_LAST_SLOT (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS) > +#define FW_CFG_BOOTINDEX (FW_CFG_FILE_LAST_SLOT + 1) > +#define FW_CFG_MAX_ENTRY FW_CFG_BOOTINDEX
This should be #define FW_CFG_MAX_ENTRY (FW_CFG_BOOTINDEX + 1) because the check is like this: if ((key & FW_CFG_ENTRY_MASK) >= FW_CFG_MAX_ENTRY) { s->cur_entry = FW_CFG_INVALID; With that change, I got the bootindex passed to OpenBIOS: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 bootindex num_strings 1 bootindex /p...@000001fe00000000/i...@5/dr...@1/d...@0 The device path does not match exactly, but it's close: /p...@1fe,0/pci-...@5/i...@600/d...@0