Re: [PATCH 12/16] vhost: Clean up how VhostOpts method vhost_get_config() fails

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 7/20/21 2:54 PM, Markus Armbruster wrote:
>> 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>
>> ---
>>  hw/virtio/vhost-user.c |  2 ++
>>  hw/virtio/vhost.c      | 10 ++--------
>>  2 files changed, 4 insertions(+), 8 deletions(-)
>> 
>> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
>> index 29ea2b4fce..dbbd6fbc25 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;
>>      }
>
> Oops, should be error_setg_errno(EPROTO)!

D'oh!  Thanks!