ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: allowed/required kernel-irqchip support 

The code using kernel-irqchip property requires 'allowed/required'
functionality. Replace machine's kernel_irqchip field with two fields
representing the new functionality and expose them through 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>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-02-04 17:43:49 +02:00 committed by Michael S. Tsirkin
parent 8caff63699
commit d8870d0217
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/core/machine.c
View File

@ -31,18 +31,12 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp)
ms->accel = g_strdup(value); ms->accel = g_strdup(value);
} }
static bool machine_get_kernel_irqchip(Object *obj, Error **errp)
{
MachineState *ms = MACHINE(obj);
return ms->kernel_irqchip;
}
static void machine_set_kernel_irqchip(Object *obj, bool value, Error **errp) static void machine_set_kernel_irqchip(Object *obj, bool value, Error **errp)
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
ms->kernel_irqchip = value; ms->kernel_irqchip_allowed = value;
ms->kernel_irqchip_required = value;
} }
static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v, static void machine_get_kvm_shadow_mem(Object *obj, Visitor *v,
@ -289,13 +283,15 @@ static void machine_initfn(Object *obj)
{ {
MachineState *ms = MACHINE(obj); MachineState *ms = MACHINE(obj);
ms->kernel_irqchip_allowed = true;
object_property_add_str(obj, "accel", object_property_add_str(obj, "accel",
machine_get_accel, machine_set_accel, NULL); machine_get_accel, machine_set_accel, NULL);
object_property_set_description(obj, "accel", object_property_set_description(obj, "accel",
"Accelerator list", "Accelerator list",
NULL); NULL);
object_property_add_bool(obj, "kernel-irqchip", object_property_add_bool(obj, "kernel-irqchip",
machine_get_kernel_irqchip, NULL,
machine_set_kernel_irqchip, machine_set_kernel_irqchip,
NULL); NULL);
object_property_set_description(obj, "kernel-irqchip", object_property_set_description(obj, "kernel-irqchip",
@ -408,6 +404,16 @@ bool machine_iommu(MachineState *machine)
return machine->iommu; return machine->iommu;
} }
bool machine_kernel_irqchip_allowed(MachineState *machine)
{
return machine->kernel_irqchip_allowed;
}
bool machine_kernel_irqchip_required(MachineState *machine)
{
return machine->kernel_irqchip_required;
}
static const TypeInfo machine_info = { static const TypeInfo machine_info = {
.name = TYPE_MACHINE, .name = TYPE_MACHINE,
.parent = TYPE_OBJECT, .parent = TYPE_OBJECT,

5
include/hw/boards.h
View File

@ -67,6 +67,8 @@ extern MachineState *current_machine;
bool machine_usb(MachineState *machine); bool machine_usb(MachineState *machine);
bool machine_iommu(MachineState *machine); bool machine_iommu(MachineState *machine);
bool machine_kernel_irqchip_allowed(MachineState *machine);
bool machine_kernel_irqchip_required(MachineState *machine);
/** /**
* MachineClass: * MachineClass:
@ -125,7 +127,8 @@ struct MachineState {
/*< public >*/ /*< public >*/
char *accel; char *accel;
bool kernel_irqchip; bool kernel_irqchip_allowed;
bool kernel_irqchip_required;
int kvm_shadow_mem; int kvm_shadow_mem;
char *dtb; char *dtb;
char *dumpdtb; char *dumpdtb;