vhost-vsock: handle common features in vhost-vsock-common

virtio-vsock features, like VIRTIO_VSOCK_F_SEQPACKET, can be handled
by vhost-vsock-common parent class. In this way, we can reuse the
same code for all virtio-vsock backends (i.e. vhost-vsock,
vhost-user-vsock).

Let's move `seqpacket` property to vhost-vsock-common class, add
vhost_vsock_common_get_features() used by children, and disable
`seqpacket` for vhost-user-vsock device for machine types < 6.2.

The behavior of vhost-vsock device doesn't change; vhost-user-vsock
device now supports `seqpacket` property.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210921161642.206461-3-sgarzare@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Stefano Garzarella 2021-09-21 18:16:42 +02:00 committed by Michael S. Tsirkin
parent d6a9378f47
commit 46ce017167
6 changed files with 43 additions and 28 deletions

View file

@ -35,6 +35,9 @@ struct VHostVSockCommon {
VirtQueue *trans_vq;
QEMUTimer *post_load_timer;
/* features */
OnOffAuto seqpacket;
};
int vhost_vsock_common_start(VirtIODevice *vdev);
@ -43,5 +46,7 @@ int vhost_vsock_common_pre_save(void *opaque);
int vhost_vsock_common_post_load(void *opaque, int version_id);
void vhost_vsock_common_realize(VirtIODevice *vdev, const char *name);
void vhost_vsock_common_unrealize(VirtIODevice *vdev);
uint64_t vhost_vsock_common_get_features(VirtIODevice *vdev, uint64_t features,
Error **errp);
#endif /* _QEMU_VHOST_VSOCK_COMMON_H */

View file

@ -30,9 +30,6 @@ struct VHostVSock {
VHostVSockCommon parent;
VHostVSockConf conf;
/* features */
OnOffAuto seqpacket;
/*< public >*/
};