From patchwork Tue Oct 23 10:09:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avik Sil X-Patchwork-Id: 193416 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 9A2BA2C008C for ; Tue, 23 Oct 2012 21:10:24 +1100 (EST) Received: from localhost ([::1]:50533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQbRG-0004XI-HN for incoming@patchwork.ozlabs.org; Tue, 23 Oct 2012 06:10:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQbQt-00049z-Sm for qemu-devel@nongnu.org; Tue, 23 Oct 2012 06:10:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQbQn-0008Nu-Hr for qemu-devel@nongnu.org; Tue, 23 Oct 2012 06:09:59 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:56593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQbQn-0008NQ-0u for qemu-devel@nongnu.org; Tue, 23 Oct 2012 06:09:53 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Oct 2012 20:07:18 +1000 Received: from d23relay04.au.ibm.com (202.81.31.246) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Oct 2012 20:07:17 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q9N9xoA930146696; Tue, 23 Oct 2012 20:59:51 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q9NA9lJd021059; Tue, 23 Oct 2012 21:09:47 +1100 Received: from aviksil-thinkpad.in.ibm.com ([9.79.200.45]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q9NA9Zbu020565; Tue, 23 Oct 2012 21:09:44 +1100 From: Avik Sil To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Tue, 23 Oct 2012 15:39:35 +0530 Message-Id: <1350986975-21786-3-git-send-email-aviksil@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1350986975-21786-1-git-send-email-aviksil@linux.vnet.ibm.com> References: <1350986975-21786-1-git-send-email-aviksil@linux.vnet.ibm.com> x-cbid: 12102310-1618-0000-0000-000002B2876A X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.143 Cc: aliguori@us.ibm.com, agraf@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH 2/2] pseries: set boot-device property only if boot order specified 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 Signed-off-by: Avik Sil --- hw/spapr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/spapr.c b/hw/spapr.c index 637b3fb..1b2340c 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -283,7 +283,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)));