From nobody Mon Feb 9 17:37:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598384498; cv=none; d=zohomail.com; s=zohoarc; b=YlzepFxSuxfmU6rLLhPEqXLPnX7vk0jYXvwsaZkAETPyoEwavXrKOUby19Glq/gpQIrgsahwPDypKxklzg0RRrkJodawDIsJ28oWl3wnZfS/l8zvAS0JZv96mlKJvBXmWS8OSiKGZ61u4019Y3nrCusnSkkCsgU+4DIu4Dpc0k8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598384498; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tnPkPywknZThwcy5hE+qExHNKvieeAP0ovslwzk0UWw=; b=ZxM5aTkQLatlT6z4H2eoHfx+5WAyQ45zyDdpQPt2ZcsxtxDUYXy27DAlw9uVJDlpaO2Y0l2tSRq4DdHTypGun3uEHweQ4YITiOkEwuz4UHyzlCPB8HHaBQPqsDKHSs5ROq6htqLv/anMktXyzHutDqM6qof5qxrJAI3wYSLg8Do= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598384498688255.1702263829544; Tue, 25 Aug 2020 12:41:38 -0700 (PDT) Received: from localhost ([::1]:45838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAep7-0006Yc-El for importer@patchew.org; Tue, 25 Aug 2020 15:41:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAeXH-0002Ml-Ue for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:23:11 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26070 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAeXG-0006Kc-9C for qemu-devel@nongnu.org; Tue, 25 Aug 2020 15:23:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-240-aO_CWl9kPVuCuuNVsr4DMw-1; Tue, 25 Aug 2020 15:23:05 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4709085B685; Tue, 25 Aug 2020 19:23:04 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31D666198B; Tue, 25 Aug 2020 19:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598383389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tnPkPywknZThwcy5hE+qExHNKvieeAP0ovslwzk0UWw=; b=C4YZLThwvUrBj4luJ9z1S2fP2LPT48F3sYaIt23rbcvj6Jvfwp/1EOwdPWVjGN3i+mi1/F H+HAuadKpTKboOj6/mPtrN6IOhQAv7dxBB9pdnYLab8Px4bBhFsecI/A7Tfg3198WBgYc4 JTjH5AnenmFnJibjUGxF2pvufKoitw4= X-MC-Unique: aO_CWl9kPVuCuuNVsr4DMw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 49/74] swim: Rename struct SWIM to Swim Date: Tue, 25 Aug 2020 15:20:45 -0400 Message-Id: <20200825192110.3528606-50-ehabkost@redhat.com> In-Reply-To: <20200825192110.3528606-1-ehabkost@redhat.com> References: <20200825192110.3528606-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/25 01:35:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.958, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , "Daniel P. Berrange" , qemu-block@nongnu.org, Laurent Vivier , Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Currently we have a SWIM typedef and a SWIM type checking macro, but OBJECT_DECLARE* would transform the SWIM macro into a function, and the function name would conflict with the SWIM typedef name. Rename the struct and typedef to "Swim". This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Laurent Vivier --- Changes series v2 -> v3: new patch added to series v3 --- Cc: Laurent Vivier Cc: Kevin Wolf Cc: Max Reitz Cc: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org Signed-off-by: Eduardo Habkost --- include/hw/block/swim.h | 6 +++--- hw/block/swim.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/block/swim.h b/include/hw/block/swim.h index 6add3499d0..9d8b65c561 100644 --- a/include/hw/block/swim.h +++ b/include/hw/block/swim.h @@ -67,10 +67,10 @@ struct SWIMCtrl { }; =20 #define TYPE_SWIM "swim" -#define SWIM(obj) OBJECT_CHECK(SWIM, (obj), TYPE_SWIM) +#define SWIM(obj) OBJECT_CHECK(Swim, (obj), TYPE_SWIM) =20 -typedef struct SWIM { +typedef struct Swim { SysBusDevice parent_obj; SWIMCtrl ctrl; -} SWIM; +} Swim; #endif diff --git a/hw/block/swim.c b/hw/block/swim.c index 74f56e8f46..20133a814c 100644 --- a/hw/block/swim.c +++ b/hw/block/swim.c @@ -387,7 +387,7 @@ static const MemoryRegionOps swimctrl_mem_ops =3D { =20 static void sysbus_swim_reset(DeviceState *d) { - SWIM *sys =3D SWIM(d); + Swim *sys =3D SWIM(d); SWIMCtrl *ctrl =3D &sys->ctrl; int i; =20 @@ -408,7 +408,7 @@ static void sysbus_swim_reset(DeviceState *d) static void sysbus_swim_init(Object *obj) { SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); - SWIM *sbs =3D SWIM(obj); + Swim *sbs =3D SWIM(obj); SWIMCtrl *swimctrl =3D &sbs->ctrl; =20 memory_region_init_io(&swimctrl->iomem, obj, &swimctrl_mem_ops, swimct= rl, @@ -418,7 +418,7 @@ static void sysbus_swim_init(Object *obj) =20 static void sysbus_swim_realize(DeviceState *dev, Error **errp) { - SWIM *sys =3D SWIM(dev); + Swim *sys =3D SWIM(dev); SWIMCtrl *swimctrl =3D &sys->ctrl; =20 qbus_create_inplace(&swimctrl->bus, sizeof(SWIMBus), TYPE_SWIM_BUS, de= v, @@ -460,7 +460,7 @@ static const VMStateDescription vmstate_sysbus_swim =3D= { .name =3D "SWIM", .version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_STRUCT(ctrl, SWIM, 0, vmstate_swim, SWIMCtrl), + VMSTATE_STRUCT(ctrl, Swim, 0, vmstate_swim, SWIMCtrl), VMSTATE_END_OF_LIST() } }; @@ -477,7 +477,7 @@ static void sysbus_swim_class_init(ObjectClass *oc, voi= d *data) static const TypeInfo sysbus_swim_info =3D { .name =3D TYPE_SWIM, .parent =3D TYPE_SYS_BUS_DEVICE, - .instance_size =3D sizeof(SWIM), + .instance_size =3D sizeof(Swim), .instance_init =3D sysbus_swim_init, .class_init =3D sysbus_swim_class_init, }; --=20 2.26.2