From: Sasha Levin <levinsasha928@gmail.com>
Date: Thu, 30 Aug 2012 07:36:40 +0000 (+0200)
Subject: kvm tools: fix warnings in virtio-blk
X-Git-Tag: next-20120904~31^2^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a670f98ceda5eae0c9cb8d12f9cbd1122659504;p=karo-tx-linux.git

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@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index 740442add6ab..d98836577dc7 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;
 }