aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/lguest/lguest.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-12-30 10:25:58 -0500
committerRusty Russell <rusty@rustcorp.com.au>2008-12-29 17:56:02 -0500
commit2966af73e70dee461c256b5eb877b2ff757f8c82 (patch)
tree5cb8a81e80cb9b513fad015f0dc4d5e5db52fd14 /Documentation/lguest/lguest.c
parent498af14783935af487d17dbee4ac451783cbc2b7 (diff)
virtio: use LGUEST_VRING_ALIGN instead of relying on pagesize
This doesn't really matter, since lguest is i386 only at the moment, but we could actually choose a different value. (lguest doesn't have a guarenteed ABI). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'Documentation/lguest/lguest.c')
-rw-r--r--Documentation/lguest/lguest.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 804520633fcf..aa2574ca94c7 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -1030,7 +1030,7 @@ static void update_device_status(struct device *dev)
1030 /* Zero out the virtqueues. */ 1030 /* Zero out the virtqueues. */
1031 for (vq = dev->vq; vq; vq = vq->next) { 1031 for (vq = dev->vq; vq; vq = vq->next) {
1032 memset(vq->vring.desc, 0, 1032 memset(vq->vring.desc, 0,
1033 vring_size(vq->config.num, getpagesize())); 1033 vring_size(vq->config.num, LGUEST_VRING_ALIGN));
1034 lg_last_avail(vq) = 0; 1034 lg_last_avail(vq) = 0;
1035 } 1035 }
1036 } else if (dev->desc->status & VIRTIO_CONFIG_S_FAILED) { 1036 } else if (dev->desc->status & VIRTIO_CONFIG_S_FAILED) {
@@ -1211,7 +1211,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs,
1211 void *p; 1211 void *p;
1212 1212
1213 /* First we need some memory for this virtqueue. */ 1213 /* First we need some memory for this virtqueue. */
1214 pages = (vring_size(num_descs, getpagesize()) + getpagesize() - 1) 1214 pages = (vring_size(num_descs, LGUEST_VRING_ALIGN) + getpagesize() - 1)
1215 / getpagesize(); 1215 / getpagesize();
1216 p = get_pages(pages); 1216 p = get_pages(pages);
1217 1217
@@ -1228,7 +1228,7 @@ static void add_virtqueue(struct device *dev, unsigned int num_descs,
1228 vq->config.pfn = to_guest_phys(p) / getpagesize(); 1228 vq->config.pfn = to_guest_phys(p) / getpagesize();
1229 1229
1230 /* Initialize the vring. */ 1230 /* Initialize the vring. */
1231 vring_init(&vq->vring, num_descs, p, getpagesize()); 1231 vring_init(&vq->vring, num_descs, p, LGUEST_VRING_ALIGN);
1232 1232
1233 /* Append virtqueue to this device's descriptor. We use 1233 /* Append virtqueue to this device's descriptor. We use
1234 * device_config() to get the end of the device's current virtqueues; 1234 * device_config() to get the end of the device's current virtqueues;