xfs: pass attr geometry to attr leaf header conversion functions
[cascardo/linux.git] / tools / lguest / lguest.c
index 7cc1fed..e440524 100644 (file)
@@ -66,6 +66,7 @@ typedef uint8_t u8;
 #define VIRTIO_CONFIG_NO_LEGACY
 #define VIRTIO_PCI_NO_LEGACY
 #define VIRTIO_BLK_NO_LEGACY
+#define VIRTIO_NET_NO_LEGACY
 
 /* Use in-kernel ones, which defines VIRTIO_F_VERSION_1 */
 #include "../../include/uapi/linux/virtio_config.h"
@@ -126,7 +127,7 @@ static struct device_list devices;
 
 struct virtio_pci_cfg_cap {
        struct virtio_pci_cap cap;
-       u32 window; /* Data for BAR access. */
+       u32 pci_cfg_data; /* Data for BAR access. */
 };
 
 struct virtio_pci_mmio {
@@ -170,6 +171,9 @@ struct device {
        /* Is it operational */
        bool running;
 
+       /* Has it written FEATURES_OK but not re-checked it? */
+       bool wrote_features_ok;
+
        /* PCI configuration */
        union {
                struct pci_config config;
@@ -197,6 +201,9 @@ struct virtqueue {
        /* Which device owns me. */
        struct device *dev;
 
+       /* Name for printing errors. */
+       const char *name;
+
        /* The actual ring of buffers. */
        struct vring vring;
 
@@ -246,6 +253,16 @@ static struct termios orig_term;
 #define le32_to_cpu(v32) (v32)
 #define le64_to_cpu(v64) (v64)
 
+/*
+ * A real device would ignore weird/non-compliant driver behaviour.  We
+ * stop and flag it, to help debugging Linux problems.
+ */
+#define bad_driver(d, fmt, ...) \
+       errx(1, "%s: bad driver: " fmt, (d)->name, ## __VA_ARGS__)
+#define bad_driver_vq(vq, fmt, ...)                           \
+       errx(1, "%s vq %s: bad driver: " fmt, (vq)->dev->name, \
+            vq->name, ## __VA_ARGS__)
+
 /* Is this iovec empty? */
 static bool iov_empty(const struct iovec iov[], unsigned int num_iov)
 {
@@ -258,7 +275,8 @@ static bool iov_empty(const struct iovec iov[], unsigned int num_iov)
 }
 
 /* Take len bytes from the front of this iovec. */
-static void iov_consume(struct iovec iov[], unsigned num_iov,
+static void iov_consume(struct device *d,
+                       struct iovec iov[], unsigned num_iov,
                        void *dest, unsigned len)
 {
        unsigned int i;
@@ -276,7 +294,7 @@ static void iov_consume(struct iovec iov[], unsigned num_iov,
                len -= used;
        }
        if (len != 0)
-               errx(1, "iovec too short!");
+               bad_driver(d, "iovec too short!");
 }
 
 /*L:100
@@ -612,7 +630,8 @@ static void tell_kernel(unsigned long start)
  * we have a convenient routine which checks it and exits with an error message
  * if something funny is going on:
  */
-static void *_check_pointer(unsigned long addr, unsigned int size,
+static void *_check_pointer(struct device *d,
+                           unsigned long addr, unsigned int size,
                            unsigned int line)
 {
        /*
@@ -620,7 +639,8 @@ static void *_check_pointer(unsigned long addr, unsigned int size,
         * or addr + size wraps around.
         */
        if ((addr + size) > guest_limit || (addr + size) < addr)
-               errx(1, "%s:%i: Invalid address %#lx", __FILE__, line, addr);
+               bad_driver(d, "%s:%i: Invalid address %#lx",
+                          __FILE__, line, addr);
        /*
         * We return a pointer for the caller's convenience, now we know it's
         * safe to use.
@@ -628,14 +648,14 @@ static void *_check_pointer(unsigned long addr, unsigned int size,
        return from_guest_phys(addr);
 }
 /* A macro which transparently hands the line number to the real function. */
-#define check_pointer(addr,size) _check_pointer(addr, size, __LINE__)
+#define check_pointer(d,addr,size) _check_pointer(d, addr, size, __LINE__)
 
 /*
  * Each buffer in the virtqueues is actually a chain of descriptors.  This
  * function returns the next descriptor in the chain, or vq->vring.num if we're
  * at the end.
  */
-static unsigned next_desc(struct vring_desc *desc,
+static unsigned next_desc(struct device *d, struct vring_desc *desc,
                          unsigned int i, unsigned int max)
 {
        unsigned int next;
@@ -650,7 +670,7 @@ static unsigned next_desc(struct vring_desc *desc,
        wmb();
 
        if (next >= max)
-               errx(1, "Desc next is %u", next);
+               bad_driver(d, "Desc next is %u", next);
 
        return next;
 }
@@ -668,12 +688,36 @@ static void trigger_irq(struct virtqueue *vq)
                return;
        vq->pending_used = 0;
 
-       /* If they don't want an interrupt, don't send one... */
+       /*
+        * 2.4.7.1:
+        *
+        *  If the VIRTIO_F_EVENT_IDX feature bit is not negotiated:
+        *    The driver MUST set flags to 0 or 1. 
+        */
+       if (vq->vring.avail->flags > 1)
+               bad_driver_vq(vq, "avail->flags = %u\n", vq->vring.avail->flags);
+
+       /*
+        * 2.4.7.2:
+        *
+        *  If the VIRTIO_F_EVENT_IDX feature bit is not negotiated:
+        *
+        *     - The device MUST ignore the used_event value.
+        *     - After the device writes a descriptor index into the used ring:
+        *         - If flags is 1, the device SHOULD NOT send an interrupt.
+        *         - If flags is 0, the device MUST send an interrupt.
+        */
        if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) {
                return;
        }
 
-       /* Set isr to 1 (queue interrupt pending) */
+       /*
+        * 4.1.4.5.1:
+        *
+        *  If MSI-X capability is disabled, the device MUST set the Queue
+        *  Interrupt bit in ISR status before sending a virtqueue notification
+        *  to the driver.
+        */
        vq->dev->mmio->isr = 0x1;
 
        /* Send the Guest an interrupt tell them we used something up. */
@@ -697,6 +741,14 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
        struct vring_desc *desc;
        u16 last_avail = lg_last_avail(vq);
 
+       /*
+        * 2.4.7.1:
+        *
+        *   The driver MUST handle spurious interrupts from the device.
+        *
+        * That's why this is a while loop.
+        */
+
        /* There's nothing available? */
        while (last_avail == vq->vring.avail->idx) {
                u64 event;
@@ -730,8 +782,8 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
 
        /* Check it isn't doing very strange things with descriptor numbers. */
        if ((u16)(vq->vring.avail->idx - last_avail) > vq->vring.num)
-               errx(1, "Guest moved used index from %u to %u",
-                    last_avail, vq->vring.avail->idx);
+               bad_driver_vq(vq, "Guest moved used index from %u to %u",
+                             last_avail, vq->vring.avail->idx);
 
        /* 
         * Make sure we read the descriptor number *after* we read the ring
@@ -748,7 +800,7 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
 
        /* If their number is silly, that's a fatal mistake. */
        if (head >= vq->vring.num)
-               errx(1, "Guest says index %u is available", head);
+               bad_driver_vq(vq, "Guest says index %u is available", head);
 
        /* When we start there are none of either input nor output. */
        *out_num = *in_num = 0;
@@ -763,24 +815,73 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
         * that: no rmb() required.
         */
 
-       /*
-        * If this is an indirect entry, then this buffer contains a descriptor
-        * table which we handle as if it's any normal descriptor chain.
-        */
-       if (desc[i].flags & VRING_DESC_F_INDIRECT) {
-               if (desc[i].len % sizeof(struct vring_desc))
-                       errx(1, "Invalid size for indirect buffer table");
+       do {
+               /*
+                * If this is an indirect entry, then this buffer contains a
+                * descriptor table which we handle as if it's any normal
+                * descriptor chain.
+                */
+               if (desc[i].flags & VRING_DESC_F_INDIRECT) {
+                       /* 2.4.5.3.1:
+                        *
+                        *  The driver MUST NOT set the VIRTQ_DESC_F_INDIRECT
+                        *  flag unless the VIRTIO_F_INDIRECT_DESC feature was
+                        *  negotiated.
+                        */
+                       if (!(vq->dev->features_accepted &
+                             (1<<VIRTIO_RING_F_INDIRECT_DESC)))
+                               bad_driver_vq(vq, "vq indirect not negotiated");
 
-               max = desc[i].len / sizeof(struct vring_desc);
-               desc = check_pointer(desc[i].addr, desc[i].len);
-               i = 0;
-       }
+                       /*
+                        * 2.4.5.3.1:
+                        *
+                        *   The driver MUST NOT set the VIRTQ_DESC_F_INDIRECT
+                        *   flag within an indirect descriptor (ie. only one
+                        *   table per descriptor).
+                        */
+                       if (desc != vq->vring.desc)
+                               bad_driver_vq(vq, "Indirect within indirect");
+
+                       /*
+                        * Proposed update VIRTIO-134 spells this out:
+                        *
+                        *   A driver MUST NOT set both VIRTQ_DESC_F_INDIRECT
+                        *   and VIRTQ_DESC_F_NEXT in flags.
+                        */
+                       if (desc[i].flags & VRING_DESC_F_NEXT)
+                               bad_driver_vq(vq, "indirect and next together");
+
+                       if (desc[i].len % sizeof(struct vring_desc))
+                               bad_driver_vq(vq,
+                                             "Invalid size for indirect table");
+                       /*
+                        * 2.4.5.3.2:
+                        *
+                        *  The device MUST ignore the write-only flag
+                        *  (flags&VIRTQ_DESC_F_WRITE) in the descriptor that
+                        *  refers to an indirect table.
+                        *
+                        * We ignore it here: :)
+                        */
+
+                       max = desc[i].len / sizeof(struct vring_desc);
+                       desc = check_pointer(vq->dev, desc[i].addr, desc[i].len);
+                       i = 0;
+
+                       /* 2.4.5.3.1:
+                        *
+                        *  A driver MUST NOT create a descriptor chain longer
+                        *  than the Queue Size of the device.
+                        */
+                       if (max > vq->pci_config.queue_size)
+                               bad_driver_vq(vq,
+                                             "indirect has too many entries");
+               }
 
-       do {
                /* Grab the first descriptor, and check it's OK. */
                iov[*out_num + *in_num].iov_len = desc[i].len;
                iov[*out_num + *in_num].iov_base
-                       = check_pointer(desc[i].addr, desc[i].len);
+                       = check_pointer(vq->dev, desc[i].addr, desc[i].len);
                /* If this is an input descriptor, increment that count. */
                if (desc[i].flags & VRING_DESC_F_WRITE)
                        (*in_num)++;
@@ -790,14 +891,15 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
                         * to come before any input descriptors.
                         */
                        if (*in_num)
-                               errx(1, "Descriptor has out after in");
+                               bad_driver_vq(vq,
+                                             "Descriptor has out after in");
                        (*out_num)++;
                }
 
                /* If we've got too many, that implies a descriptor loop. */
                if (*out_num + *in_num > max)
-                       errx(1, "Looped descriptor");
-       } while ((i = next_desc(desc, i, max)) != max);
+                       bad_driver_vq(vq, "Looped descriptor");
+       } while ((i = next_desc(vq->dev, desc, i, max)) != max);
 
        return head;
 }
@@ -854,7 +956,7 @@ static void console_input(struct virtqueue *vq)
        /* Make sure there's a descriptor available. */
        head = wait_for_vq_desc(vq, iov, &out_num, &in_num);
        if (out_num)
-               errx(1, "Output buffers in console in queue?");
+               bad_driver_vq(vq, "Output buffers in console in queue?");
 
        /* Read into it.  This is where we usually wait. */
        len = readv(STDIN_FILENO, iov, in_num);
@@ -907,7 +1009,7 @@ static void console_output(struct virtqueue *vq)
        /* We usually wait in here, for the Guest to give us something. */
        head = wait_for_vq_desc(vq, iov, &out, &in);
        if (in)
-               errx(1, "Input buffers in console output queue?");
+               bad_driver_vq(vq, "Input buffers in console output queue?");
 
        /* writev can return a partial write, so we loop here. */
        while (!iov_empty(iov, out)) {
@@ -916,7 +1018,7 @@ static void console_output(struct virtqueue *vq)
                        warn("Write to stdout gave %i (%d)", len, errno);
                        break;
                }
-               iov_consume(iov, out, NULL, len);
+               iov_consume(vq->dev, iov, out, NULL, len);
        }
 
        /*
@@ -945,7 +1047,7 @@ static void net_output(struct virtqueue *vq)
        /* We usually wait in here for the Guest to give us a packet. */
        head = wait_for_vq_desc(vq, iov, &out, &in);
        if (in)
-               errx(1, "Input buffers in net output queue?");
+               bad_driver_vq(vq, "Input buffers in net output queue?");
        /*
         * Send the whole thing through to /dev/net/tun.  It expects the exact
         * same format: what a coincidence!
@@ -993,7 +1095,7 @@ static void net_input(struct virtqueue *vq)
         */
        head = wait_for_vq_desc(vq, iov, &out, &in);
        if (out)
-               errx(1, "Output buffers in net input queue?");
+               bad_driver_vq(vq, "Output buffers in net input queue?");
 
        /*
         * If it looks like we'll block reading from the tun device, send them
@@ -1037,6 +1139,12 @@ static void kill_launcher(int signal)
        kill(0, SIGTERM);
 }
 
+static void reset_vq_pci_config(struct virtqueue *vq)
+{
+       vq->pci_config.queue_size = VIRTQUEUE_NUM;
+       vq->pci_config.queue_enable = 0;
+}
+
 static void reset_device(struct device *dev)
 {
        struct virtqueue *vq;
@@ -1049,8 +1157,19 @@ static void reset_device(struct device *dev)
        /* We're going to be explicitly killing threads, so ignore them. */
        signal(SIGCHLD, SIG_IGN);
 
+       /*
+        * 4.1.4.3.1:
+        *
+        *   The device MUST present a 0 in queue_enable on reset. 
+        *
+        * This means we set it here, and reset the saved ones in every vq.
+        */
+       dev->mmio->cfg.queue_enable = 0;
+
        /* Get rid of the virtqueue threads */
        for (vq = dev->vq; vq; vq = vq->next) {
+               vq->last_avail_idx = 0;
+               reset_vq_pci_config(vq);
                if (vq->thread != (pid_t)-1) {
                        kill(vq->thread, SIGTERM);
                        waitpid(vq->thread, NULL, 0);
@@ -1058,6 +1177,7 @@ static void reset_device(struct device *dev)
                }
        }
        dev->running = false;
+       dev->wrote_features_ok = false;
 
        /* Now we care if threads die. */
        signal(SIGCHLD, (void *)kill_launcher);
@@ -1079,23 +1199,6 @@ static void cleanup_devices(void)
                tcsetattr(STDIN_FILENO, TCSANOW, &orig_term);
 }
 
-/*L:215
- * This is the generic routine we call when the Guest uses LHCALL_NOTIFY.
- */
-static void handle_output(unsigned long addr)
-{
-       /*
-        * Early console write is done using notify on a nul-terminated string
-        * in Guest memory.  It's also great for hacking debugging messages
-        * into a Guest.
-        */
-       if (addr >= guest_limit)
-               errx(1, "Bad NOTIFY %#lx", addr);
-
-       write(STDOUT_FILENO, from_guest_phys(addr),
-             strnlen(from_guest_phys(addr), guest_limit - addr));
-}
-
 /*L:217
  * We do PCI.  This is mainly done to let us test the kernel virtio PCI
  * code.
@@ -1205,7 +1308,12 @@ static bool valid_bar_access(struct device *d,
            && cfg_access->cap.length != 4)
                return false;
 
-       /* Offset must be multiple of length */
+       /*
+        * 4.1.4.7.2:
+        *
+        *  The driver MUST NOT write a cap.offset which is not a multiple of
+        *  cap.length (ie. all accesses MUST be aligned).
+        */
        if (cfg_access->cap.offset % cfg_access->cap.length != 0)
                return false;
 
@@ -1301,15 +1409,23 @@ static bool pci_data_iowrite(u16 port, u32 mask, u32 val)
                 */
                iowrite(portoff, val, mask, &d->config_words[reg]);
                return true;
-       } else if (&d->config_words[reg] == &d->config.cfg_access.window) {
+       } else if (&d->config_words[reg] == &d->config.cfg_access.pci_cfg_data) {
                u32 write_mask;
 
+               /*
+                * 4.1.4.7.1:
+                *
+                *  Upon detecting driver write access to pci_cfg_data, the
+                *  device MUST execute a write access at offset cap.offset at
+                *  BAR selected by cap.bar using the first cap.length bytes
+                *  from pci_cfg_data.
+                */
+
                /* Must be bar 0 */
                if (!valid_bar_access(d, &d->config.cfg_access))
                        return false;
 
-               /* First copy what they wrote into the window */
-               iowrite(portoff, val, mask, &d->config.cfg_access.window);
+               iowrite(portoff, val, mask, &d->config.cfg_access.pci_cfg_data);
 
                /*
                 * Now emulate a write.  The mask we use is set by
@@ -1317,17 +1433,24 @@ static bool pci_data_iowrite(u16 port, u32 mask, u32 val)
                 */
                write_mask = (1ULL<<(8*d->config.cfg_access.cap.length)) - 1;
                verbose("Window writing %#x/%#x to bar %u, offset %u len %u\n",
-                       d->config.cfg_access.window, write_mask,
+                       d->config.cfg_access.pci_cfg_data, write_mask,
                        d->config.cfg_access.cap.bar,
                        d->config.cfg_access.cap.offset,
                        d->config.cfg_access.cap.length);
 
                emulate_mmio_write(d, d->config.cfg_access.cap.offset,
-                                  d->config.cfg_access.window, write_mask);
+                                  d->config.cfg_access.pci_cfg_data,
+                                  write_mask);
                return true;
        }
 
-       /* Complain about other writes. */
+       /*
+        * 4.1.4.1:
+        *
+        *  The driver MUST NOT write into any field of the capability
+        *  structure, with the exception of those with cap_type
+        *  VIRTIO_PCI_CAP_PCI_CFG...
+        */
        return false;
 }
 
@@ -1342,12 +1465,21 @@ static void pci_data_ioread(u16 port, u32 mask, u32 *val)
                return;
 
        /* Read through the PCI MMIO access window is special */
-       if (&d->config_words[reg] == &d->config.cfg_access.window) {
+       if (&d->config_words[reg] == &d->config.cfg_access.pci_cfg_data) {
                u32 read_mask;
 
+               /*
+                * 4.1.4.7.1:
+                *
+                *  Upon detecting driver read access to pci_cfg_data, the
+                *  device MUST execute a read access of length cap.length at
+                *  offset cap.offset at BAR selected by cap.bar and store the
+                *  first cap.length bytes in pci_cfg_data.
+                */
                /* Must be bar 0 */
                if (!valid_bar_access(d, &d->config.cfg_access))
-                       errx(1, "Invalid cfg_access to bar%u, offset %u len %u",
+                       bad_driver(d,
+                            "Invalid cfg_access to bar%u, offset %u len %u",
                             d->config.cfg_access.cap.bar,
                             d->config.cfg_access.cap.offset,
                             d->config.cfg_access.cap.length);
@@ -1357,12 +1489,12 @@ static void pci_data_ioread(u16 port, u32 mask, u32 *val)
                 * len, *not* this read!
                 */
                read_mask = (1ULL<<(8*d->config.cfg_access.cap.length))-1;
-               d->config.cfg_access.window
+               d->config.cfg_access.pci_cfg_data
                        = emulate_mmio_read(d,
                                            d->config.cfg_access.cap.offset,
                                            read_mask);
                verbose("Window read %#x/%#x from bar %u, offset %u len %u\n",
-                       d->config.cfg_access.window, read_mask,
+                       d->config.cfg_access.pci_cfg_data, read_mask,
                        d->config.cfg_access.cap.bar,
                        d->config.cfg_access.cap.offset,
                        d->config.cfg_access.cap.length);
@@ -1653,35 +1785,67 @@ static void restore_vq_config(struct virtio_pci_common_cfg *cfg,
 }
 
 /*
+ * 4.1.4.3.2:
+ *
+ *  The driver MUST configure the other virtqueue fields before
+ *  enabling the virtqueue with queue_enable.
+ *
  * When they enable the virtqueue, we check that their setup is valid.
  */
-static void enable_virtqueue(struct device *d, struct virtqueue *vq)
+static void check_virtqueue(struct device *d, struct virtqueue *vq)
 {
-       /*
-        * Create stack for thread.  Since the stack grows upwards, we point
-        * the stack pointer to the end of this region.
-        */
-       char *stack = malloc(32768);
-
        /* Because lguest is 32 bit, all the descriptor high bits must be 0 */
        if (vq->pci_config.queue_desc_hi
            || vq->pci_config.queue_avail_hi
            || vq->pci_config.queue_used_hi)
-               errx(1, "%s: invalid 64-bit queue address", d->name);
+               bad_driver_vq(vq, "invalid 64-bit queue address");
+
+       /*
+        * 2.4.1:
+        *
+        *  The driver MUST ensure that the physical address of the first byte
+        *  of each virtqueue part is a multiple of the specified alignment
+        *  value in the above table.
+        */
+       if (vq->pci_config.queue_desc_lo % 16
+           || vq->pci_config.queue_avail_lo % 2
+           || vq->pci_config.queue_used_lo % 4)
+               bad_driver_vq(vq, "invalid alignment in queue addresses");
 
        /* Initialize the virtqueue and check they're all in range. */
        vq->vring.num = vq->pci_config.queue_size;
-       vq->vring.desc = check_pointer(vq->pci_config.queue_desc_lo,
+       vq->vring.desc = check_pointer(vq->dev,
+                                      vq->pci_config.queue_desc_lo,
                                       sizeof(*vq->vring.desc) * vq->vring.num);
-       vq->vring.avail = check_pointer(vq->pci_config.queue_avail_lo,
+       vq->vring.avail = check_pointer(vq->dev,
+                                       vq->pci_config.queue_avail_lo,
                                        sizeof(*vq->vring.avail)
                                        + (sizeof(vq->vring.avail->ring[0])
                                           * vq->vring.num));
-       vq->vring.used = check_pointer(vq->pci_config.queue_used_lo,
+       vq->vring.used = check_pointer(vq->dev,
+                                      vq->pci_config.queue_used_lo,
                                       sizeof(*vq->vring.used)
                                       + (sizeof(vq->vring.used->ring[0])
                                          * vq->vring.num));
 
+       /*
+        * 2.4.9.1:
+        *
+        *   The driver MUST initialize flags in the used ring to 0
+        *   when allocating the used ring.
+        */
+       if (vq->vring.used->flags != 0)
+               bad_driver_vq(vq, "invalid initial used.flags %#x",
+                             vq->vring.used->flags);
+}
+
+static void start_virtqueue(struct virtqueue *vq)
+{
+       /*
+        * Create stack for thread.  Since the stack grows upwards, we point
+        * the stack pointer to the end of this region.
+        */
+       char *stack = malloc(32768);
 
        /* Create a zero-initialized eventfd. */
        vq->eventfd = eventfd(0, 0);
@@ -1697,45 +1861,157 @@ static void enable_virtqueue(struct device *d, struct virtqueue *vq)
                err(1, "Creating clone");
 }
 
+static void start_virtqueues(struct device *d)
+{
+       struct virtqueue *vq;
+
+       for (vq = d->vq; vq; vq = vq->next) {
+               if (vq->pci_config.queue_enable)
+                       start_virtqueue(vq);
+       }
+}
+
 static void emulate_mmio_write(struct device *d, u32 off, u32 val, u32 mask)
 {
        struct virtqueue *vq;
 
        switch (off) {
        case offsetof(struct virtio_pci_mmio, cfg.device_feature_select):
+               /*
+                * 4.1.4.3.1:
+                *
+                * The device MUST present the feature bits it is offering in
+                * device_feature, starting at bit device_feature_select ∗ 32
+                * for any device_feature_select written by the driver
+                */
                if (val == 0)
                        d->mmio->cfg.device_feature = d->features;
                else if (val == 1)
                        d->mmio->cfg.device_feature = (d->features >> 32);
                else
                        d->mmio->cfg.device_feature = 0;
-               goto write_through32;
+               goto feature_write_through32;
        case offsetof(struct virtio_pci_mmio, cfg.guest_feature_select):
                if (val > 1)
-                       errx(1, "%s: Unexpected driver select %u",
-                            d->name, val);
-               goto write_through32;
+                       bad_driver(d, "Unexpected driver select %u", val);
+               goto feature_write_through32;
        case offsetof(struct virtio_pci_mmio, cfg.guest_feature):
                if (d->mmio->cfg.guest_feature_select == 0) {
                        d->features_accepted &= ~((u64)0xFFFFFFFF);
                        d->features_accepted |= val;
                } else {
                        assert(d->mmio->cfg.guest_feature_select == 1);
-                       d->features_accepted &= ((u64)0xFFFFFFFF << 32);
+                       d->features_accepted &= 0xFFFFFFFF;
                        d->features_accepted |= ((u64)val) << 32;
                }
+               /*
+                * 2.2.1:
+                *
+                *   The driver MUST NOT accept a feature which the device did
+                *   not offer
+                */
                if (d->features_accepted & ~d->features)
-                       errx(1, "%s: over-accepted features %#llx of %#llx",
-                            d->name, d->features_accepted, d->features);
-               goto write_through32;
-       case offsetof(struct virtio_pci_mmio, cfg.device_status):
+                       bad_driver(d, "over-accepted features %#llx of %#llx",
+                                  d->features_accepted, d->features);
+               goto feature_write_through32;
+       case offsetof(struct virtio_pci_mmio, cfg.device_status): {
+               u8 prev;
+
                verbose("%s: device status -> %#x\n", d->name, val);
-               if (val == 0)
+               /*
+                * 4.1.4.3.1:
+                * 
+                *  The device MUST reset when 0 is written to device_status,
+                *  and present a 0 in device_status once that is done.
+                */
+               if (val == 0) {
                        reset_device(d);
+                       goto write_through8;
+               }
+
+               /* 2.1.1: The driver MUST NOT clear a device status bit. */
+               if (d->mmio->cfg.device_status & ~val)
+                       bad_driver(d, "unset of device status bit %#x -> %#x",
+                                  d->mmio->cfg.device_status, val);
+
+               /*
+                * 2.1.2:
+                *
+                *  The device MUST NOT consume buffers or notify the driver
+                *  before DRIVER_OK.
+                */
+               if (val & VIRTIO_CONFIG_S_DRIVER_OK
+                   && !(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER_OK))
+                       start_virtqueues(d);
+
+               /*
+                * 3.1.1:
+                *
+                *   The driver MUST follow this sequence to initialize a device:
+                *   - Reset the device.
+                *   - Set the ACKNOWLEDGE status bit: the guest OS has
+                 *     notice the device.
+                *   - Set the DRIVER status bit: the guest OS knows how
+                 *     to drive the device.
+                *   - Read device feature bits, and write the subset
+                *     of feature bits understood by the OS and driver
+                *     to the device. During this step the driver MAY
+                *     read (but MUST NOT write) the device-specific
+                *     configuration fields to check that it can
+                *     support the device before accepting it.
+                *   - Set the FEATURES_OK status bit.  The driver
+                *     MUST not accept new feature bits after this
+                *     step.
+                *   - Re-read device status to ensure the FEATURES_OK
+                *     bit is still set: otherwise, the device does
+                *     not support our subset of features and the
+                *     device is unusable.
+                *   - Perform device-specific setup, including
+                *     discovery of virtqueues for the device,
+                *     optional per-bus setup, reading and possibly
+                *     writing the device’s virtio configuration
+                *     space, and population of virtqueues.
+                *   - Set the DRIVER_OK status bit. At this point the
+                 *     device is “live”.
+                */
+               prev = 0;
+               switch (val & ~d->mmio->cfg.device_status) {
+               case VIRTIO_CONFIG_S_DRIVER_OK:
+                       prev |= VIRTIO_CONFIG_S_FEATURES_OK; /* fall thru */
+               case VIRTIO_CONFIG_S_FEATURES_OK:
+                       prev |= VIRTIO_CONFIG_S_DRIVER; /* fall thru */
+               case VIRTIO_CONFIG_S_DRIVER:
+                       prev |= VIRTIO_CONFIG_S_ACKNOWLEDGE; /* fall thru */
+               case VIRTIO_CONFIG_S_ACKNOWLEDGE:
+                       break;
+               default:
+                       bad_driver(d, "unknown device status bit %#x -> %#x",
+                                  d->mmio->cfg.device_status, val);
+               }
+               if (d->mmio->cfg.device_status != prev)
+                       bad_driver(d, "unexpected status transition %#x -> %#x",
+                                  d->mmio->cfg.device_status, val);
+
+               /* If they just wrote FEATURES_OK, we make sure they read */
+               switch (val & ~d->mmio->cfg.device_status) {
+               case VIRTIO_CONFIG_S_FEATURES_OK:
+                       d->wrote_features_ok = true;
+                       break;
+               case VIRTIO_CONFIG_S_DRIVER_OK:
+                       if (d->wrote_features_ok)
+                               bad_driver(d, "did not re-read FEATURES_OK");
+                       break;
+               }
                goto write_through8;
+       }
        case offsetof(struct virtio_pci_mmio, cfg.queue_select):
                vq = vq_by_num(d, val);
-               /* Out of range?  Return size 0 */
+               /*
+                * 4.1.4.3.1:
+                *
+                *  The device MUST present a 0 in queue_size if the virtqueue
+                *  corresponding to the current queue_select is unavailable.
+                */
                if (!vq) {
                        d->mmio->cfg.queue_size = 0;
                        goto write_through16;
@@ -1748,44 +2024,95 @@ static void emulate_mmio_write(struct device *d, u32 off, u32 val, u32 mask)
                restore_vq_config(&d->mmio->cfg, vq);
                goto write_through16;
        case offsetof(struct virtio_pci_mmio, cfg.queue_size):
+               /*
+                * 4.1.4.3.2:
+                *
+                *  The driver MUST NOT write a value which is not a power of 2
+                *  to queue_size.
+                */
                if (val & (val-1))
-                       errx(1, "%s: invalid queue size %u\n", d->name, val);
+                       bad_driver(d, "invalid queue size %u", val);
                if (d->mmio->cfg.queue_enable)
-                       errx(1, "%s: changing queue size on live device",
-                            d->name);
+                       bad_driver(d, "changing queue size on live device");
                goto write_through16;
        case offsetof(struct virtio_pci_mmio, cfg.queue_msix_vector):
-               errx(1, "%s: attempt to set MSIX vector to %u",
-                    d->name, val);
-       case offsetof(struct virtio_pci_mmio, cfg.queue_enable):
+               bad_driver(d, "attempt to set MSIX vector to %u", val);
+       case offsetof(struct virtio_pci_mmio, cfg.queue_enable): {
+               struct virtqueue *vq = vq_by_num(d, d->mmio->cfg.queue_select);
+
+               /*
+                * 4.1.4.3.2:
+                *
+                *  The driver MUST NOT write a 0 to queue_enable.
+                */
                if (val != 1)
-                       errx(1, "%s: setting queue_enable to %u", d->name, val);
+                       bad_driver(d, "setting queue_enable to %u", val);
+
+               /*
+                * 3.1.1:
+                *
+                *  7. Perform device-specific setup, including discovery of
+                *     virtqueues for the device, optional per-bus setup,
+                *     reading and possibly writing the device’s virtio
+                *     configuration space, and population of virtqueues.
+                *  8. Set the DRIVER_OK status bit.
+                *
+                * All our devices require all virtqueues to be enabled, so
+                * they should have done that before setting DRIVER_OK.
+                */
+               if (d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER_OK)
+                       bad_driver(d, "enabling vq after DRIVER_OK");
+
                d->mmio->cfg.queue_enable = val;
-               save_vq_config(&d->mmio->cfg,
-                              vq_by_num(d, d->mmio->cfg.queue_select));
-               enable_virtqueue(d, vq_by_num(d, d->mmio->cfg.queue_select));
+               save_vq_config(&d->mmio->cfg, vq);
+               check_virtqueue(d, vq);
                goto write_through16;
+       }
        case offsetof(struct virtio_pci_mmio, cfg.queue_notify_off):
-               errx(1, "%s: attempt to write to queue_notify_off", d->name);
+               bad_driver(d, "attempt to write to queue_notify_off");
        case offsetof(struct virtio_pci_mmio, cfg.queue_desc_lo):
        case offsetof(struct virtio_pci_mmio, cfg.queue_desc_hi):
        case offsetof(struct virtio_pci_mmio, cfg.queue_avail_lo):
        case offsetof(struct virtio_pci_mmio, cfg.queue_avail_hi):
        case offsetof(struct virtio_pci_mmio, cfg.queue_used_lo):
        case offsetof(struct virtio_pci_mmio, cfg.queue_used_hi):
+               /*
+                * 4.1.4.3.2:
+                *
+                *  The driver MUST configure the other virtqueue fields before
+                *  enabling the virtqueue with queue_enable.
+                */
                if (d->mmio->cfg.queue_enable)
-                       errx(1, "%s: changing queue on live device",
-                            d->name);
+                       bad_driver(d, "changing queue on live device");
+
+               /*
+                * 3.1.1:
+                *
+                *  The driver MUST follow this sequence to initialize a device:
+                *...
+                *  5. Set the FEATURES_OK status bit. The driver MUST not
+                *  accept new feature bits after this step.
+                */
+               if (!(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_FEATURES_OK))
+                       bad_driver(d, "setting up vq before FEATURES_OK");
+
+               /*
+                *  6. Re-read device status to ensure the FEATURES_OK bit is
+                *     still set...
+                */
+               if (d->wrote_features_ok)
+                       bad_driver(d, "didn't re-read FEATURES_OK before setup");
+
                goto write_through32;
        case offsetof(struct virtio_pci_mmio, notify):
                vq = vq_by_num(d, val);
                if (!vq)
-                       errx(1, "Invalid vq notification on %u", val);
+                       bad_driver(d, "Invalid vq notification on %u", val);
                /* Notify the process handling this vq by adding 1 to eventfd */
                write(vq->eventfd, "\1\0\0\0\0\0\0\0", 8);
                goto write_through16;
        case offsetof(struct virtio_pci_mmio, isr):
-               errx(1, "%s: Unexpected write to isr", d->name);
+               bad_driver(d, "Unexpected write to isr");
        /* Weird corner case: write to emerg_wr of console */
        case sizeof(struct virtio_pci_mmio)
                + offsetof(struct virtio_console_config, emerg_wr):
@@ -1796,13 +2123,46 @@ static void emulate_mmio_write(struct device *d, u32 off, u32 val, u32 mask)
                }
                /* Fall through... */
        default:
-               errx(1, "%s: Unexpected write to offset %u", d->name, off);
+               /*
+                * 4.1.4.3.2:
+                *
+                *   The driver MUST NOT write to device_feature, num_queues,
+                *   config_generation or queue_notify_off.
+                */
+               bad_driver(d, "Unexpected write to offset %u", off);
        }
 
+feature_write_through32:
+       /*
+        * 3.1.1:
+        *
+        *   The driver MUST follow this sequence to initialize a device:
+        *...
+        *   - Set the DRIVER status bit: the guest OS knows how
+        *     to drive the device.
+        *   - Read device feature bits, and write the subset
+        *     of feature bits understood by the OS and driver
+        *     to the device.
+        *...
+        *   - Set the FEATURES_OK status bit. The driver MUST not
+        *     accept new feature bits after this step.
+        */
+       if (!(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER))
+               bad_driver(d, "feature write before VIRTIO_CONFIG_S_DRIVER");
+       if (d->mmio->cfg.device_status & VIRTIO_CONFIG_S_FEATURES_OK)
+               bad_driver(d, "feature write after VIRTIO_CONFIG_S_FEATURES_OK");
+
+       /*
+        * 4.1.3.1:
+        *
+        *  The driver MUST access each field using the “natural” access
+        *  method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for
+        *  16-bit fields and 8-bit accesses for 8-bit fields.
+        */
 write_through32:
        if (mask != 0xFFFFFFFF) {
-               errx(1, "%s: non-32-bit write to offset %u (%#x)",
-                    d->name, off, getreg(eip));
+               bad_driver(d, "non-32-bit write to offset %u (%#x)",
+                          off, getreg(eip));
                return;
        }
        memcpy((char *)d->mmio + off, &val, 4);
@@ -1810,15 +2170,15 @@ write_through32:
 
 write_through16:
        if (mask != 0xFFFF)
-               errx(1, "%s: non-16-bit (%#x) write to offset %u (%#x)",
-                    d->name, mask, off, getreg(eip));
+               bad_driver(d, "non-16-bit write to offset %u (%#x)",
+                          off, getreg(eip));
        memcpy((char *)d->mmio + off, &val, 2);
        return;
 
 write_through8:
        if (mask != 0xFF)
-               errx(1, "%s: non-8-bit write to offset %u (%#x)",
-                    d->name, off, getreg(eip));
+               bad_driver(d, "non-8-bit write to offset %u (%#x)",
+                          off, getreg(eip));
        memcpy((char *)d->mmio + off, &val, 1);
        return;
 }
@@ -1833,32 +2193,87 @@ static u32 emulate_mmio_read(struct device *d, u32 off, u32 mask)
        case offsetof(struct virtio_pci_mmio, cfg.device_feature):
        case offsetof(struct virtio_pci_mmio, cfg.guest_feature_select):
        case offsetof(struct virtio_pci_mmio, cfg.guest_feature):
+               /*
+                * 3.1.1:
+                *
+                *   The driver MUST follow this sequence to initialize a device:
+                *...
+                *   - Set the DRIVER status bit: the guest OS knows how
+                *     to drive the device.
+                *   - Read device feature bits, and write the subset
+                *     of feature bits understood by the OS and driver
+                *     to the device.
+                */
+               if (!(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER))
+                       bad_driver(d,
+                                  "feature read before VIRTIO_CONFIG_S_DRIVER");
                goto read_through32;
        case offsetof(struct virtio_pci_mmio, cfg.msix_config):
-               errx(1, "%s: read of msix_config", d->name);
+               bad_driver(d, "read of msix_config");
        case offsetof(struct virtio_pci_mmio, cfg.num_queues):
                goto read_through16;
        case offsetof(struct virtio_pci_mmio, cfg.device_status):
+               /* As they did read, any write of FEATURES_OK is now fine. */
+               d->wrote_features_ok = false;
+               goto read_through8;
        case offsetof(struct virtio_pci_mmio, cfg.config_generation):
+               /*
+                * 4.1.4.3.1:
+                *
+                *  The device MUST present a changed config_generation after
+                *  the driver has read a device-specific configuration value
+                *  which has changed since any part of the device-specific
+                *  configuration was last read.
+                *
+                * This is simple: none of our devices change config, so this
+                * is always 0.
+                */
                goto read_through8;
        case offsetof(struct virtio_pci_mmio, notify):
+               /*
+                * 3.1.1:
+                *
+                *   The driver MUST NOT notify the device before setting
+                *   DRIVER_OK.
+                */
+               if (!(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER_OK))
+                       bad_driver(d, "notify before VIRTIO_CONFIG_S_DRIVER_OK");
                goto read_through16;
        case offsetof(struct virtio_pci_mmio, isr):
                if (mask != 0xFF)
-                       errx(1, "%s: non-8-bit read from offset %u (%#x)",
-                            d->name, off, getreg(eip));
-               /* Read resets the isr */
+                       bad_driver(d, "non-8-bit read from offset %u (%#x)",
+                                  off, getreg(eip));
                isr = d->mmio->isr;
+               /*
+                * 4.1.4.5.1:
+                *
+                *  The device MUST reset ISR status to 0 on driver read. 
+                */
                d->mmio->isr = 0;
                return isr;
        case offsetof(struct virtio_pci_mmio, padding):
-               errx(1, "%s: read from padding (%#x)",
-                    d->name, getreg(eip));
+               bad_driver(d, "read from padding (%#x)", getreg(eip));
        default:
                /* Read from device config space, beware unaligned overflow */
                if (off > d->mmio_size - 4)
-                       errx(1, "%s: read past end (%#x)",
-                            d->name, getreg(eip));
+                       bad_driver(d, "read past end (%#x)", getreg(eip));
+
+               /*
+                * 3.1.1:
+                *  The driver MUST follow this sequence to initialize a device:
+                *...
+                *  3. Set the DRIVER status bit: the guest OS knows how to
+                *  drive the device.
+                *  4. Read device feature bits, and write the subset of
+                *  feature bits understood by the OS and driver to the
+                *  device. During this step the driver MAY read (but MUST NOT
+                *  write) the device-specific configuration fields to check
+                *  that it can support the device before accepting it.
+                */
+               if (!(d->mmio->cfg.device_status & VIRTIO_CONFIG_S_DRIVER))
+                       bad_driver(d,
+                                  "config read before VIRTIO_CONFIG_S_DRIVER");
+
                if (mask == 0xFFFFFFFF)
                        goto read_through32;
                else if (mask == 0xFFFF)
@@ -1867,24 +2282,31 @@ static u32 emulate_mmio_read(struct device *d, u32 off, u32 mask)
                        goto read_through8;
        }
 
+       /*
+        * 4.1.3.1:
+        *
+        *  The driver MUST access each field using the “natural” access
+        *  method, i.e. 32-bit accesses for 32-bit fields, 16-bit accesses for
+        *  16-bit fields and 8-bit accesses for 8-bit fields.
+        */
 read_through32:
        if (mask != 0xFFFFFFFF)
-               errx(1, "%s: non-32-bit read to offset %u (%#x)",
-                    d->name, off, getreg(eip));
+               bad_driver(d, "non-32-bit read to offset %u (%#x)",
+                          off, getreg(eip));
        memcpy(&val, (char *)d->mmio + off, 4);
        return val;
 
 read_through16:
        if (mask != 0xFFFF)
-               errx(1, "%s: non-16-bit read to offset %u (%#x)",
-                    d->name, off, getreg(eip));
+               bad_driver(d, "non-16-bit read to offset %u (%#x)",
+                          off, getreg(eip));
        memcpy(&val, (char *)d->mmio + off, 2);
        return val;
 
 read_through8:
        if (mask != 0xFF)
-               errx(1, "%s: non-8-bit read to offset %u (%#x)",
-                    d->name, off, getreg(eip));
+               bad_driver(d, "non-8-bit read to offset %u (%#x)",
+                          off, getreg(eip));
        memcpy(&val, (char *)d->mmio + off, 1);
        return val;
 }
@@ -1952,7 +2374,8 @@ static void emulate_mmio(unsigned long paddr, const u8 *insn)
  * routines to allocate and manage them.
  */
 static void add_pci_virtqueue(struct device *dev,
-                             void (*service)(struct virtqueue *))
+                             void (*service)(struct virtqueue *),
+                             const char *name)
 {
        struct virtqueue **i, *vq = malloc(sizeof(*vq));
 
@@ -1960,6 +2383,7 @@ static void add_pci_virtqueue(struct device *dev,
        vq->next = NULL;
        vq->last_avail_idx = 0;
        vq->dev = dev;
+       vq->name = name;
 
        /*
         * This is the routine the service thread will run, and its Process ID
@@ -1969,8 +2393,7 @@ static void add_pci_virtqueue(struct device *dev,
        vq->thread = (pid_t)-1;
 
        /* Initialize the configuration. */
-       vq->pci_config.queue_size = VIRTQUEUE_NUM;
-       vq->pci_config.queue_enable = 0;
+       reset_vq_pci_config(vq);
        vq->pci_config.queue_notify_off = 0;
 
        /* Add one to the number of queues */
@@ -2008,10 +2431,25 @@ static void set_device_config(struct device *dev, const void *conf, size_t len)
        dev->mmio = realloc(dev->mmio, dev->mmio_size);
        memcpy(dev->mmio + 1, conf, len);
 
+       /*
+        * 4.1.4.6:
+        *
+        *  The device MUST present at least one VIRTIO_PCI_CAP_DEVICE_CFG
+        *  capability for any device type which has a device-specific
+        *  configuration.
+        */
        /* Hook up device cfg */
        dev->config.cfg_access.cap.cap_next
                = offsetof(struct pci_config, device);
 
+       /*
+        * 4.1.4.6.1:
+        *
+        *  The offset for the device-specific configuration MUST be 4-byte
+        *  aligned.
+        */
+       assert(dev->config.cfg_access.cap.cap_next % 4 == 0);
+
        /* Fix up device cfg field length. */
        dev->config.device.length = len;
 
@@ -2041,7 +2479,16 @@ static void init_pci_config(struct pci_config *pci, u16 type,
 {
        size_t bar_offset, bar_len;
 
-       /* Save typing: most thing are happy being zero. */
+       /*
+        * 4.1.4.4.1:
+        *
+        *  The device MUST either present notify_off_multiplier as an even
+        *  power of 2, or present notify_off_multiplier as 0.
+        *
+        * 2.1.2:
+        *
+        *   The device MUST initialize device status to 0 upon reset. 
+        */
        memset(pci, 0, sizeof(*pci));
 
        /* 4.1.2.1: Devices MUST have the PCI Vendor ID 0x1AF4 */
@@ -2058,14 +2505,18 @@ static void init_pci_config(struct pci_config *pci, u16 type,
        pci->subclass = subclass;
 
        /*
-        * 4.1.2.1 Non-transitional devices SHOULD have a PCI Revision
-        * ID of 1 or higher
+        * 4.1.2.1:
+        *
+        *  Non-transitional devices SHOULD have a PCI Revision ID of 1 or
+        *  higher
         */
        pci->revid = 1;
 
        /*
-        * 4.1.2.1 Non-transitional devices SHOULD have a PCI
-        * Subsystem Device ID of 0x40 or higher.
+        * 4.1.2.1:
+        *
+        *  Non-transitional devices SHOULD have a PCI Subsystem Device ID of
+        *  0x40 or higher.
         */
        pci->subsystem_device_id = 0x40;
 
@@ -2077,17 +2528,48 @@ static void init_pci_config(struct pci_config *pci, u16 type,
        pci->status = (1 << 4);
 
        /* Link them in. */
+       /*
+        * 4.1.4.3.1:
+        *
+        *  The device MUST present at least one common configuration
+        *  capability.
+        */
        pci->capabilities = offsetof(struct pci_config, common);
 
+       /* 4.1.4.3.1 ... offset MUST be 4-byte aligned. */
+       assert(pci->capabilities % 4 == 0);
+
        bar_offset = offsetof(struct virtio_pci_mmio, cfg);
        bar_len = sizeof(((struct virtio_pci_mmio *)0)->cfg);
        init_cap(&pci->common, sizeof(pci->common), VIRTIO_PCI_CAP_COMMON_CFG,
                 bar_offset, bar_len,
                 offsetof(struct pci_config, notify));
 
+       /*
+        * 4.1.4.4.1:
+        *
+        *  The device MUST present at least one notification capability.
+        */
        bar_offset += bar_len;
        bar_len = sizeof(((struct virtio_pci_mmio *)0)->notify);
+
+       /*
+        * 4.1.4.4.1:
+        *
+        *  The cap.offset MUST be 2-byte aligned.
+        */
+       assert(pci->common.cap_next % 2 == 0);
+
        /* FIXME: Use a non-zero notify_off, for per-queue notification? */
+       /*
+        * 4.1.4.4.1:
+        *
+        *  The value cap.length presented by the device MUST be at least 2 and
+        *  MUST be large enough to support queue notification offsets for all
+        *  supported queues in all possible configurations.
+        */
+       assert(bar_len >= 2);
+
        init_cap(&pci->notify.cap, sizeof(pci->notify),
                 VIRTIO_PCI_CAP_NOTIFY_CFG,
                 bar_offset, bar_len,
@@ -2095,11 +2577,23 @@ static void init_pci_config(struct pci_config *pci, u16 type,
 
        bar_offset += bar_len;
        bar_len = sizeof(((struct virtio_pci_mmio *)0)->isr);
+       /*
+        * 4.1.4.5.1:
+        *
+        *  The device MUST present at least one VIRTIO_PCI_CAP_ISR_CFG
+        *  capability.
+        */
        init_cap(&pci->isr, sizeof(pci->isr),
                 VIRTIO_PCI_CAP_ISR_CFG,
                 bar_offset, bar_len,
                 offsetof(struct pci_config, cfg_access));
 
+       /*
+        * 4.1.4.7.1:
+        *
+        * The device MUST present at least one VIRTIO_PCI_CAP_PCI_CFG
+        * capability.
+        */
        /* This doesn't have any presence in the BAR */
        init_cap(&pci->cfg_access.cap, sizeof(pci->cfg_access),
                 VIRTIO_PCI_CAP_PCI_CFG,
@@ -2134,6 +2628,7 @@ static struct device *new_pci_device(const char *name, u16 type,
        dev->name = name;
        dev->vq = NULL;
        dev->running = false;
+       dev->wrote_features_ok = false;
        dev->mmio_size = sizeof(struct virtio_pci_mmio);
        dev->mmio = calloc(1, dev->mmio_size);
        dev->features = (u64)1 << VIRTIO_F_VERSION_1;
@@ -2181,8 +2676,8 @@ static void setup_console(void)
         * stdin.  When they put something in the output queue, we write it to
         * stdout.
         */
-       add_pci_virtqueue(dev, console_input);
-       add_pci_virtqueue(dev, console_output);
+       add_pci_virtqueue(dev, console_input, "input");
+       add_pci_virtqueue(dev, console_output, "output");
 
        /* We need a configuration area for the emerg_wr early writes. */
        add_pci_feature(dev, VIRTIO_CONSOLE_F_EMERG_WRITE);
@@ -2322,7 +2817,7 @@ static int get_tun_device(char tapif[IFNAMSIZ])
         * about our expanded header (which is called
         * virtio_net_hdr_mrg_rxbuf in the legacy system).
         */
-       vnet_hdr_sz = sizeof(struct virtio_net_hdr_mrg_rxbuf);
+       vnet_hdr_sz = sizeof(struct virtio_net_hdr_v1);
        if (ioctl(netfd, TUNSETVNETHDRSZ, &vnet_hdr_sz) != 0)
                err(1, "Setting tun header size to %u", vnet_hdr_sz);
 
@@ -2353,8 +2848,8 @@ static void setup_tun_net(char *arg)
        dev->priv = net_info;
 
        /* Network devices need a recv and a send queue, just like console. */
-       add_pci_virtqueue(dev, net_input);
-       add_pci_virtqueue(dev, net_output);
+       add_pci_virtqueue(dev, net_input, "rx");
+       add_pci_virtqueue(dev, net_output, "tx");
 
        /*
         * We need a socket to perform the magic network ioctls to bring up the
@@ -2453,7 +2948,7 @@ static void blk_request(struct virtqueue *vq)
        head = wait_for_vq_desc(vq, iov, &out_num, &in_num);
 
        /* Copy the output header from the front of the iov (adjusts iov) */
-       iov_consume(iov, out_num, &out, sizeof(out));
+       iov_consume(vq->dev, iov, out_num, &out, sizeof(out));
 
        /* Find and trim end of iov input array, for our status byte. */
        in = NULL;
@@ -2465,7 +2960,7 @@ static void blk_request(struct virtqueue *vq)
                }
        }
        if (!in)
-               errx(1, "Bad virtblk cmd with no room for status");
+               bad_driver_vq(vq, "Bad virtblk cmd with no room for status");
 
        /*
         * For historical reasons, block operations are expressed in 512 byte
@@ -2495,7 +2990,7 @@ static void blk_request(struct virtqueue *vq)
                        /* Trim it back to the correct length */
                        ftruncate64(vblk->fd, vblk->len);
                        /* Die, bad Guest, die. */
-                       errx(1, "Write past end %llu+%u", off, ret);
+                       bad_driver_vq(vq, "Write past end %llu+%u", off, ret);
                }
 
                wlen = sizeof(*in);
@@ -2541,7 +3036,7 @@ static void setup_block_file(const char *filename)
        dev = new_pci_device("block", VIRTIO_ID_BLOCK, 0x01, 0x80);
 
        /* The device has one virtqueue, where the Guest places requests. */
-       add_pci_virtqueue(dev, blk_request);
+       add_pci_virtqueue(dev, blk_request, "request");
 
        /* Allocate the room for our own bookkeeping */
        vblk = dev->priv = malloc(sizeof(*vblk));
@@ -2588,7 +3083,7 @@ static void rng_input(struct virtqueue *vq)
        /* First we need a buffer from the Guests's virtqueue. */
        head = wait_for_vq_desc(vq, iov, &out_num, &in_num);
        if (out_num)
-               errx(1, "Output buffers in rng?");
+               bad_driver_vq(vq, "Output buffers in rng?");
 
        /*
         * Just like the console write, we loop to cover the whole iovec.
@@ -2598,7 +3093,7 @@ static void rng_input(struct virtqueue *vq)
                len = readv(rng_info->rfd, iov, in_num);
                if (len <= 0)
                        err(1, "Read from /dev/urandom gave %i", len);
-               iov_consume(iov, in_num, NULL, len);
+               iov_consume(vq->dev, iov, in_num, NULL, len);
                totlen += len;
        }
 
@@ -2622,7 +3117,7 @@ static void setup_rng(void)
        dev->priv = rng_info;
 
        /* The device has one virtqueue, where the Guest places inbufs. */
-       add_pci_virtqueue(dev, rng_input);
+       add_pci_virtqueue(dev, rng_input, "input");
 
        /* We don't have any configuration space */
        no_device_config(dev);
@@ -2662,14 +3157,8 @@ static void __attribute__((noreturn)) run_guest(void)
 
                /* We read from the /dev/lguest device to run the Guest. */
                readval = pread(lguest_fd, &notify, sizeof(notify), cpu_id);
-
-               /* One unsigned long means the Guest did HCALL_NOTIFY */
                if (readval == sizeof(notify)) {
-                       if (notify.trap == 0x1F) {
-                               verbose("Notify on address %#08x\n",
-                                       notify.addr);
-                               handle_output(notify.addr);
-                       } else if (notify.trap == 13) {
+                       if (notify.trap == 13) {
                                verbose("Emulating instruction at %#x\n",
                                        getreg(eip));
                                emulate_insn(notify.insn);