From nobody Sun Nov 16 06:00:27 2025 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=1598556907; cv=none; d=zohomail.com; s=zohoarc; b=b7NPlWeq4Y2ZmnArD4x/hOOpsnS2DL7P7EZRLBsQz6xjbu/R7idY49C+eMjozNzmWu2YlQWHfGbKiZfdqQ5clJ3WaGdgpRe0M1+Jj3ZvVDc1AFx62mb+u+vp2D5s2Zy1iGIV3Ga5+5V2lTBkfxd9gHaiKpxgo64JShrNToy9dVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598556907; 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=XORl44+j8TFh3b0H7QYnOfMrVv/VIn1njDV+WEZfPMU=; b=h2QtYjcAaenfOj/HV/v5OifwQRjA8zVpeKJs6YV+WLLQ4d/10AxPtQelH9NCRx+0VzL3L+gMq9l3KDacjpF5A0XfLWylBrKcf8lwqJ2l0h3nAIu7K1q94aZVnDBXWYscs9oPWaN/uL/2tNgL4zUfr2j4IPd5/g4ObdaJYXGYJzw= 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 1598556907018745.8816284651265; Thu, 27 Aug 2020 12:35:07 -0700 (PDT) Received: from localhost ([::1]:38336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNft-0006Ep-O9 for importer@patchew.org; Thu, 27 Aug 2020 15:35:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNSr-00061p-FX for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41091) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNSp-0000Ly-HY for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:21:37 -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-35-fbT4B-PYMoKZ4obuBVp8Qg-1; Thu, 27 Aug 2020 15:21:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 594C21DE08; Thu, 27 Aug 2020 19:21:31 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18F4F10013C1; Thu, 27 Aug 2020 19:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556094; 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=XORl44+j8TFh3b0H7QYnOfMrVv/VIn1njDV+WEZfPMU=; b=RPY3k8evjBLXz6fLeLcVLZafyHo7YFhbp09OR18Y4k+JPC3jB0hNWdKrOve6N1CSGQSiZd un8dMAQboCNFfwVi+WREKu0ZLYDAePk3B5lY4eqzhjZ2B5VH5RPn4AIpTj8nSScQBDDhPy 3+a4Tjkoi3TYqKfwLZCctfZ88T18zUo= X-MC-Unique: fbT4B-PYMoKZ4obuBVp8Qg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 03/53] megasas: Rename QOM class cast macros Date: Thu, 27 Aug 2020 15:20:32 -0400 Message-Id: <20200827192122.658035-4-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:10:07 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.959, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Paolo Bonzini , Roman Bolshakov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the MEGASAS_DEVICE_CLASS() and MEGASAS_DEVICE_GET_CLASS() macros to be consistent with the MEGASAS() instance cast macro. This will allow us to register the type cast macros using OBJECT_DECLARE_TYPE later. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Eduardo Habkost Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-3-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- hw/scsi/megasas.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 5cfd1bf22e..390c2f2edb 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -134,9 +134,9 @@ typedef struct MegasasBaseClass { #define MEGASAS(obj) \ OBJECT_CHECK(MegasasState, (obj), TYPE_MEGASAS_BASE) =20 -#define MEGASAS_DEVICE_CLASS(oc) \ +#define MEGASAS_CLASS(oc) \ OBJECT_CLASS_CHECK(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE) -#define MEGASAS_DEVICE_GET_CLASS(oc) \ +#define MEGASAS_GET_CLASS(oc) \ OBJECT_GET_CLASS(MegasasBaseClass, (oc), TYPE_MEGASAS_BASE) =20 #define MEGASAS_INTR_DISABLED_MASK 0xFFFFFFFF @@ -733,7 +733,7 @@ static int megasas_ctrl_get_info(MegasasState *s, Megas= asCmd *cmd) { PCIDevice *pci_dev =3D PCI_DEVICE(s); PCIDeviceClass *pci_class =3D PCI_DEVICE_GET_CLASS(pci_dev); - MegasasBaseClass *base_class =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *base_class =3D MEGASAS_GET_CLASS(s); struct mfi_ctrl_info info; size_t dcmd_size =3D sizeof(info); BusChild *kid; @@ -1999,7 +1999,7 @@ static uint64_t megasas_mmio_read(void *opaque, hwadd= r addr, { MegasasState *s =3D opaque; PCIDevice *pci_dev =3D PCI_DEVICE(s); - MegasasBaseClass *base_class =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *base_class =3D MEGASAS_GET_CLASS(s); uint32_t retval =3D 0; =20 switch (addr) { @@ -2322,7 +2322,7 @@ static const struct SCSIBusInfo megasas_scsi_info =3D= { static void megasas_scsi_realize(PCIDevice *dev, Error **errp) { MegasasState *s =3D MEGASAS(dev); - MegasasBaseClass *b =3D MEGASAS_DEVICE_GET_CLASS(s); + MegasasBaseClass *b =3D MEGASAS_GET_CLASS(s); uint8_t *pci_conf; int i, bar_type; Error *err =3D NULL; @@ -2506,7 +2506,7 @@ static void megasas_class_init(ObjectClass *oc, void = *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PCIDeviceClass *pc =3D PCI_DEVICE_CLASS(oc); - MegasasBaseClass *e =3D MEGASAS_DEVICE_CLASS(oc); + MegasasBaseClass *e =3D MEGASAS_CLASS(oc); const MegasasInfo *info =3D data; =20 pc->realize =3D megasas_scsi_realize; --=20 2.26.2