tools/lguest: use common error macros in the example launcher.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

1 files changed, 105 insertions, 101 deletions

diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
index 70ee62a0eb9a..eebe94b84e8c 100644
--- a/tools/lguest/lguest.c
+++ b/tools/lguest/lguest.c
@@ -252,6 +252,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)
 {
@@ -264,7 +274,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;
@@ -282,7 +293,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
@@ -618,7 +629,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)
 {
         /*
@@ -626,7 +638,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.
@@ -634,14 +647,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;
@@ -656,7 +669,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;
 }
@@ -681,8 +694,7 @@ static void trigger_irq(struct virtqueue *vq)
          *    The driver MUST set flags to 0 or 1. 
          */
         if (vq->vring.avail->flags > 1)
-                errx(1, "%s: avail->flags = %u\n",
-                     vq->dev->name, vq->vring.avail->flags);
+                bad_driver_vq(vq, "avail->flags = %u\n", vq->vring.avail->flags);
 
         /*
          * 2.4.7.2:
@@ -769,8 +781,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
@@ -787,7 +799,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;
@@ -817,8 +829,7 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
                          */
                         if (!(vq->dev->features_accepted &
                               (1<<VIRTIO_RING_F_INDIRECT_DESC)))
-                                errx(1, "%s: vq indirect not negotiated",
-                                     vq->dev->name);
+                                bad_driver_vq(vq, "vq indirect not negotiated");
 
                         /*
                          * 2.4.5.3.1:
@@ -828,8 +839,7 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
                          *   table per descriptor).
                          */
                         if (desc != vq->vring.desc)
-                                errx(1, "%s: Indirect within indirect",
-                                     vq->dev->name);
+                                bad_driver_vq(vq, "Indirect within indirect");
 
                         /*
                          * Proposed update VIRTIO-134 spells this out:
@@ -838,11 +848,11 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
                          *   and VIRTQ_DESC_F_NEXT in flags.
                          */
                         if (desc[i].flags & VRING_DESC_F_NEXT)
-                                errx(1, "%s: indirect and next together",
-                                     vq->dev->name);
+                                bad_driver_vq(vq, "indirect and next together");
 
                         if (desc[i].len % sizeof(struct vring_desc))
-                                errx(1, "Invalid size for indirect buffer table");
+                                bad_driver_vq(vq,
+                                              "Invalid size for indirect table");
                         /*
                          * 2.4.5.3.2:
                          *
@@ -854,7 +864,7 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,
                          */
 
                         max = desc[i].len / sizeof(struct vring_desc);
-                        desc = check_pointer(desc[i].addr, desc[i].len);
+                        desc = check_pointer(vq->dev, desc[i].addr, desc[i].len);
                         i = 0;
 
                         /* 2.4.5.3.1:
@@ -863,14 +873,14 @@ static unsigned wait_for_vq_desc(struct virtqueue *vq,