2010/11/10 Gleb Natapov <g...@redhat.com>: > On Wed, Nov 10, 2010 at 07:11:54PM +0000, Blue Swirl wrote: >> On Wed, Nov 10, 2010 at 5:14 PM, Gleb Natapov <g...@redhat.com> wrote: >> > >> > Signed-off-by: Gleb Natapov <g...@redhat.com> >> > --- >> > hw/fw_cfg.h | 1 + >> > hw/pc.c | 19 +++++++++++++++++++ >> > sysemu.h | 1 + >> > vl.c | 40 ++++++++++++++++++++++++++++++++++++++++ >> > 4 files changed, 61 insertions(+), 0 deletions(-) >> > >> > diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h >> > index 4d13a4f..bfbf1f9 100644 >> > --- a/hw/fw_cfg.h >> > +++ b/hw/fw_cfg.h >> > @@ -31,6 +31,7 @@ >> > #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_BOOTINDEX (FW_CFG_MAX_ENTRY + 1) >> > >> > #define FW_CFG_WRITE_CHANNEL 0x4000 >> > #define FW_CFG_ARCH_LOCAL 0x8000 >> > diff --git a/hw/pc.c b/hw/pc.c >> > index 3bf3862..e51f8ba 100644 >> > --- a/hw/pc.c >> > +++ b/hw/pc.c >> > @@ -883,6 +883,21 @@ void pc_cpus_init(const char *cpu_model) >> > } >> > } >> > >> > +static struct machine_ready_notify { >> > + Notifier n; >> > + void *fw_cfg; >> > +} machine_ready; >> > + >> > + >> > +static void pc_fw_register_bootindex(struct Notifier* n) >> > +{ >> > + uint32_t len; >> > + char *bootindex = get_boot_devices_list(&len); >> > + >> > + fw_cfg_add_bytes(machine_ready.fw_cfg, FW_CFG_BOOTINDEX, >> > + (uint8_t*)bootindex, len); >> > +} >> > + >> > void pc_memory_init(ram_addr_t ram_size, >> > const char *kernel_filename, >> > const char *kernel_cmdline, >> > @@ -982,6 +997,10 @@ void pc_memory_init(ram_addr_t ram_size, >> > for (i = 0; i < nb_option_roms; i++) { >> > rom_add_option(option_rom[i]); >> > } >> > + >> > + machine_ready.n.notify = pc_fw_register_bootindex; >> > + machine_ready.fw_cfg = fw_cfg; >> > + qemu_add_machine_init_done_notifier(&machine_ready.n); >> >> Actually this and the above should be moved to generic code, like >> vl.c. I doubt this would be any different for other platforms. > Agree, but we do not have reference to fw_cfg in generic code.
How about inside fw_cfg.c then? -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html