From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Avik Sil Date: Tue, 23 Oct 2012 15:39:35 +0530 Message-Id: <1350986975-21786-3-git-send-email-aviksil@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH 2/2] pseries: set boot-device property only if boot order specified List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org Cc: aliguori@us.ibm.com, agraf@suse.de, david@gibson.dropbear.id.au 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))); -- 1.7.11.4