From patchwork Wed Dec 19 18:16:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avik Sil X-Patchwork-Id: 207493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4F6262C0094 for ; Thu, 20 Dec 2012 05:17:28 +1100 (EST) Received: from localhost ([::1]:45195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlOCs-0004aZ-BP for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 13:17:26 -0500 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 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 19 Dec 2012 23:46:22 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id B34B3125804F; Wed, 19 Dec 2012 23:46:44 +0530 (IST) Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBJIGlOc45875234; Wed, 19 Dec 2012 23:46:47 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBJIGmer014066; Thu, 20 Dec 2012 05:16:48 +1100 Received: from aviksil-thinkpad.in.ibm.com ([9.79.213.152]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBJIGhv3013839; Thu, 20 Dec 2012 05:16:47 +1100 From: Avik Sil To: aliguori@us.ibm.com, agraf@suse.de Date: Wed, 19 Dec 2012 23:46:42 +0530 Message-Id: <1355941002-12483-3-git-send-email-aviksil@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 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> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12121918-2674-0000-0000-0000072FFA67 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.9 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)