Messages in this thread Patch in this message | | | Date | Mon, 10 Oct 2022 10:44:02 -0700 | Subject | Re: [PATCH V2 2/3] vdpa_sim_net: support feature provisioning | From | Si-Wei Liu <> |
| |
Hi Michael,
Noticed that you just merged this series that we now got two nominally duplicated attributes: VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES and VDPA_ATTR_DEV_FEATURES. I think Jason agreed to remove one of them but did not get chance to post a new series to catch up with the merge window. Do you mind if I post a format patch similar as below to rectify this quickly from linux-next, without unnecessarily getting the dup exposed to the uAPI?
Thanks, -Siwei
--- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -855,7 +855,7 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms
features_device = vdev->config->get_device_features(vdev);
- if (nla_put_u64_64bit(msg, VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, features_device, + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_FEATURES, features_device, VDPA_ATTR_PAD)) return -EMSGSIZE;
diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h index 9bd7923..6e620c3 100644 --- a/include/uapi/linux/vdpa.h +++ b/include/uapi/linux/vdpa.h @@ -53,10 +53,8 @@ enum vdpa_attr { VDPA_ATTR_DEV_VENDOR_ATTR_NAME, /* string */ VDPA_ATTR_DEV_VENDOR_ATTR_VALUE, /* u64 */
- VDPA_ATTR_DEV_FEATURES, /* u64 */ - /* virtio features that are supported by the vDPA device */ - VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, /* u64 */ + VDPA_ATTR_DEV_FEATURES, /* u64 */
/* new attributes must be added above here */ VDPA_ATTR_MAX,
On 9/28/2022 9:10 PM, Jason Wang wrote: > I think VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES and > VDPA_ATTR_DEV_FEATURES are equivalent, we can rebase on each other if > it is needed. > > Thanks > >
| |