From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmfA-0003Qq-9k for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVmf4-0005DG-5g for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVmf3-0005Cv-TV for qemu-devel@nongnu.org; Wed, 11 Mar 2015 15:51:22 -0400 Date: Wed, 11 Mar 2015 20:51:11 +0100 From: "Michael S. Tsirkin" Message-ID: <20150311205111-mutt-send-email-mst@redhat.com> References: <1426096767-30494-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426096767-30494-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 11/25] machine: query phandle-start machine property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Peter Maydell , Peter Crosthwaite , Alexander Graf , Paolo Bonzini From: Marcel Apfelbaum Commit e79d5a6 ("machine: remove qemu_machine_opts global list") removed the global option descriptions and moved them to MachineState's QOM properties. Query phandle-start by accessing machine properties through designated wrappers. Signed-off-by: Marcel Apfelbaum Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Paolo Bonzini --- include/hw/boards.h | 1 + device_tree.c | 5 ++--- hw/core/machine.c | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 4be3cd1..1f21bdf 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -70,6 +70,7 @@ bool machine_iommu(MachineState *machine); bool machine_kernel_irqchip_allowed(MachineState *machine); bool machine_kernel_irqchip_required(MachineState *machine); int machine_kvm_shadow_mem(MachineState *machine); +int machine_phandle_start(MachineState *machine); /** * MachineClass: diff --git a/device_tree.c b/device_tree.c index 4cb1cd5..3d119ef 100644 --- a/device_tree.c +++ b/device_tree.c @@ -24,7 +24,7 @@ #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/loader.h" -#include "qemu/option.h" +#include "hw/boards.h" #include "qemu/config-file.h" #include @@ -245,8 +245,7 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt) * which phandle id to start allocting phandles. */ if (!phandle) { - phandle = qemu_opt_get_number(qemu_get_machine_opts(), - "phandle_start", 0); + phandle = machine_phandle_start(current_machine); } if (!phandle) { diff --git a/hw/core/machine.c b/hw/core/machine.c index 0ad5b12..5ad2409 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -420,6 +420,11 @@ int machine_kvm_shadow_mem(MachineState *machine) return machine->kvm_shadow_mem; } +int machine_phandle_start(MachineState *machine) +{ + return machine->phandle_start; +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, -- MST