summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2014-05-30 18:24:32 -0300
committerAlexander Graf <agraf@suse.de>2014-06-16 13:24:46 +0200
commit23825581d7c106db28f902d09b9a7274b3c8dede (patch)
treefbd6a7e1c0283a7121ca40f4a9bc25e62614a35e
parent748abce94fafd630a5e33518e146baa3da463c48 (diff)
downloadhqemu-23825581d7c106db28f902d09b9a7274b3c8dede.zip
hqemu-23825581d7c106db28f902d09b9a7274b3c8dede.tar.gz
spapr: Add kvm-type property
The kvm-type machine option was left out when MachineState was introduced, preventing the kvm-type option from being used. Add the missing property to the sPAPR machine class, so it can be used. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--hw/ppc/spapr.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index b78b361..fbb4e0d 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -98,6 +98,9 @@ typedef struct SPAPRMachine SPAPRMachine;
struct SPAPRMachine {
/*< private >*/
MachineState parent_obj;
+
+ /*< public >*/
+ char *kvm_type;
};
@@ -1614,6 +1617,27 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus,
return NULL;
}
+static char *spapr_get_kvm_type(Object *obj, Error **errp)
+{
+ SPAPRMachine *sm = SPAPR_MACHINE(obj);
+
+ return g_strdup(sm->kvm_type);
+}
+
+static void spapr_set_kvm_type(Object *obj, const char *value, Error **errp)
+{
+ SPAPRMachine *sm = SPAPR_MACHINE(obj);
+
+ g_free(sm->kvm_type);
+ sm->kvm_type = g_strdup(value);
+}
+
+static void spapr_machine_initfn(Object *obj)
+{
+ object_property_add_str(obj, "kvm-type",
+ spapr_get_kvm_type, spapr_set_kvm_type, NULL);
+}
+
static void spapr_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -1637,6 +1661,7 @@ static const TypeInfo spapr_machine_info = {
.name = TYPE_SPAPR_MACHINE,
.parent = TYPE_MACHINE,
.instance_size = sizeof(SPAPRMachine),
+ .instance_init = spapr_machine_initfn,
.class_init = spapr_machine_class_init,
.interfaces = (InterfaceInfo[]) {
{ TYPE_FW_PATH_PROVIDER },
OpenPOWER on IntegriCloud