From 6af4abb60e99572e95da2ae4ef7a2f72a18be449 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Thu, 8 Nov 2007 21:13:44 -0600 Subject: [PATCH] --- yaml --- r: 73555 b: refs/heads/master c: 1200e646ae238afc536be70257290eb33fb6e364 h: refs/heads/master i: 73553: cf1a694306cfeb048afc1aaad426737a4324dc60 73551: ea7d4efdd0e223e1579c664bd117479692df7357 v: v3 --- [refs] | 2 +- trunk/Documentation/lguest/lguest.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 358b38e4631c..27aa08bf8a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bc4953ed44454c7f53d0b609445d1534981ee75 +refs/heads/master: 1200e646ae238afc536be70257290eb33fb6e364 diff --git a/trunk/Documentation/lguest/lguest.c b/trunk/Documentation/lguest/lguest.c index f2668390e8f7..157f6a26b939 100644 --- a/trunk/Documentation/lguest/lguest.c +++ b/trunk/Documentation/lguest/lguest.c @@ -1342,7 +1342,7 @@ static bool service_io(struct device *dev) if (out->type & VIRTIO_BLK_T_SCSI_CMD) { fprintf(stderr, "Scsi commands unsupported\n"); in->status = VIRTIO_BLK_S_UNSUPP; - wlen = sizeof(in); + wlen = sizeof(*in); } else if (out->type & VIRTIO_BLK_T_OUT) { /* Write */ @@ -1363,7 +1363,7 @@ static bool service_io(struct device *dev) /* Die, bad Guest, die. */ errx(1, "Write past end %llu+%u", off, ret); } - wlen = sizeof(in); + wlen = sizeof(*in); in->status = (ret >= 0 ? VIRTIO_BLK_S_OK : VIRTIO_BLK_S_IOERR); } else { /* Read */ @@ -1376,10 +1376,10 @@ static bool service_io(struct device *dev) ret = readv(vblk->fd, iov+1, in_num-1); verbose("READ from sector %llu: %i\n", out->sector, ret); if (ret >= 0) { - wlen = sizeof(in) + ret; + wlen = sizeof(*in) + ret; in->status = VIRTIO_BLK_S_OK; } else { - wlen = sizeof(in); + wlen = sizeof(*in); in->status = VIRTIO_BLK_S_IOERR; } }