> @@ -237,7 +251,7 @@ static int vhost_user_read(struct vhost_dev *dev, > VhostUserMsg *msg) > error_report("Failed to read msg header." > " Size %d exceeds the maximum %zu.", msg->hdr.size, > VHOST_USER_PAYLOAD_SIZE); > - goto fail; > + return -1;
Hmm? Looks like a pointless indirection ... > } > > if (msg->hdr.size) { > @@ -247,14 +261,11 @@ static int vhost_user_read(struct vhost_dev *dev, > VhostUserMsg *msg) > if (r != size) { > error_report("Failed to read msg payload." > " Read %d instead of %d.", r, msg->hdr.size); > - goto fail; > + return -1; > } > } > > return 0; > - > -fail: > - return -1; ... if there is nothing to cleanup here. cheers, Gerd