From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wr1AX-00038j-VH for qemu-devel@nongnu.org; Sun, 01 Jun 2014 04:31:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wr1AS-0005nV-BR for qemu-devel@nongnu.org; Sun, 01 Jun 2014 04:31:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6029) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wr1AS-0005nA-35 for qemu-devel@nongnu.org; Sun, 01 Jun 2014 04:31:00 -0400 Message-ID: <1401611464.2875.99.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Sun, 01 Jun 2014 11:31:04 +0300 In-Reply-To: <1401482467-31550-1-git-send-email-ehabkost@redhat.com> References: <1401482467-31550-1-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] machine: Add kvm-type property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: kvm@vger.kernel.org, Alexander Graf , qemu-devel@nongnu.org, "Aneesh Kumar K.V" , Paolo Bonzini , Andreas =?ISO-8859-1?Q?F=E4rber?= On Fri, 2014-05-30 at 17:41 -0300, Eduardo Habkost wrote: > The kvm-type machine option was left out when MachineState was > introduced, preventing the kvm-type option from being used. Add the > missing property. Very interesting how did I miss that. Thanks! Marcel >=20 > Signed-off-by: Eduardo Habkost > Cc: Andreas F=C3=A4rber > Cc: Aneesh Kumar K.V > Cc: Alexander Graf > Cc: Marcel Apfelbaum > --- > Tested in a x86 machine only. Help would be welcome to test it on a PPC > machine using -machine spapr and KVM. >=20 > Before this patch: >=20 > $ qemu-system-x86_64 -machine pc,kvm-type=3Dhv,accel=3Dkvm > qemu-system-x86_64: Property '.kvm-type' not found >=20 > (This means the option won't work even for sPAPR machines.) >=20 > After applying this patch: >=20 > $ qemu-system-x86_64 -machine pc,kvm-type=3Dhv,accel=3Dkvm > Invalid argument kvm-type=3Dhv >=20 > (This means the x86 KVM init code is seeing (and rejecting) the option, > and the sPAPR code can use it.) >=20 > Note that qemu-system-x86_64 will segfault with the above command-line > unless an additional fix (submitted today) is applied (kvm: Ensure > negative return value on kvm_init() error handling path). > --- > hw/core/machine.c | 17 +++++++++++++++++ > include/hw/boards.h | 1 + > 2 files changed, 18 insertions(+) >=20 > diff --git a/hw/core/machine.c b/hw/core/machine.c > index cbba679..ed47b3a 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -235,6 +235,21 @@ static void machine_set_firmware(Object *obj, cons= t char *value, Error **errp) > ms->firmware =3D g_strdup(value); > } > =20 > +static char *machine_get_kvm_type(Object *obj, Error **errp) > +{ > + MachineState *ms =3D MACHINE(obj); > + > + return g_strdup(ms->kvm_type); > +} > + > +static void machine_set_kvm_type(Object *obj, const char *value, Error= **errp) > +{ > + MachineState *ms =3D MACHINE(obj); > + > + g_free(ms->kvm_type); > + ms->kvm_type =3D g_strdup(value); > +} > + > static void machine_initfn(Object *obj) > { > object_property_add_str(obj, "accel", > @@ -274,6 +289,8 @@ static void machine_initfn(Object *obj) > object_property_add_bool(obj, "usb", machine_get_usb, machine_set_= usb, NULL); > object_property_add_str(obj, "firmware", > machine_get_firmware, machine_set_firmware= , NULL); > + object_property_add_str(obj, "kvm-type", > + machine_get_kvm_type, machine_set_kvm_type= , NULL); > } > =20 > static void machine_finalize(Object *obj) > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 2d2e2be..44956d6 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -111,6 +111,7 @@ struct MachineState { > bool mem_merge; > bool usb; > char *firmware; > + char *kvm_type; > =20 > ram_addr_t ram_size; > const char *boot_order;