2010/11/10 Gleb Natapov <gleb@xxxxxxxxxx>:
> On Wed, Nov 10, 2010 at 07:11:54PM +0000, Blue Swirl wrote:
>> On Wed, Nov 10, 2010 at 5:14 PM, Gleb Natapov <gleb@xxxxxxxxxx> wrote:
>> >
>> > Signed-off-by: Gleb Natapov <gleb@xxxxxxxxxx>
>> > ---
>> > Â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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
