From nobody Tue Nov 4 15:26:22 2025 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; dkim=fail; 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 1530217177814293.31166612848403; Thu, 28 Jun 2018 13:19:37 -0700 (PDT) Received: from localhost ([::1]:38351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdOD-0001se-10 for importer@patchew.org; Thu, 28 Jun 2018 16:19:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAe-0007FZ-Aq for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAc-0000UR-9U for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:36 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:37251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAc-0000T8-0f for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:34 -0400 Received: by mail-wr0-x22f.google.com with SMTP id k6-v6so6687640wrp.4 for ; Thu, 28 Jun 2018 13:05:33 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=8HJqoIgW2SOlZERvdCuYvIalarQkquMATz1VXgQvpt4=; b=XvOzDl1hVoAIT69KHuSePhJWD5rC4sCeaqmDUumeEqM2h8BLe7kjFObiD13XY7gmeP huz3052NjA8opExYfcUTVjhEODIQB2Q2U6U4p8Bg1xB+Azs1Yn0uSM/J+23ElBP34gYR WALWPl1JYrugXYzJiOy4+JnZenDqf1a3USGohxqyWZwqBAWsrsJsKb7SGerBW+O2SZJR GQRadgAuChtHfk0uznpDUmE1DoM9Nhx1lxAo/SRiliUOy0GWoDprR7m1uDd7bqcQKhrw uo89lmIhfKOL6byESdf9rFvGnd3YCQ3H4tMF2Mv6Ie0YTWoo2XtqzLfAdoW7zFcIbvJC u36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=8HJqoIgW2SOlZERvdCuYvIalarQkquMATz1VXgQvpt4=; b=CqGzBRGgwcltsfLpBhVph7Xk7SiHeGY5j3+Is0Zk8h+fgAlQ7PkYVapdE2JbAeoDaF gU4UEoKpTthzT1OEHhnqItfjlQGU3M6xirUnvXqdp8t2354WXpub2VsrEVCCYWkuYFEd YdkRHDs7iwNXAv6TzKzmB5mHwObvwv/RDXshOyU6fQGACUqEeF2prcO02+vcw4DpOZ8L NahS2EnJ/+8mp2c/nZ27ix8Upv/+/rF/ivXaQXzzqEZPyjFeBfKCisqcxl9bPWaThSoZ E49Fc3AAroqAtsR2ruo8Bi1ms2Htff1IRI3PGLvC0PcNK8xqHtdEr++h6iRovkRawpQq FbMA== X-Gm-Message-State: APt69E2yjucDQZK4Lk9lCPcvmdyoaYZ51QnEH+5Z7ZiR3BTE5qLBmHZo E5YRXbp9imvpxW00sPPtaYsiVIdX X-Google-Smtp-Source: AAOMgpc6N4NqseN5T7abtqAOp2aJnHfJFE9G+eE8EEZ4EuT6teYyHEi2zuyXVmRlpwn0RRZ+h+GKzw== X-Received: by 2002:adf:bb08:: with SMTP id r8-v6mr2015791wrg.244.1530216332693; Thu, 28 Jun 2018 13:05:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:29 +0200 Message-Id: <1530216310-52873-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PULL 19/60] pc-dimm: rename pc_dimm_memory_* to pc_dimm_* 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: , Cc: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand Let's rename it to make it look more consistent. Reviewed-by: Igor Mammedov Reviewed-by: David Gibson Signed-off-by: David Hildenbrand Message-Id: <20180619134141.29478-4-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 4 ++-- hw/mem/pc-dimm.c | 6 +++--- hw/ppc/spapr.c | 6 +++--- include/hw/mem/pc-dimm.h | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index f9250ff..f23133f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1713,7 +1713,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_de= v, goto out; } =20 - pc_dimm_memory_plug(dev, MACHINE(pcms), align, &local_err); + pc_dimm_plug(dev, MACHINE(pcms), align, &local_err); if (local_err) { goto out; } @@ -1773,7 +1773,7 @@ static void pc_memory_unplug(HotplugHandler *hotplug_= dev, goto out; } =20 - pc_dimm_memory_unplug(dev, MACHINE(pcms)); + pc_dimm_unplug(dev, MACHINE(pcms)); object_unparent(OBJECT(dev)); =20 out: diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 62b34a9..9e0c83e 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -27,8 +27,8 @@ #include "sysemu/numa.h" #include "trace.h" =20 -void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, - uint64_t align, Error **errp) +void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, + Error **errp) { int slot; PCDIMMDevice *dimm =3D PC_DIMM(dev); @@ -84,7 +84,7 @@ out: error_propagate(errp, local_err); } =20 -void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine) +void pc_dimm_unplug(DeviceState *dev, MachineState *machine) { PCDIMMDevice *dimm =3D PC_DIMM(dev); PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0d032a1..3a1bd73 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3160,7 +3160,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, align =3D memory_region_get_alignment(mr); size =3D memory_region_size(mr); =20 - pc_dimm_memory_plug(dev, MACHINE(ms), align, &local_err); + pc_dimm_plug(dev, MACHINE(ms), align, &local_err); if (local_err) { goto out; } @@ -3183,7 +3183,7 @@ static void spapr_memory_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, return; =20 out_unplug: - pc_dimm_memory_unplug(dev, MACHINE(ms)); + pc_dimm_unplug(dev, MACHINE(ms)); out: error_propagate(errp, local_err); } @@ -3332,7 +3332,7 @@ static void spapr_memory_unplug(HotplugHandler *hotpl= ug_dev, DeviceState *dev) sPAPRMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); sPAPRDIMMState *ds =3D spapr_pending_dimm_unplugs_find(spapr, PC_DIMM(= dev)); =20 - pc_dimm_memory_unplug(dev, MACHINE(hotplug_dev)); + pc_dimm_unplug(dev, MACHINE(hotplug_dev)); object_unparent(OBJECT(dev)); spapr_pending_dimm_unplugs_remove(spapr, ds); } diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 627c860..860343d 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -78,7 +78,7 @@ typedef struct PCDIMMDeviceClass { =20 int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp); =20 -void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine, - uint64_t align, Error **errp); -void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine); +void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, + Error **errp); +void pc_dimm_unplug(DeviceState *dev, MachineState *machine); #endif --=20 1.8.3.1