From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TROZs-0005RI-Kv for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:38:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TROZr-00088t-I6 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:38:32 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:54612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TROZq-00088g-S4 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 10:38:31 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 25 Oct 2012 20:08:26 +0530 From: Avik Sil Date: Thu, 25 Oct 2012 20:08:15 +0530 Message-Id: <1351175895-27131-3-git-send-email-aviksil@linux.vnet.ibm.com> In-Reply-To: <1351175895-27131-1-git-send-email-aviksil@linux.vnet.ibm.com> References: <1351175895-27131-1-git-send-email-aviksil@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 2/2] pseries: set no default boot order 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 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 57db710..6f5be50 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))); @@ -915,7 +917,6 @@ static QEMUMachine spapr_machine = { .max_cpus = MAX_CPUS, .no_parallel = 1, .use_scsi = 1, - .default_machine_opts = DEFAULT_BOOT_ORDER, }; static void spapr_machine_init(void) -- 1.7.11.4