From: "Michael S. Tsirkin" <mst@redhat.com>
To: Cao jin <caoj.fnst@cn.fujitsu.com>
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com,
qemu-devel@nongnu.org, qemu-block@nongnu.org, hare@suse.de
Subject: Re: [Qemu-trivial] [PATCH] SCSI device: fix to incomplete QOMify
Date: Wed, 6 Jan 2016 13:23:03 +0200 [thread overview]
Message-ID: <20160106132255-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1452073066-28319-1-git-send-email-caoj.fnst@cn.fujitsu.com>
On Wed, Jan 06, 2016 at 05:37:46PM +0800, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/scsi/megasas.c | 12 ++++++------
> hw/scsi/scsi-bus.c | 4 ++--
> hw/scsi/virtio-scsi.c | 2 +-
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index d7dc667..78239bf 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -744,7 +744,7 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
> info.device.type = MFI_INFO_DEV_SAS3G;
> info.device.port_count = 8;
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t pd_id;
>
> if (num_pd_disks < 8) {
> @@ -960,7 +960,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, MegasasCmd *cmd)
> max_pd_disks = MFI_MAX_SYS_PDS;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t pd_id;
>
> if (num_pd_disks >= max_pd_disks)
> @@ -1136,7 +1136,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd)
> max_ld_disks = MFI_MAX_LD;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> if (num_ld_disks >= max_ld_disks) {
> break;
> @@ -1187,7 +1187,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd)
> max_ld_disks = MFI_MAX_LD;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> if (num_ld_disks >= max_ld_disks) {
> break;
> @@ -1327,7 +1327,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, MegasasCmd *cmd)
> ld_offset = array_offset + sizeof(struct mfi_array) * num_pd_disks;
>
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t sdev_id = ((sdev->id & 0xFF) << 8) | (sdev->lun & 0xFF);
> struct mfi_array *array;
> struct mfi_ld_config *ld;
> @@ -2237,7 +2237,7 @@ static void megasas_soft_reset(MegasasState *s)
> * after the initial reset.
> */
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> sdev->unit_attention = SENSE_CODE(NO_SENSE);
> scsi_device_unit_attention_reported(sdev);
> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> index 00bddc9..fea0257 100644
> --- a/hw/scsi/scsi-bus.c
> +++ b/hw/scsi/scsi-bus.c
> @@ -1850,7 +1850,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense)
>
> static char *scsibus_get_dev_path(DeviceState *dev)
> {
> - SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);
> + SCSIDevice *d = SCSI_DEVICE(dev);
> DeviceState *hba = dev->parent_bus->parent;
> char *id;
> char *path;
> @@ -2023,7 +2023,7 @@ static void scsi_device_class_init(ObjectClass *klass, void *data)
> static void scsi_dev_instance_init(Object *obj)
> {
> DeviceState *dev = DEVICE(obj);
> - SCSIDevice *s = DO_UPCAST(SCSIDevice, qdev, dev);
> + SCSIDevice *s = SCSI_DEVICE(dev);
>
> device_add_bootindex_property(obj, &s->conf.bootindex,
> "bootindex", NULL,
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index 3a4f520..607593c 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -352,7 +352,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
> target = req->req.tmf.lun[1];
> s->resetting++;
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - d = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + d = SCSI_DEVICE(kid->child);
> if (d->channel == 0 && d->id == target) {
> qdev_reset_all(&d->qdev);
> }
> --
> 2.1.0
>
>
WARNING: multiple messages have this Message-ID (diff)
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Cao jin <caoj.fnst@cn.fujitsu.com>
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com,
qemu-devel@nongnu.org, qemu-block@nongnu.org, hare@suse.de
Subject: Re: [Qemu-devel] [PATCH] SCSI device: fix to incomplete QOMify
Date: Wed, 6 Jan 2016 13:23:03 +0200 [thread overview]
Message-ID: <20160106132255-mutt-send-email-mst@redhat.com> (raw)
In-Reply-To: <1452073066-28319-1-git-send-email-caoj.fnst@cn.fujitsu.com>
On Wed, Jan 06, 2016 at 05:37:46PM +0800, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/scsi/megasas.c | 12 ++++++------
> hw/scsi/scsi-bus.c | 4 ++--
> hw/scsi/virtio-scsi.c | 2 +-
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
> index d7dc667..78239bf 100644
> --- a/hw/scsi/megasas.c
> +++ b/hw/scsi/megasas.c
> @@ -744,7 +744,7 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
> info.device.type = MFI_INFO_DEV_SAS3G;
> info.device.port_count = 8;
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t pd_id;
>
> if (num_pd_disks < 8) {
> @@ -960,7 +960,7 @@ static int megasas_dcmd_pd_get_list(MegasasState *s, MegasasCmd *cmd)
> max_pd_disks = MFI_MAX_SYS_PDS;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t pd_id;
>
> if (num_pd_disks >= max_pd_disks)
> @@ -1136,7 +1136,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd)
> max_ld_disks = MFI_MAX_LD;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> if (num_ld_disks >= max_ld_disks) {
> break;
> @@ -1187,7 +1187,7 @@ static int megasas_dcmd_ld_list_query(MegasasState *s, MegasasCmd *cmd)
> max_ld_disks = MFI_MAX_LD;
> }
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> if (num_ld_disks >= max_ld_disks) {
> break;
> @@ -1327,7 +1327,7 @@ static int megasas_dcmd_cfg_read(MegasasState *s, MegasasCmd *cmd)
> ld_offset = array_offset + sizeof(struct mfi_array) * num_pd_disks;
>
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
> uint16_t sdev_id = ((sdev->id & 0xFF) << 8) | (sdev->lun & 0xFF);
> struct mfi_array *array;
> struct mfi_ld_config *ld;
> @@ -2237,7 +2237,7 @@ static void megasas_soft_reset(MegasasState *s)
> * after the initial reset.
> */
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - SCSIDevice *sdev = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + SCSIDevice *sdev = SCSI_DEVICE(kid->child);
>
> sdev->unit_attention = SENSE_CODE(NO_SENSE);
> scsi_device_unit_attention_reported(sdev);
> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> index 00bddc9..fea0257 100644
> --- a/hw/scsi/scsi-bus.c
> +++ b/hw/scsi/scsi-bus.c
> @@ -1850,7 +1850,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev, SCSISense sense)
>
> static char *scsibus_get_dev_path(DeviceState *dev)
> {
> - SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);
> + SCSIDevice *d = SCSI_DEVICE(dev);
> DeviceState *hba = dev->parent_bus->parent;
> char *id;
> char *path;
> @@ -2023,7 +2023,7 @@ static void scsi_device_class_init(ObjectClass *klass, void *data)
> static void scsi_dev_instance_init(Object *obj)
> {
> DeviceState *dev = DEVICE(obj);
> - SCSIDevice *s = DO_UPCAST(SCSIDevice, qdev, dev);
> + SCSIDevice *s = SCSI_DEVICE(dev);
>
> device_add_bootindex_property(obj, &s->conf.bootindex,
> "bootindex", NULL,
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index 3a4f520..607593c 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -352,7 +352,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req)
> target = req->req.tmf.lun[1];
> s->resetting++;
> QTAILQ_FOREACH(kid, &s->bus.qbus.children, sibling) {
> - d = DO_UPCAST(SCSIDevice, qdev, kid->child);
> + d = SCSI_DEVICE(kid->child);
> if (d->channel == 0 && d->id == target) {
> qdev_reset_all(&d->qdev);
> }
> --
> 2.1.0
>
>
next prev parent reply other threads:[~2016-01-06 11:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 9:37 [Qemu-trivial] [PATCH] SCSI device: fix to incomplete QOMify Cao jin
2016-01-06 9:37 ` [Qemu-devel] " Cao jin
2016-01-06 11:23 ` Michael S. Tsirkin [this message]
2016-01-06 11:23 ` Michael S. Tsirkin
2016-01-07 10:07 ` [Qemu-trivial] " Paolo Bonzini
2016-01-07 10:07 ` [Qemu-devel] " Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160106132255-mutt-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=hare@suse.de \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.