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 1530217242934185.57080540172717; Thu, 28 Jun 2018 13:20:42 -0700 (PDT) Received: from localhost ([::1]:38352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdPG-0002op-4B for importer@patchew.org; Thu, 28 Jun 2018 16:20:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAe-0007Fa-B3 for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAb-0000Sm-9J for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:36 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:37461) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAb-0000RK-1f for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:33 -0400 Received: by mail-wr0-x242.google.com with SMTP id k6-v6so6687596wrp.4 for ; Thu, 28 Jun 2018 13:05:32 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:31 -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=pGBPjQv4iVxrnBOwF56X6ZfN58M7mHOC4l+yOotFfDo=; b=RLl+BmY0nuiqp0OQZ+hzkF6Ka750WEQc3xWQ3AyXJXBnpAXRYjv0xcVJJKpls8dEez b4XZ+jtVJhDu3VT6d32tFjWvvy2+9Ag7UN7NBv9QJ/bPc0hE3U8G6mxFSfdsSQVqtdUU NoVhSbr6J25pk5RG+IRvoXQNu5FYDoSOqqjIhmm55HN4jTcQPYeB9i9J3QzqkJMN9FbB zBBjN9lvjebKSQuKuscS3nO6U0Nx23C9P2kWjdv4i68J0RqflT8fXNvQNVa6c9Bq76bA /HbMytWPNBkW4KD2pPIvR/t0ZF5V/y4bDmYfnlM08R5JG37AGAqLHN0eHrRLHDX68r4/ 2LXw== 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=pGBPjQv4iVxrnBOwF56X6ZfN58M7mHOC4l+yOotFfDo=; b=UNQgBCLPyRJGyG7RGb1nF9X29zrtdd6xC0if/vk3n9gqrw9pnm9vIMXIcN47z3PO2Q 5LaKD+GzQ2dzN9mB0FSPZWH+QtUkJYbJbteHAGa5ixCcATQHiXQ6Pt+dUoTAVxnEGusz F+QCUw8sw+gDEjp8EJ3nCOjoxFjQ7qUsRzgGQ9N0TCpP8b1Y/5f4updti2VSL7RyMmJj aZmlAeFTiuV+oqGJBLe805MGZsMZA82P/JBC1EQcitEUhmqjvTdlI9tD/czU1G/M2rXN GNUf2tOEOsnqBeyVPW3CxFKr7q7W0aRAfaJNwHRHBvuzNU5gIp2aO2pNn+NQnJAmQz9a D4cw== X-Gm-Message-State: APt69E1fFIftzCaFVjzESfSK77p3TtIEpHChFolMwtxkDuOcLjkOmnTx rPW5yReZYHkDBsI+XNbVZjkYYmzJ X-Google-Smtp-Source: AAOMgpeQXGPea1lSqCSFzGpu7QpSLI8pvr7TPzUa2hOzkJT+dOFhWBkzgKG4MOhQMTQT4LZ1f5cKyg== X-Received: by 2002:adf:96b2:: with SMTP id u47-v6mr10108534wrb.204.1530216331729; Thu, 28 Jun 2018 13:05:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:28 +0200 Message-Id: <1530216310-52873-19-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::242 Subject: [Qemu-devel] [PULL 18/60] pc: rename pc_dimm_(plug|unplug|...)* into pc_memory_(plug|unplug|...)* 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 Use a similar naming scheme as spapr. This way, we can go ahead and rename e.g. pc_dimm_memory_plug to pc_dimm_plug, which avoids confusion. Reviewed-by: Igor Mammedov Reviewed-by: David Gibson Signed-off-by: David Hildenbrand Message-Id: <20180619134141.29478-3-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 622e49d..f9250ff 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1674,8 +1674,8 @@ void ioapic_init_gsi(GSIState *gsi_state, const char = *parent_name) } } =20 -static void pc_dimm_plug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_plug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { HotplugHandlerClass *hhc; Error *local_err =3D NULL; @@ -1728,8 +1728,8 @@ out: error_propagate(errp, local_err); } =20 -static void pc_dimm_unplug_request(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { HotplugHandlerClass *hhc; Error *local_err =3D NULL; @@ -1759,8 +1759,8 @@ out: error_propagate(errp, local_err); } =20 -static void pc_dimm_unplug(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void pc_memory_unplug(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); HotplugHandlerClass *hhc; @@ -2015,7 +2015,7 @@ static void pc_machine_device_plug_cb(HotplugHandler = *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_plug(hotplug_dev, dev, errp); + pc_memory_plug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_plug(hotplug_dev, dev, errp); } @@ -2025,7 +2025,7 @@ static void pc_machine_device_unplug_request_cb(Hotpl= ugHandler *hotplug_dev, DeviceState *dev, Error **= errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_unplug_request(hotplug_dev, dev, errp); + pc_memory_unplug_request(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_unplug_request_cb(hotplug_dev, dev, errp); } else { @@ -2038,7 +2038,7 @@ static void pc_machine_device_unplug_cb(HotplugHandle= r *hotplug_dev, DeviceState *dev, Error **errp) { if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { - pc_dimm_unplug(hotplug_dev, dev, errp); + pc_memory_unplug(hotplug_dev, dev, errp); } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { pc_cpu_unplug_cb(hotplug_dev, dev, errp); } else { --=20 1.8.3.1