virtio: sandbox: Bind RNG rather than block device

The virtio-rng driver is extremely simple, making it suitable for
testing more of the virtio uclass logic. Have the sandbox driver bind
the virtio-rng driver rather than the virtio-blk driver so it can be
used in tests.

Signed-off-by: Andrew Scull <ascull@google.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c
index a73b123454452af738356c5f2bc79f952b4d3de7..5484ae3a1a0417315f48bd80e1693de8c3bdf154 100644 (file)
--- a/drivers/virtio/virtio_sandbox.c
+++ b/drivers/virtio/virtio_sandbox.c
@@ -161,7 +161,7 @@ static int virtio_sandbox_probe(struct udevice *udev)
 
        /* fake some information for testing */
        priv->device_features = BIT_ULL(VIRTIO_F_VERSION_1);
-       uc_priv->device = VIRTIO_ID_BLOCK;
+       uc_priv->device = VIRTIO_ID_RNG;
        uc_priv->vendor = ('u' << 24) | ('b' << 16) | ('o' << 8) | 't';
 
        return 0;

diff --git a/test/dm/Makefile b/test/dm/Makefile
index 29dd143517b88fe74cc342009233d4d7c0ff4770..809f0f239faa42e9e9ead410847ee6296e5d6609 100644 (file)
--- a/test/dm/Makefile
+++ b/test/dm/Makefile
@@ -109,7 +109,7 @@ obj-$(CONFIG_DM_USB) += usb.o
 obj-$(CONFIG_DM_VIDEO) += video.o
 ifeq ($(CONFIG_VIRTIO_SANDBOX),y)
 obj-y += virtio.o
-obj-$(CONFIG_VIRTIO_BLK) += virtio_device.o
+obj-$(CONFIG_VIRTIO_RNG) += virtio_device.o
 endif
 ifeq ($(CONFIG_WDT_GPIO)$(CONFIG_WDT_SANDBOX),yy)
 obj-y += wdt.o

diff --git a/test/dm/virtio_device.c b/test/dm/virtio_device.c
index 46f4798fc295f59a2815b2fdf425d032dcf3a651..f5f2349750218e479dc6df3692f38cedc3312418 100644 (file)
--- a/test/dm/virtio_device.c
+++ b/test/dm/virtio_device.c
@@ -25,10 +25,10 @@ static int dm_test_virtio_base(struct unit_test_state *uts)
        ut_assertok(uclass_first_device(UCLASS_VIRTIO, &bus));
        ut_assertnonnull(bus);
 
-       /* check the child virtio-blk device is bound */
+       /* check the child virtio-rng device is bound */
        ut_assertok(device_find_first_child(bus, &dev));
        ut_assertnonnull(dev);
-       ut_assertok(strcmp(dev->name, "virtio-blk#0"));
+       ut_asserteq_str("virtio-rng#0", dev->name);
 
        /* check driver status */
        ut_assertok(virtio_get_status(dev, &status));