SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost: Clean up how VhostOpts method vhost_get_config() fails

Browse Source 
vhost_user_get_config() can fail without setting an error.  Unclean.
Its caller vhost_dev_get_config() compensates by substituting a
generic error then.  Goes back to commit 50de51387f "vhost:
Distinguish errors in vhost_dev_get_config()".

Clean up by moving the generic error from vhost_dev_get_config() to
all the failure paths that neglect to set an error.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-13-armbru@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Sign of error_setg_errno()'s second argument fixed in both calls]
This commit is contained in:
Markus Armbruster 2021-07-20 14:54:04 +02:00
parent 0d9a665451
commit 66647ed459
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/virtio/vhost-user.c
View File

@ -2139,10 +2139,12 @@ static int vhost_user_get_config(struct vhost_dev *dev, uint8_t *config,
msg.payload.config.offset = 0; msg.payload.config.offset = 0;
msg.payload.config.size = config_len; msg.payload.config.size = config_len;
if (vhost_user_write(dev, &msg, NULL, 0) < 0) { if (vhost_user_write(dev, &msg, NULL, 0) < 0) {
error_setg_errno(errp, EPROTO, "vhost_get_config failed");
return -EPROTO; return -EPROTO;
} }
if (vhost_user_read(dev, &msg) < 0) { if (vhost_user_read(dev, &msg) < 0) {
error_setg_errno(errp, EPROTO, "vhost_get_config failed");
return -EPROTO; return -EPROTO;
} }

10
hw/virtio/vhost.c
View File

@ -1564,17 +1564,11 @@ void vhost_ack_features(struct vhost_dev *hdev, const int *feature_bits,
int vhost_dev_get_config(struct vhost_dev *hdev, uint8_t *config, int vhost_dev_get_config(struct vhost_dev *hdev, uint8_t *config,
uint32_t config_len, Error **errp) uint32_t config_len, Error **errp)
{ {
ERRP_GUARD();
int ret;
assert(hdev->vhost_ops); assert(hdev->vhost_ops);
if (hdev->vhost_ops->vhost_get_config) { if (hdev->vhost_ops->vhost_get_config) {
ret = hdev->vhost_ops->vhost_get_config(hdev, config, config_len, errp); return hdev->vhost_ops->vhost_get_config(hdev, config, config_len,
if (ret < 0 && !*errp) { errp);
error_setg_errno(errp, -ret, "vhost_get_config failed");
}
return ret;
} }
error_setg(errp, "vhost_get_config not implemented"); error_setg(errp, "vhost_get_config not implemented");