lguest: Simplify device initialization.

We used to notify the Host every time we updated a device's status.  However,
it only really needs to know when we're resetting the device, or failed to
initialize it, or when we've finished our feature negotiation.

In particular, we used to wait for VIRTIO_CONFIG_S_DRIVER_OK in the
status byte before starting the device service threads.  But this
corresponds to the successful finish of device initialization, which
might (like virtio_blk's partition scanning) use the device.  So we
had a hack, if they used the device before we expected we started the
threads anyway.

Now we hook into the finalize_features hook in the Guest: at that
point we tell the Launcher that it can rely on the features we have
acked.  On the Launcher side, we look at the status at that point, and
start servicing the device.

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

1 files changed, 6 insertions, 19 deletions

diff --git a/Documentation/virtual/lguest/lguest.c b/Documentation/virtual/lguest/lguest.c
index e3b9bb7a644a..80261d34da3d 100644
--- a/Documentation/virtual/lguest/lguest.c
+++ b/Documentation/virtual/lguest/lguest.c
@@ -1095,9 +1095,10 @@ static void update_device_status(struct device *dev)
                 warnx("Device %s configuration FAILED", dev->name);
                 if (dev->running)
                         reset_device(dev);
-        } else if (dev->desc->status & VIRTIO_CONFIG_S_DRIVER_OK) {
-                if (!dev->running)
-                        start_device(dev);
+        } else {
+                if (dev->running)
+                        err(1, "Device %s features finalized twice", dev->name);
+                start_device(dev);
         }
 }
 
@@ -1122,25 +1123,11 @@ static void handle_output(unsigned long addr)
                         return;
                 }
 
-                /*
-                 * Devices *can* be used before status is set to DRIVER_OK.
-                 * The original plan was that they would never do this: they
-                 * would always finish setting up their status bits before
-                 * actually touching the virtqueues.  In practice, we allowed
-                 * them to, and they do (eg. the disk probes for partition
-                 * tables as part of initialization).
-                 *
-                 * If we see this, we start the device: once it's running, we
-                 * expect the device to catch all the notifications.
-                 */
+                /* Devices should not be used before features are finalized. */
                 for (vq = i->vq; vq; vq = vq->next) {
                         if (addr != vq->config.pfn*getpagesize())
                                 continue;
-                        if (i->running)
-                                errx(1, "Notification on running %s", i->name);
-                        /* This just calls create_thread() for each virtqueue */
-                        start_device(i);
-                        return;
+                        errx(1, "Notification on %s before setup!", i->name);
                 }
         }