From nobody Mon Feb 9 04:59:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544552770334566.9325046968661; Tue, 11 Dec 2018 10:26:10 -0800 (PST) Received: from localhost ([::1]:40663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWmjR-0000hV-6Q for importer@patchew.org; Tue, 11 Dec 2018 13:26:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWmMZ-0005i9-O9 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 13:02:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWmMV-0005I3-LY for qemu-devel@nongnu.org; Tue, 11 Dec 2018 13:02:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWmMV-0005AU-Bg for qemu-devel@nongnu.org; Tue, 11 Dec 2018 13:02:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7286CC04AC51; Tue, 11 Dec 2018 18:02:21 +0000 (UTC) Received: from localhost (ovpn-116-63.gru2.redhat.com [10.97.116.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBF3D19C7D; Tue, 11 Dec 2018 18:02:20 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Date: Tue, 11 Dec 2018 16:01:20 -0200 Message-Id: <20181211180129.7661-16-ehabkost@redhat.com> In-Reply-To: <20181211180129.7661-1-ehabkost@redhat.com> References: <20181211180129.7661-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 11 Dec 2018 18:02:21 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 15/24] spapr: Use default_machine_opts to set use_hotplug_event_source X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Instead of setting use_hotplug_event_source at instance_init time, set default_machine_opts on spapr_machine_2_7_class_options() to implement equivalent behavior. This will let us eliminate the need for separate instance_init functions for each spapr machine-type. Signed-off-by: Eduardo Habkost Message-Id: <20181205205827.19387-3-ehabkost@redhat.com> Acked-by: David Gibson Signed-off-by: Eduardo Habkost --- hw/ppc/spapr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index def3e502d8..a3f4c86a44 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4240,10 +4240,7 @@ static void phb_placement_2_7(sPAPRMachineState *spa= pr, uint32_t index, =20 static void spapr_machine_2_7_instance_options(MachineState *machine) { - sPAPRMachineState *spapr =3D SPAPR_MACHINE(machine); - spapr_machine_2_8_instance_options(machine); - spapr->use_hotplug_event_source =3D false; } =20 static void spapr_machine_2_7_class_options(MachineClass *mc) @@ -4252,6 +4249,7 @@ static void spapr_machine_2_7_class_options(MachineCl= ass *mc) =20 spapr_machine_2_8_class_options(mc); mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("power7_v2.3"); + mc->default_machine_opts =3D "modern-hotplug-events=3Doff"; SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_7); smc->phb_placement =3D phb_placement_2_7; } --=20 2.18.0.rc1.1.g3f1ff2140