From patchwork Wed Nov 10 17:14:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 70665 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6043BB70ED for ; Thu, 11 Nov 2010 04:42:51 +1100 (EST) Received: from localhost ([127.0.0.1]:38983 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEHo-0001G3-B3 for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 12:16:40 -0500 Received: from [140.186.70.92] (port=42598 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEFj-0001AG-Up for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGEFf-0005Cs-Mo for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15041) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGEFf-0005C2-FC for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:27 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAAHEPbl019860 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Nov 2010 12:14:25 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAAHEObI014610; Wed, 10 Nov 2010 12:14:25 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 6D46F133A0F; Wed, 10 Nov 2010 19:14:22 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 19:14:21 +0200 Message-Id: <1289409261-5418-15-git-send-email-gleb@redhat.com> In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com> References: <1289409261-5418-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org, mst@redhat.com Subject: [Qemu-devel] [PATCHv3 14/14] Pass boot device list to firmware. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gleb Natapov --- 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); } 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; +} + static void numa_add(const char *optarg) { char option[128];