Commit-ID: 0a670f98ceda5eae0c9cb8d12f9cbd1122659504
Gitweb: http://git.kernel.org/tip/0a670f98ceda5eae0c9cb8d12f9cbd1122659504
Author: Sasha Levin <levinsasha928@xxxxxxxxx>
AuthorDate: Thu, 30 Aug 2012 09:36:40 +0200
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Fri, 31 Aug 2012 10:12:44 +0300
kvm tools: fix warnings in virtio-blk
Fix up warnings related to not checking return value of read/write by actually
handling errors there.
Signed-off-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/virtio/blk.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index 740442a..d988365 100644
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -184,9 +184,12 @@ static void *virtio_blk_thread(void *dev)
{
struct blk_dev *bdev = dev;
u64 data;
+ int r;
while (1) {
- read(bdev->io_efd, &data, sizeof(u64));
+ r = read(bdev->io_efd, &data, sizeof(u64));
+ if (r < 0)
+ continue;
virtio_blk_do_io(bdev->kvm, &bdev->vqs[0], bdev);
}
@@ -198,8 +201,11 @@ static int notify_vq(struct kvm *kvm, void *dev, u32 vq)
{
struct blk_dev *bdev = dev;
u64 data = 1;
+ int r;
- write(bdev->io_efd, &data, sizeof(data));
+ r = write(bdev->io_efd, &data, sizeof(data));
+ if (r < 0)
+ return r;
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|