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)
You should bump FW_CFG_MAX_ENTRY instead.
> Â#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);
> Â}
>
> Âqemu_irq *pc_allocate_cpu_irq(void)
> diff --git a/sysemu.h b/sysemu.h
> index 46a588c..bac2df1 100644
> --- a/sysemu.h
> +++ b/sysemu.h
> @@ -197,4 +197,5 @@ void register_devices(void);
>
> Âvoid add_boot_device_path(int32_t bootindex, DeviceState *dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â const char *suffix);
> +char *get_boot_devices_list(uint32_t *size);
> Â#endif
> diff --git a/vl.c b/vl.c
> index 00ab2b4..4b1a406 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -734,6 +734,46 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev,
> Â Â QTAILQ_INSERT_TAIL(&fw_boot_order, node, link);
> Â}
>
> +char *get_boot_devices_list(uint32_t *size)
> +{
> + Â ÂFWBootEntry *i;
> + Â Âuint32_t total = 1, c = 0;
> + Â Âchar *list = qemu_malloc(1);
> +
> + Â ÂQTAILQ_FOREACH(i, &fw_boot_order, link) {
> + Â Â Â Âchar *devpath = NULL, *bootpath;
> + Â Â Â Âint len;
> +
> + Â Â Â Âif (i->dev) {
> + Â Â Â Â Â Âdevpath = qdev_get_fw_dev_path(i->dev);
> + Â Â Â Â Â Âassert(devpath);
> + Â Â Â Â}
> +
> + Â Â Â Âif (i->suffix && devpath) {
> + Â Â Â Â Â Âbootpath = qemu_malloc(strlen(devpath) + strlen(i->suffix) + 2);
> + Â Â Â Â Â Âsprintf(bootpath, "%s/%s", devpath, i->suffix);
> + Â Â Â Â Â Âqemu_free(devpath);
> + Â Â Â Â} else if (devpath) {
> + Â Â Â Â Â Âbootpath = devpath;
> + Â Â Â Â} else {
> + Â Â Â Â Â Âbootpath = strdup(i->suffix);
> + Â Â Â Â}
> +
> + Â Â Â Âlen = strlen(bootpath);
> + Â Â Â Âlist = qemu_realloc(list, total + len + 1);
> + Â Â Â Âlist[total++] = len;
> + Â Â Â Âmemcpy(&list[total], bootpath, len);
> + Â Â Â Âtotal += len;
> + Â Â Â Âc++;
> + Â Â Â Âqemu_free(bootpath);
> + Â Â}
> +
> + Â Âlist[0] = c;
> + Â Â*size = total;
> +
> + Â Âreturn list;
> +}
The format of the list should be documented, it wasn't immediately
obvious where '1' comes from in qemu_malloc(1).
--
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
