From patchwork Mon Jan 26 23:52:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dvaleev@suse.de X-Patchwork-Id: 433082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AAAB71401E7 for ; Tue, 27 Jan 2015 10:54:47 +1100 (AEDT) Received: from localhost ([::1]:44631 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFtUT-00049d-78 for incoming@patchwork.ozlabs.org; Mon, 26 Jan 2015 18:54:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFtSi-0001vh-KA for qemu-devel@nongnu.org; Mon, 26 Jan 2015 18:52:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YFtSe-00041k-In for qemu-devel@nongnu.org; Mon, 26 Jan 2015 18:52:56 -0500 Received: from cantor2.suse.de ([195.135.220.15]:56331 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YFtSe-00041e-Cq; Mon, 26 Jan 2015 18:52:52 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DE0B5AD8D; Mon, 26 Jan 2015 23:52:51 +0000 (UTC) From: dvaleev@suse.de To: qemu-devel@nongnu.org Date: Tue, 27 Jan 2015 00:52:21 +0100 Message-Id: <1422316341-28983-3-git-send-email-dvaleev@suse.de> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1422316341-28983-1-git-send-email-dvaleev@suse.de> References: <1422316341-28983-1-git-send-email-dvaleev@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 Cc: Dinar Valeev , Gonglei , qemu-ppc@nongnu.org, Alexander Graf , armbru@redhat.com Subject: [Qemu-devel] [PATCH 2/2] bootdevice: update boot_order in MachineState 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 From: Dinar Valeev on sPAPR we need to update boot_order in MachineState in case it got changed on reset. Signed-off-by: Dinar Valeev --- bootdevice.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bootdevice.c b/bootdevice.c index 5914417..4f11a06 100644 --- a/bootdevice.c +++ b/bootdevice.c @@ -26,6 +26,7 @@ #include "qapi/visitor.h" #include "qemu/error-report.h" #include "hw/hw.h" +#include "hw/boards.h" typedef struct FWBootEntry FWBootEntry; @@ -50,6 +51,8 @@ void qemu_register_boot_set(QEMUBootSetHandler *func, void *opaque) void qemu_boot_set(const char *boot_order, Error **errp) { Error *local_err = NULL; + MachineState *machine = MACHINE(qdev_get_machine()); + machine->boot_order = boot_order; if (!boot_set_handler) { error_setg(errp, "no function defined to set boot device list for"