Vladimir Sementsov-Ogievskiy <[email protected]> writes: > This field is mostly unused and sometimes confusing (we even have > a TODO-like comment to drop it). Let's finally do. > > The field is used to held VHOST_USER_F_PROTOCOL_FEATURES for vhost-user > and/or VHOST_NET_F_VIRTIO_NET_HDR for vhost-net (which may be > vhost-user-net). But we can simply recalculate these two flags in place > from hdev->features, and from net-client for VHOST_NET_F_VIRTIO_NET_HDR. > > Note: removing field from x-query-virtio-status result is incompatible > change. We can do it because the command is unstable. > > Cc: [email protected] > Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]>
You improved the commit message like I suggested, but lost my Acked-by: Markus Armbruster <[email protected]> :) [...] > diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h > index 1ee639dd7e..3e69e47833 100644 > --- a/include/hw/virtio/vhost.h > +++ b/include/hw/virtio/vhost.h > @@ -100,16 +100,9 @@ struct vhost_dev { > * > * @features: available features provided by the backend > * @acked_features: final negotiated features with front-end driver > - * > - * @backend_features: this is used in a couple of places to either > - * store VHOST_USER_F_PROTOCOL_FEATURES to apply to > - * VHOST_USER_SET_FEATURES or VHOST_NET_F_VIRTIO_NET_HDR. Its > - * future use should be discouraged and the variable retired as > - * its easy to confuse with the VirtIO backend_features. > */ I guess this is the TODO-like comment mentioned in the commit message. > VIRTIO_DECLARE_FEATURES(features); > VIRTIO_DECLARE_FEATURES(acked_features); > - VIRTIO_DECLARE_FEATURES(backend_features); > > /** > * @protocol_features: is the vhost-user only feature set by > diff --git a/qapi/virtio.json b/qapi/virtio.json > index 05295ab665..b995a5bb6d 100644 > --- a/qapi/virtio.json > +++ b/qapi/virtio.json > @@ -85,8 +85,6 @@ > # > # @acked-features: vhost_dev acked_features > # > -# @backend-features: vhost_dev backend_features > -# > # @protocol-features: vhost_dev protocol_features > # > # @max-queues: vhost_dev max_queues > @@ -106,7 +104,6 @@ > 'vq-index': 'int', > 'features': 'VirtioDeviceFeatures', > 'acked-features': 'VirtioDeviceFeatures', > - 'backend-features': 'VirtioDeviceFeatures', > 'protocol-features': 'VhostDeviceProtocols', > 'max-queues': 'uint64', > 'backend-cap': 'uint64',
