From nobody Sat May 4 01:52:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604682261; cv=none; d=zohomail.com; s=zohoarc; b=b5CdnQMtQJZ4RwbmDm04IGw1w5+YYyEHGrbQ6y7nuRjaRWhuCAnv9g9/Jom4Mvhk4fhz1w2KvJNzQq0J2fX5+jxj6c4onfBJWCWNJIMc4+Wh5DYuqphXXlOTlBD+u/COunjRicYCldFK6g7GFyv6lf7PiZhMrsJ4zSTiBea71sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604682261; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=K3wfZcCwMKslEFjXlVJ3jqNVIPb5NGo7EYNvTAtaW0Y=; b=Ryb4e/qBlwqcYhHCLPwJxefWxCBG5QKdtO6KUTQCbPlnAnx6lswbS2XiLRAX/9i+yDd+0voh8tf7l+pHhJtdFjPx++VhPATWUnjCaVIRrXcXj9iYdhji7HCSRxdaP2Re2M5d/B52wnNAWtc0SLDvJiTJaVQ5833UGHpyNLBrL9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604682261717850.0612410909201; Fri, 6 Nov 2020 09:04:21 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-wL43hSmgOPaDM-1ge_1Knw-1; Fri, 06 Nov 2020 12:04:18 -0500 Received: by mail-wm1-f69.google.com with SMTP id y26so659123wmj.7 for ; Fri, 06 Nov 2020 09:04:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id v123sm3330004wme.7.2020.11.06.09.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 09:04:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604682260; 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=K3wfZcCwMKslEFjXlVJ3jqNVIPb5NGo7EYNvTAtaW0Y=; b=CkJmqr5rq/S0c5B8iLC+5esbs1LfG2GpD7iT6y0xtPh0Hu6TvGs7r7W2cUYgh8P+SwWo9B SvN2CjXcw/nYSBjoNRmB/w3hDg5bqGgR2QXwxFGu7R9oPUSkk4KKwpXav1aexq3wYr2XAB w0DLEXsk8ehFsfFC9m27JVw64nirNFY= X-MC-Unique: wL43hSmgOPaDM-1ge_1Knw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K3wfZcCwMKslEFjXlVJ3jqNVIPb5NGo7EYNvTAtaW0Y=; b=tbtrwIGIpt73EVuAWu+JnH/KCC24DVF2J0fGsR57BXH9T8u1XpOBcGrKoLw46JkrO5 1MbRmWZ4Xpp5dA6qcbuZn9MRgM9lmaWhCvzPpLkV6k6TKP2I2fX36GNVDSIr2K9SNilJ N7df9/OZN8PFZ3uiOsds6ZoA0zmtGCmalliiSVc/LzZ7DrVtHouKfX/qSDsNyZOhlZX4 FEw9yb9i71AX3pPih1S+n3lwgPj+CKQGJBTsjYJDm6SCDLUae6KVfbw9YS8nCzQBjbCA 0w/4vVKighYPw6gvIw/wrAHEa9Ky/psMinYyO0jxciXDwSlkZCwRrU9R+t5TBJWpNSCF d/CQ== X-Gm-Message-State: AOAM533T7yO0kkYmC9zk/hE2IYnykxP5WtM4pobeexVsdV5yCo323uf4 365T8TuWYtpMZ/H+pZXc+NVPHmhJEjMC4S17vg0maAqbS7dVZVOmadCit0Xd0hRqHZ11mkJooUl kRUdLlbeD6DCFkA== X-Received: by 2002:adf:f104:: with SMTP id r4mr3786244wro.202.1604682257495; Fri, 06 Nov 2020 09:04:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrk2TqWGpdD7Y2fa525+AMJB0ebORXfqExvGopeDXyoNqS1xNofDTgfu3VzWwoXdNxVQ3rfA== X-Received: by 2002:adf:f104:: with SMTP id r4mr3786210wro.202.1604682257274; Fri, 06 Nov 2020 09:04:17 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , qemu-trivial@nongnu.org, Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0 1/2] hw/scsi/scsi-disk: Rename type as TYPE_SCSI_DISK Date: Fri, 6 Nov 2020 18:04:03 +0100 Message-Id: <20201106170404.4130486-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201106170404.4130486-1-philmd@redhat.com> References: <20201106170404.4130486-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Rename TYPE_SCSI_DISK without the '_BASE' suffix to match the other abstract types in the codebase. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-disk.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e859534eaf3..d2b9cb28da1 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -53,9 +53,9 @@ #define DEFAULT_MAX_UNMAP_SIZE (1 * GiB) #define DEFAULT_MAX_IO_SIZE INT_MAX /* 2 GB - 1 block */ =20 -#define TYPE_SCSI_DISK_BASE "scsi-disk-base" +#define TYPE_SCSI_DISK "scsi-disk-base" =20 -OBJECT_DECLARE_TYPE(SCSIDiskState, SCSIDiskClass, SCSI_DISK_BASE) +OBJECT_DECLARE_TYPE(SCSIDiskState, SCSIDiskClass, SCSI_DISK) =20 struct SCSIDiskClass { SCSIDeviceClass parent_class; @@ -2956,7 +2956,7 @@ BlockAIOCB *scsi_dma_writev(int64_t offset, QEMUIOVec= tor *iov, static void scsi_disk_base_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SCSIDiskClass *sdc =3D SCSI_DISK_BASE_CLASS(klass); + SCSIDiskClass *sdc =3D SCSI_DISK_CLASS(klass); =20 dc->fw_name =3D "disk"; dc->reset =3D scsi_disk_reset; @@ -2966,7 +2966,7 @@ static void scsi_disk_base_class_initfn(ObjectClass *= klass, void *data) } =20 static const TypeInfo scsi_disk_base_info =3D { - .name =3D TYPE_SCSI_DISK_BASE, + .name =3D TYPE_SCSI_DISK, .parent =3D TYPE_SCSI_DEVICE, .class_init =3D scsi_disk_base_class_initfn, .instance_size =3D sizeof(SCSIDiskState), @@ -3036,7 +3036,7 @@ static void scsi_hd_class_initfn(ObjectClass *klass, = void *data) =20 static const TypeInfo scsi_hd_info =3D { .name =3D "scsi-hd", - .parent =3D TYPE_SCSI_DISK_BASE, + .parent =3D TYPE_SCSI_DISK, .class_init =3D scsi_hd_class_initfn, }; =20 @@ -3067,7 +3067,7 @@ static void scsi_cd_class_initfn(ObjectClass *klass, = void *data) =20 static const TypeInfo scsi_cd_info =3D { .name =3D "scsi-cd", - .parent =3D TYPE_SCSI_DISK_BASE, + .parent =3D TYPE_SCSI_DISK, .class_init =3D scsi_cd_class_initfn, }; =20 @@ -3090,7 +3090,7 @@ static void scsi_block_class_initfn(ObjectClass *klas= s, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); SCSIDeviceClass *sc =3D SCSI_DEVICE_CLASS(klass); - SCSIDiskClass *sdc =3D SCSI_DISK_BASE_CLASS(klass); + SCSIDiskClass *sdc =3D SCSI_DISK_CLASS(klass); =20 sc->realize =3D scsi_block_realize; sc->alloc_req =3D scsi_block_new_request; @@ -3106,7 +3106,7 @@ static void scsi_block_class_initfn(ObjectClass *klas= s, void *data) =20 static const TypeInfo scsi_block_info =3D { .name =3D "scsi-block", - .parent =3D TYPE_SCSI_DISK_BASE, + .parent =3D TYPE_SCSI_DISK, .class_init =3D scsi_block_class_initfn, }; #endif @@ -3146,7 +3146,7 @@ static void scsi_disk_class_initfn(ObjectClass *klass= , void *data) =20 static const TypeInfo scsi_disk_info =3D { .name =3D "scsi-disk", - .parent =3D TYPE_SCSI_DISK_BASE, + .parent =3D TYPE_SCSI_DISK, .class_init =3D scsi_disk_class_initfn, }; =20 --=20 2.26.2 From nobody Sat May 4 01:52:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604682268; cv=none; d=zohomail.com; s=zohoarc; b=L52R2MDBDH+KJxDxWZCgWeia/CL35xhH/FcXNb9d+NfkZjYMDIpPdyk2A9mcnofkRDmrfZP5e3cgYe6iU730Hiayo5tTsoSmWTncE01FIBsCUvA6rQoba3RYYpm3xJyHCout7FQK41ZSE07qXRLPmNNXdBgrHJBkKO7fCz0SMgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604682268; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9Y8CFV0FsZyXFJC+vbP/pWrux/jc89V1kGuvlpHPTJ4=; b=HmKKP/qtzmzgMcLca46UthkpyIxD/CS4IbmivqYCAK0hkhoMOr7IvZiAJhZSBL3zAqur8PMcnPMAXsApmaj7+HJNGREMrzChvBtqO5wMjDrYHcMDkoXMMf6oSdUB5m8NDkKGKtqxnNzPnAFbVsI3tMvu/wQvWTiT8CWnsJjtvAE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604682268230685.8391237649272; Fri, 6 Nov 2020 09:04:28 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-507-dc-ga7B8P56diLCaHeulgQ-1; Fri, 06 Nov 2020 12:04:24 -0500 Received: by mail-wr1-f71.google.com with SMTP id j15so692650wrd.16 for ; Fri, 06 Nov 2020 09:04:24 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id w11sm3254763wmg.36.2020.11.06.09.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Nov 2020 09:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604682266; 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=9Y8CFV0FsZyXFJC+vbP/pWrux/jc89V1kGuvlpHPTJ4=; b=VpkXAVajuwuKDqJ8kMCoNJUIlYJmPTSQI8eIct1R4I1tRLESCnfcw0tKP8NxrYSGCL0Owd NmUFpvf+n/LqFjZhw47IWTo7rBB+hxAtLvZGT6qqsGN5qTqDnxUNAT8+ZTzcZ2cgShQaHG REhwNCMCwLZo+BBGNOKBQCZmhyxldwE= X-MC-Unique: dc-ga7B8P56diLCaHeulgQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9Y8CFV0FsZyXFJC+vbP/pWrux/jc89V1kGuvlpHPTJ4=; b=bSvc4k971OV0/IT4zaHXpaJKC1Q8yqKgWcZAGI6V9r5mqKV/qEIgaSZmyJejg/XdSq oTKkYgnqhnhE5OsqdaTRXUhMV2+8Nsu91Om1a2ef0OAYdJ1lJj16rgppAqeMdVuBH2B7 df3F+mnu7989xnTK8pfSOPDD6hjyoSBslyFOBXZK+zDo79/wjfQG8Aos3FrlLyizGuYJ yZbl4IeKBhBZPNaZXnLwPRu4Th7UDwdJIh2z7opAKTDLnzvU2mg7peaQ5pVCZ34/Uti0 T5HaX7QYKg34yAqjI7ZwleYcQzWCxW2O1+ZVUgsMhDgkLdorJdJAIQsVNPBIU/YFI3kB KMrw== X-Gm-Message-State: AOAM533sXz/D1u0NcgSLYAMqCVtbHuHyQWZk4PEGlga1r5vRvXdhIUYS U86A+z8AG+j3NolqOyldrKAelGZFfzzRNxm6dVu7tyTi8hY+x9qHrpXH5/Cxf2PCEt6jlU7RhOr SIpYXR8zpbQq4GQ== X-Received: by 2002:adf:dd90:: with SMTP id x16mr3527719wrl.47.1604682263035; Fri, 06 Nov 2020 09:04:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyF9dkEmtisMjBG+P10QOqCmJW3OqZAN0NEceG7yctwzhsZWO+NA8vN+kKrXVzUb4fyVfhVRg== X-Received: by 2002:adf:dd90:: with SMTP id x16mr3527706wrl.47.1604682262895; Fri, 06 Nov 2020 09:04:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , qemu-trivial@nongnu.org, Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0 2/2] hw/scsi/scsi-disk: Use SCSI_DISK_GET_CLASS() macro Date: Fri, 6 Nov 2020 18:04:04 +0100 Message-Id: <20201106170404.4130486-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201106170404.4130486-1-philmd@redhat.com> References: <20201106170404.4130486-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Use the SCSI_DISK_GET_CLASS() macro to match the rest of the codebase. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/scsi-disk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index d2b9cb28da1..deb51ec8e7d 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -338,7 +338,7 @@ static void scsi_read_complete(void *opaque, int ret) static void scsi_do_read(SCSIDiskReq *r, int ret) { SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); + SCSIDiskClass *sdc =3D SCSI_DISK_GET_CLASS(s); =20 assert (r->req.aiocb =3D=3D NULL); if (scsi_disk_req_check_error(r, ret, false)) { @@ -438,7 +438,7 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int er= ror, bool acct_failed) { bool is_read =3D (r->req.cmd.mode =3D=3D SCSI_XFER_FROM_DEV); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); + SCSIDiskClass *sdc =3D SCSI_DISK_GET_CLASS(s); BlockErrorAction action =3D blk_get_error_action(s->qdev.conf.blk, is_read, error); =20 @@ -538,7 +538,7 @@ static void scsi_write_data(SCSIRequest *req) { SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, req); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, r->req.dev); - SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); + SCSIDiskClass *sdc =3D SCSI_DISK_GET_CLASS(s); =20 /* No data transfer may already be in progress */ assert(r->req.aiocb =3D=3D NULL); @@ -2149,7 +2149,7 @@ static int32_t scsi_disk_dma_command(SCSIRequest *req= , uint8_t *buf) { SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, req); SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, req->dev); - SCSIDiskClass *sdc =3D (SCSIDiskClass *) object_get_class(OBJECT(s)); + SCSIDiskClass *sdc =3D SCSI_DISK_GET_CLASS(s); uint32_t len; uint8_t command; =20 --=20 2.26.2