| Message ID | 20230725104256.4861-4-fengli@smartx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Implement reconnect for vhost-user-scsi | expand |
> On Jul 25, 2023, at 6:42 AM, Li Feng <fengli@smartx.com> wrote: > > Multile devices need this macro, move it to a common header. > > Signed-off-by: Li Feng <fengli@smartx.com> Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com> > --- > hw/block/vhost-user-blk.c | 4 +--- > hw/virtio/vhost-user-gpio.c | 3 +-- > include/hw/virtio/vhost.h | 2 ++ > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c > index eecf3f7a81..3c69fa47d5 100644 > --- a/hw/block/vhost-user-blk.c > +++ b/hw/block/vhost-user-blk.c > @@ -32,8 +32,6 @@ > #include "sysemu/sysemu.h" > #include "sysemu/runstate.h" > > -#define REALIZE_CONNECTION_RETRIES 3 > - > static const int user_feature_bits[] = { > VIRTIO_BLK_F_SIZE_MAX, > VIRTIO_BLK_F_SEG_MAX, > @@ -482,7 +480,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) > s->inflight = g_new0(struct vhost_inflight, 1); > s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues); > > - retries = REALIZE_CONNECTION_RETRIES; > + retries = VU_REALIZE_CONN_RETRIES; > assert(!*errp); > do { > if (*errp) { > diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c > index 3b013f2d0f..d9979aa5db 100644 > --- a/hw/virtio/vhost-user-gpio.c > +++ b/hw/virtio/vhost-user-gpio.c > @@ -15,7 +15,6 @@ > #include "standard-headers/linux/virtio_ids.h" > #include "trace.h" > > -#define REALIZE_CONNECTION_RETRIES 3 > #define VHOST_NVQS 2 > > /* Features required from VirtIO */ > @@ -359,7 +358,7 @@ static void vu_gpio_device_realize(DeviceState *dev, Error **errp) > qemu_chr_fe_set_handlers(&gpio->chardev, NULL, NULL, vu_gpio_event, NULL, > dev, NULL, true); > > - retries = REALIZE_CONNECTION_RETRIES; > + retries = VU_REALIZE_CONN_RETRIES; > g_assert(!*errp); > do { > if (*errp) { > diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h > index 6a173cb9fa..ca3131b1af 100644 > --- a/include/hw/virtio/vhost.h > +++ b/include/hw/virtio/vhost.h > @@ -8,6 +8,8 @@ > #define VHOST_F_DEVICE_IOTLB 63 > #define VHOST_USER_F_PROTOCOL_FEATURES 30 > > +#define VU_REALIZE_CONN_RETRIES 3 > + > /* Generic structures common for any vhost based device. */ > > struct vhost_inflight { > -- > 2.41.0 >
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index eecf3f7a81..3c69fa47d5 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -32,8 +32,6 @@ #include "sysemu/sysemu.h" #include "sysemu/runstate.h" -#define REALIZE_CONNECTION_RETRIES 3 - static const int user_feature_bits[] = { VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_SEG_MAX, @@ -482,7 +480,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) s->inflight = g_new0(struct vhost_inflight, 1); s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues); - retries = REALIZE_CONNECTION_RETRIES; + retries = VU_REALIZE_CONN_RETRIES; assert(!*errp); do { if (*errp) { diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index 3b013f2d0f..d9979aa5db 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -15,7 +15,6 @@ #include "standard-headers/linux/virtio_ids.h" #include "trace.h" -#define REALIZE_CONNECTION_RETRIES 3 #define VHOST_NVQS 2 /* Features required from VirtIO */ @@ -359,7 +358,7 @@ static void vu_gpio_device_realize(DeviceState *dev, Error **errp) qemu_chr_fe_set_handlers(&gpio->chardev, NULL, NULL, vu_gpio_event, NULL, dev, NULL, true); - retries = REALIZE_CONNECTION_RETRIES; + retries = VU_REALIZE_CONN_RETRIES; g_assert(!*errp); do { if (*errp) { diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 6a173cb9fa..ca3131b1af 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -8,6 +8,8 @@ #define VHOST_F_DEVICE_IOTLB 63 #define VHOST_USER_F_PROTOCOL_FEATURES 30 +#define VU_REALIZE_CONN_RETRIES 3 + /* Generic structures common for any vhost based device. */ struct vhost_inflight {
Multile devices need this macro, move it to a common header. Signed-off-by: Li Feng <fengli@smartx.com> --- hw/block/vhost-user-blk.c | 4 +--- hw/virtio/vhost-user-gpio.c | 3 +-- include/hw/virtio/vhost.h | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-)