···191191 return iov->iov_base;192192}193193194194+/* Wrapper for the last available index. Makes it easier to change. */195195+#define lg_last_avail(vq) ((vq)->last_avail_idx)196196+194197/* The virtio configuration space is defined to be little-endian. x86 is195198 * little-endian too, but it's nice to be explicit so we have these helpers. */196199#define cpu_to_le16(v16) (v16)···693690 unsigned int *out_num, unsigned int *in_num)694691{695692 unsigned int i, head;693693+ u16 last_avail;696694697695 /* Check it isn't doing very strange things with descriptor numbers. */698698- if ((u16)(vq->vring.avail->idx - vq->last_avail_idx) > vq->vring.num)696696+ last_avail = lg_last_avail(vq);697697+ if ((u16)(vq->vring.avail->idx - last_avail) > vq->vring.num)699698 errx(1, "Guest moved used index from %u to %u",700700- vq->last_avail_idx, vq->vring.avail->idx);699699+ last_avail, vq->vring.avail->idx);701700702701 /* If there's nothing new since last we looked, return invalid. */703703- if (vq->vring.avail->idx == vq->last_avail_idx)702702+ if (vq->vring.avail->idx == last_avail)704703 return vq->vring.num;705704706705 /* Grab the next descriptor number they're advertising, and increment707706 * the index we've seen. */708708- head = vq->vring.avail->ring[vq->last_avail_idx++ % vq->vring.num];707707+ head = vq->vring.avail->ring[last_avail % vq->vring.num];708708+ lg_last_avail(vq)++;709709710710 /* If their number is silly, that's a fatal mistake. */711711 if (head >= vq->vring.num)···986980 for (vq = dev->vq; vq; vq = vq->next) {987981 memset(vq->vring.desc, 0,988982 vring_size(vq->config.num, getpagesize()));989989- vq->last_avail_idx = 0;983983+ lg_last_avail(vq) = 0;990984 }991985 } else if (dev->desc->status & VIRTIO_CONFIG_S_FAILED) {992986 warnx("Device %s configuration FAILED", dev->name);