From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlOCY-0004Lv-Kw for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:17:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlOCX-00022Z-C0 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:17:06 -0500 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:56388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlOCW-00020K-OD for qemu-devel@nongnu.org; Wed, 19 Dec 2012 13:17:05 -0500 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Dec 2012 23:46:25 +0530 From: Avik Sil Date: Wed, 19 Dec 2012 23:46:42 +0530 Message-Id: <1355941002-12483-3-git-send-email-aviksil@linux.vnet.ibm.com> In-Reply-To: <1355941002-12483-1-git-send-email-aviksil@linux.vnet.ibm.com> References: <1355941002-12483-1-git-send-email-aviksil@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, agraf@suse.de Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au This patch removes the default boot order for pseries machine. This allows the machine to handle a NULL boot order in case no -boot option is provided. Thus it helps SLOF firmware to verify if boot order is specified in command line or not. If no boot order is provided SLOF tries to boot from the device set in the nvram. Signed-off-by: Avik Sil --- hw/spapr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index a4a65c7..abfa0d9 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -284,7 +284,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model, _FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop)))); } - _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); + if (boot_device) { + _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device))); + } _FDT((fdt_property_cell(fdt, "qemu,graphic-width", graphic_width))); _FDT((fdt_property_cell(fdt, "qemu,graphic-height", graphic_height))); _FDT((fdt_property_cell(fdt, "qemu,graphic-depth", graphic_depth))); @@ -960,7 +962,7 @@ static QEMUMachine spapr_machine = { .block_default_type = IF_SCSI, .max_cpus = MAX_CPUS, .no_parallel = 1, - DEFAULT_MACHINE_OPTIONS, + .boot_order = NULL, }; static void spapr_machine_init(void) -- 1.7.11.7