Message ID | 1468386588-26584-7-git-send-email-famz@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, 13 Jul 2016 13:09:48 +0800 Fam Zheng <famz@redhat.com> wrote: > There is a new common one in virtio.h, use it. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > hw/scsi/virtio-scsi.c | 5 +++-- > include/hw/virtio/virtio-scsi.h | 6 ++---- > 2 files changed, 5 insertions(+), 6 deletions(-) I think you can merge this with patch 1, but anyway: Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 45e2ee8..88d4bf0 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -824,8 +824,9 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { }; void virtio_scsi_common_realize(DeviceState *dev, Error **errp, - HandleOutput ctrl, HandleOutput evt, - HandleOutput cmd) + VirtIOHandleOutput ctrl, + VirtIOHandleOutput evt, + VirtIOHandleOutput cmd) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIOSCSICommon *s = VIRTIO_SCSI_COMMON(dev); diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 5e3f088..a1e0cfb 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -121,11 +121,9 @@ typedef struct VirtIOSCSIReq { } req; } VirtIOSCSIReq; -typedef void (*HandleOutput)(VirtIODevice *, VirtQueue *); - void virtio_scsi_common_realize(DeviceState *dev, Error **errp, - HandleOutput ctrl, HandleOutput evt, - HandleOutput cmd); + VirtIOHandleOutput ctrl, VirtIOHandleOutput evt, + VirtIOHandleOutput cmd); void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp); void virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq);
There is a new common one in virtio.h, use it. Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/scsi/virtio-scsi.c | 5 +++-- include/hw/virtio/virtio-scsi.h | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-)