From nobody Fri May 3 11:30:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1579243332; cv=none; d=zohomail.com; s=zohoarc; b=h72esmpNSS9c/1He8dClgbi6iySAORd4xX810U7lBPxEAVU07Ucg54fZkKZ8dDASmHVrIuaIrfjKB1mpxFWOTxKI6jp/+VZGGgL+HNV+aDT5x+dIICLfRp1/Kd2D/exlWB2zRHlwpTQGlTJjm1D9AzmwHnkqiE4gHRHXDlyXUMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579243332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=kILSDmMN9iD9Af+qHLXBEZrWfII6z296r04rOq8vi50=; b=cnADmO3KGz7gMUSdo5zk9KZBDkv4WaLTDoMdrqlHyeXR0GUbbs9MWeicqIsOYGlwp0YwOBALCop0Jbj3H9lmd574FVl3DOcxEv8wUDqERYH8bxUWijCmfCLENbjCMgL+GOdAgGk1XWEVQLddPhuSKgvINpR0IDf5tPUiFuWsq/g= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579243331980938.5689330302843; Thu, 16 Jan 2020 22:42:11 -0800 (PST) Received: from localhost ([::1]:53078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isLKc-00050h-PK for importer@patchew.org; Fri, 17 Jan 2020 01:42:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53872) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isLJg-00040O-76 for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:41:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isLJc-0003SZ-Co for qemu-devel@nongnu.org; Fri, 17 Jan 2020 01:41:12 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:53562 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isLJT-0003Ju-Iz; Fri, 17 Jan 2020 01:40:59 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id A014D327BFE19E16D2E7; Fri, 17 Jan 2020 14:40:54 +0800 (CST) Received: from linux-TFkxOR.huawei.com (10.175.104.212) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Fri, 17 Jan 2020 14:40:46 +0800 From: Keqian Zhu To: Subject: [PATCH v2] hw/arm: Adjust some coding styles about memory hotplug Date: Fri, 17 Jan 2020 14:38:22 +0800 Message-ID: <20200117063822.57918-1-zhukeqian1@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-Originating-IP: [10.175.104.212] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Michael S. Tsirkin" , Shameer Kolothum , qemu-arm@nongnu.org, Igor Mammedov , wanghaibin.wang@huawei.com, zhukeqian Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: zhukeqian There is extra indent in ACPI GED plug cb. And we can use existing helper function to trigger hotplug handler plug. Reviewed-by: Igor Mammedov Signed-off-by: Keqian Zhu --- v1->v2: - Add Igor's R-b Cc: Shameer Kolothum Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: Peter Maydell --- hw/acpi/generic_event_device.c | 2 +- hw/arm/virt.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c index 9cee90cc70..55eb29d80a 100644 --- a/hw/acpi/generic_event_device.c +++ b/hw/acpi/generic_event_device.c @@ -175,7 +175,7 @@ static void acpi_ged_device_plug_cb(HotplugHandler *hot= plug_dev, AcpiGedState *s =3D ACPI_GED(hotplug_dev); =20 if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp); + acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, errp); } else { error_setg(errp, "virt: device plug request for unsupported device" " type: %s", object_get_typename(OBJECT(dev))); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 39ab5f47e0..656b0081c2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1934,7 +1934,6 @@ static void virt_memory_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, static void virt_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - HotplugHandlerClass *hhc; VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); Error *local_err =3D NULL; =20 @@ -1943,8 +1942,9 @@ static void virt_memory_plug(HotplugHandler *hotplug_= dev, goto out; } =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); - hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort); + hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev), + dev, &error_abort); + out: error_propagate(errp, local_err); } --=20 2.19.1