openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

machine: query phandle-start machine property 

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 <marcel@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-02-04 17:43:53 +02:00 committed by Michael S. Tsirkin
parent 4689b77bda
commit 6cabe7fa6d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
device_tree.c
View File

@ -24,7 +24,7 @@
#include "sysemu/device_tree.h" #include "sysemu/device_tree.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "qemu/option.h" #include "hw/boards.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include <libfdt.h> #include <libfdt.h>
@ -245,8 +245,7 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt)
* which phandle id to start allocting phandles. * which phandle id to start allocting phandles.
*/ */
if (!phandle) { if (!phandle) {
phandle = qemu_opt_get_number(qemu_get_machine_opts(), phandle = machine_phandle_start(current_machine);
"phandle_start", 0);
} }
if (!phandle) { if (!phandle) {

5
hw/core/machine.c
View File

@ -420,6 +420,11 @@ int machine_kvm_shadow_mem(MachineState *machine)
return machine->kvm_shadow_mem; return machine->kvm_shadow_mem;
} }
int machine_phandle_start(MachineState *machine)
{
return machine->phandle_start;
}
static const TypeInfo machine_info = { static const TypeInfo machine_info = {
.name = TYPE_MACHINE, .name = TYPE_MACHINE,
.parent = TYPE_OBJECT, .parent = TYPE_OBJECT,

1
include/hw/boards.h
View File

@ -70,6 +70,7 @@ bool machine_iommu(MachineState *machine);
bool machine_kernel_irqchip_allowed(MachineState *machine); bool machine_kernel_irqchip_allowed(MachineState *machine);
bool machine_kernel_irqchip_required(MachineState *machine); bool machine_kernel_irqchip_required(MachineState *machine);
int machine_kvm_shadow_mem(MachineState *machine); int machine_kvm_shadow_mem(MachineState *machine);
int machine_phandle_start(MachineState *machine);
/** /**
* MachineClass: * MachineClass: