From patchwork Tue Jan 8 07:06:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avik Sil X-Patchwork-Id: 210300 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 36E282C0095 for ; Tue, 8 Jan 2013 18:07:04 +1100 (EST) Received: from localhost ([::1]:46589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsTH4-00032P-13 for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2013 02:07:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsTGr-00030h-4d for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:06:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsTGo-0005XT-3i for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:06:49 -0500 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:44150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsTGn-0005WJ-IZ for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:06:46 -0500 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jan 2013 16:59:23 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Jan 2013 16:59:20 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 9674C2BB004B; Tue, 8 Jan 2013 18:06:40 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0876drg57737358; Tue, 8 Jan 2013 18:06:40 +1100 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0876dH7001108; Tue, 8 Jan 2013 18:06:39 +1100 Received: from aviksil-thinkpad.in.ibm.com ([9.77.124.5]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0876VQB032699; Tue, 8 Jan 2013 18:06:37 +1100 From: Avik Sil To: aliguori@us.ibm.com, agraf@suse.de Date: Tue, 8 Jan 2013 12:36:31 +0530 Message-Id: <1357628791-11974-3-git-send-email-aviksil@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357628791-11974-1-git-send-email-aviksil@linux.vnet.ibm.com> References: <1357628791-11974-1-git-send-email-aviksil@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13010806-9264-0000-0000-000002F4F760 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.146 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v3 REBASE 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. Reviewed-by: Anthony Liguori Signed-off-by: Avik Sil Acked-by: Alexander Graf --- 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)