From patchwork Sun Nov 14 15:39:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 323692 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAEFeTSZ023950 for ; Sun, 14 Nov 2010 15:40:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756156Ab0KNPkM (ORCPT ); Sun, 14 Nov 2010 10:40:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46561 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756186Ab0KNPjs (ORCPT ); Sun, 14 Nov 2010 10:39:48 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAEFdjCp032356 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 14 Nov 2010 10:39:45 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAEFdhW7010654; Sun, 14 Nov 2010 10:39:44 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id AED76133A10; Sun, 14 Nov 2010 17:39:41 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, mst@redhat.com, kevin@koconnor.net Subject: [PATCHv4 15/15] Pass boot device list to firmware. Date: Sun, 14 Nov 2010 17:39:41 +0200 Message-Id: <1289749181-12070-16-git-send-email-gleb@redhat.com> In-Reply-To: <1289749181-12070-1-git-send-email-gleb@redhat.com> References: <1289749181-12070-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sun, 14 Nov 2010 15:40:30 +0000 (UTC) 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 #define FW_CFG_WRITE_CHANNEL 0x4000 #define FW_CFG_ARCH_LOCAL 0x8000 diff --git a/sysemu.h b/sysemu.h index c42f33a..38a20a3 100644 --- a/sysemu.h +++ b/sysemu.h @@ -196,4 +196,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 918d988..cca1e76 100644 --- a/vl.c +++ b/vl.c @@ -735,6 +735,57 @@ void add_boot_device_path(int32_t bootindex, DeviceState *dev, QTAILQ_INSERT_TAIL(&fw_boot_order, node, link); } +/* + * This function returns device list as an array in a below format: + * +-----+-----+---------------+-----+---------------+-- + * | n | l1 | devpath1 | l2 | devpath2 | ... + * +-----+-----+---------------+-----+---------------+-- + * where: + * n - a number of devise pathes (one byte) + * l - length of following device path string (one byte) + * devpath - non-null terminated string of length l representing + * one device path + */ +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];