diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-07-20 14:54:04 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-08-26 17:15:28 +0200 |
| commit | 66647ed4591572e7928cb5865909bb6c572d7e40 (patch) | |
| tree | d388696d682aae8efe8ffc1c17d89fe074cfbb3f /hw/virtio/vhost-user.c | |
| parent | 0d9a6654512a6b7ab18c53fc3f5a6bba8de2dde8 (diff) | |
| download | focaccia-qemu-66647ed4591572e7928cb5865909bb6c572d7e40.tar.gz focaccia-qemu-66647ed4591572e7928cb5865909bb6c572d7e40.zip | |
vhost: Clean up how VhostOpts method vhost_get_config() fails
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]
Diffstat (limited to 'hw/virtio/vhost-user.c')
| -rw-r--r-- | hw/virtio/vhost-user.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index aec6cc1990..229c114a19 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -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.size = config_len; if (vhost_user_write(dev, &msg, NULL, 0) < 0) { + error_setg_errno(errp, EPROTO, "vhost_get_config failed"); return -EPROTO; } if (vhost_user_read(dev, &msg) < 0) { + error_setg_errno(errp, EPROTO, "vhost_get_config failed"); return -EPROTO; } |