From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bv7bF-0001aa-5u for qemu-devel@nongnu.org; Fri, 14 Oct 2016 14:52:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bv7bA-0001m8-1t for qemu-devel@nongnu.org; Fri, 14 Oct 2016 14:52:56 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:58878 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bv7b9-0001lv-TG for qemu-devel@nongnu.org; Fri, 14 Oct 2016 14:52:51 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9EInUjE068589 for ; Fri, 14 Oct 2016 14:52:50 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0b-001b2d01.pphosted.com with ESMTP id 262yh9f9mu-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 14 Oct 2016 14:52:50 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Oct 2016 12:52:50 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <20161014043819.GI28562@umbus> References: <1476314039-9520-1-git-send-email-mdroth@linux.vnet.ibm.com> <1476314039-9520-8-git-send-email-mdroth@linux.vnet.ibm.com> <20161014043819.GI28562@umbus> Date: Fri, 14 Oct 2016 13:08:02 -0500 Message-Id: <20161014180802.29726.51851@loki> Subject: Re: [Qemu-devel] [PATCH 07/11] spapr: add hotplug interrupt machine options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, bharata@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, jallen@linux.vnet.ibm.com Quoting David Gibson (2016-10-13 23:38:19) > On Wed, Oct 12, 2016 at 06:13:55PM -0500, Michael Roth wrote: > > This adds machine options of the form: > > = > > -machine pseries,legacy-hotplug-events=3Dtrue > > -machine pseries,legacy-hotplug-events=3Dfalse > > = > > to denote whether or not we wish to force the use of "legacy" style > > hotplug events, which are surfaced through EPOW interrupts instead of > > a dedicated interrupt source, and lack certain features necessary, > > mainly, for memory unplug support. > > = > > If false, QEMU will default to "legacy" style unless the guest > > advertises support for the newer events via > > ibm,client-architecture-support hcall during early boot. > > = > > For pseries-2.7 and earlier we default to true, for newer machine > > types we default to false. > > = > > Signed-off-by: Michael Roth > = > Hrm.. I think it would be a little clearer if you could find a wording > such that both the internal variable and the external property have > the same sense - i.e. get rid of the ! in the property getters / > setters. Ok, wasn't sure which direction was more useful from user standpoint. I think something like modern-hotplug-events=3Dtrue|false might be reasonable though. > = > > --- > > hw/ppc/spapr.c | 31 +++++++++++++++++++++++++++++++ > > include/hw/ppc/spapr.h | 1 + > > include/hw/ppc/spapr_ovec.h | 1 + > > 3 files changed, 33 insertions(+) > > = > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index f8cde92..d80a6fa 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -1816,6 +1816,11 @@ static void ppc_spapr_init(MachineState *machine) > > = > > spapr_ovec_set(spapr->ov5, OV5_FORM1_AFFINITY); > > = > > + /* use dedicated HP event source if guest supports it */ > > + if (spapr->use_hotplug_event_source) { > > + spapr_ovec_set(spapr->ov5, OV5_HP_EVT); > > + } > > + > > /* init CPUs */ > > if (machine->cpu_model =3D=3D NULL) { > > machine->cpu_model =3D kvm_enabled() ? "host" : smc->tcg_defau= lt_cpu; > > @@ -2172,16 +2177,39 @@ static void spapr_set_kvm_type(Object *obj, con= st char *value, Error **errp) > > spapr->kvm_type =3D g_strdup(value); > > } > > = > > +static bool spapr_get_legacy_hotplug_events(Object *obj, Error **errp) > > +{ > > + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); > > + > > + return !spapr->use_hotplug_event_source; > > +} > > + > > +static void spapr_set_legacy_hotplug_events(Object *obj, bool value, > > + Error **errp) > > +{ > > + sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); > > + > > + spapr->use_hotplug_event_source =3D !value; > > +} > > + > > static void spapr_machine_initfn(Object *obj) > > { > > sPAPRMachineState *spapr =3D SPAPR_MACHINE(obj); > > = > > spapr->htab_fd =3D -1; > > + spapr->use_hotplug_event_source =3D true; > > object_property_add_str(obj, "kvm-type", > > spapr_get_kvm_type, spapr_set_kvm_type, NU= LL); > > object_property_set_description(obj, "kvm-type", > > "Specifies the KVM virtualization = mode (HV, PR)", > > NULL); > > + object_property_add_bool(obj, "legacy-hotplug-events", > > + spapr_get_legacy_hotplug_events, > > + spapr_set_legacy_hotplug_events, > > + NULL); > > + object_property_set_description(obj, "legacy-hotplug-events", > > + "Use deprecated EPOW mechanism for= hotplug events", > > + NULL); > > } > > = > > static void spapr_machine_finalizefn(Object *obj) > > @@ -2518,6 +2546,9 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", true); > > = > > static void spapr_machine_2_7_instance_options(MachineState *machine) > > { > > + sPAPRMachineState *spapr =3D SPAPR_MACHINE(machine); > > + > > + spapr->use_hotplug_event_source =3D false; > > } > > = > > static void spapr_machine_2_7_class_options(MachineClass *mc) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > > index 27a3328..d1a4a14 100644 > > --- a/include/hw/ppc/spapr.h > > +++ b/include/hw/ppc/spapr.h > > @@ -74,6 +74,7 @@ struct sPAPRMachineState { > > uint32_t check_exception_irq; > > Notifier epow_notifier; > > QTAILQ_HEAD(, sPAPREventLogEntry) pending_events; > > + bool use_hotplug_event_source; > > = > > /* Migration state */ > > int htab_save_index; > > diff --git a/include/hw/ppc/spapr_ovec.h b/include/hw/ppc/spapr_ovec.h > > index 47fa04c..92167c6 100644 > > --- a/include/hw/ppc/spapr_ovec.h > > +++ b/include/hw/ppc/spapr_ovec.h > > @@ -45,6 +45,7 @@ typedef struct sPAPROptionVector sPAPROptionVector; > > /* option vector 5 */ > > #define OV5_DRCONF_MEMORY OV_BIT(2, 2) > > #define OV5_FORM1_AFFINITY OV_BIT(5, 0) > > +#define OV5_HP_EVT OV_BIT(6, 5) > > = > > /* interfaces */ > > sPAPROptionVector *spapr_ovec_new(void); > = > -- = > David Gibson | I'll have my music baroque, and my code > david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _othe= r_ > | _way_ _around_! > http://www.ozlabs.org/~dgibson