Message ID | 1401485072-14781-3-git-send-email-ehabkost@redhat.com |
---|---|
State | New |
Headers | show |
Eduardo Habkost <ehabkost@redhat.com> writes: > 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> > --- > Changes v1 -> v2: > * Add property only to the sPAPR machine class > > Tested in a x86 machine only. Help would be welcome to test it on a > ppc64 machine supporting KVM. > > Before applying this patch: > > $ qemu-system-ppc64 -machine pseries,accel=kvm,kvm-type=HV > qemu-system-ppc64: Property '.kvm-type' not found > > After applying this patch: > > $ qemu-system-ppc64 -machine pseries,accel=kvm,kvm-type=HV > KVM not supported for this target > No accelerator found! > --- > hw/ppc/spapr.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 30764aa..82b1ca8 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -96,6 +96,9 @@ typedef struct SPAPRMachine SPAPRMachine; > struct SPAPRMachine { > /*< private >*/ > MachineState parent_obj; > + > + /*< public >*/ > + char *kvm_type; > }; > > > @@ -1489,6 +1492,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); > @@ -1512,6 +1536,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 }, > -- > 1.9.0
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 30764aa..82b1ca8 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -96,6 +96,9 @@ typedef struct SPAPRMachine SPAPRMachine; struct SPAPRMachine { /*< private >*/ MachineState parent_obj; + + /*< public >*/ + char *kvm_type; }; @@ -1489,6 +1492,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); @@ -1512,6 +1536,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 },
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> --- Changes v1 -> v2: * Add property only to the sPAPR machine class Tested in a x86 machine only. Help would be welcome to test it on a ppc64 machine supporting KVM. Before applying this patch: $ qemu-system-ppc64 -machine pseries,accel=kvm,kvm-type=HV qemu-system-ppc64: Property '.kvm-type' not found After applying this patch: $ qemu-system-ppc64 -machine pseries,accel=kvm,kvm-type=HV KVM not supported for this target No accelerator found! --- hw/ppc/spapr.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)