Re: [Qemu-devel] [PATCH v8 5/7] libqos: Added test case for configuration changes in virtio-blk test

[Greg Kurz]

On Mon,  1 Sep 2014 12:07:58 +0200
Marc Marí <address@hidden> wrote:
> Reviewed-by: Stefan Hajnoczi <address@hidden>
> Signed-off-by: Marc Marí <address@hidden>
> ---

Hi Marc,

I gave it a try for various host/target combinations involving ppc64 and
x86_64. Here is what I get:

        |   x86_64   |    ppc64    | TARGET
        +------------+-------------+--------
x86_64  |     OK     | assert  (1) |
--------+------------+-------------+
ppc64   | assert (2) | assert  (1) |
--------+------------+-------------+
ppc64le |     OK     | assert  (1) |
--------+------------+-------------+
  HOST  |

where OK means:

/virtio/blk/pci/basic: OK
/virtio/blk/pci/indirect: OK
/virtio/blk/pci/config: OK
/virtio/blk/pci/msix: OK
/virtio/blk/pci/idx: OK

and assert (1) is:

tests/virtio-blk-test.c:87:virtio_blk_init: assertion failed: (dev != NULL)

and assert (2) is:

tests/virtio-blk-test.c:171:pci_basic: assertion failed (status == 0): (2 == 0)

I will investigate further but the first column in the array ^^ seems to
indicate that there's some endianness bug.

Cheers.

--
Greg

>  tests/virtio-blk-test.c |   34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c
> index 95e6861..07ae754 100644
> --- a/tests/virtio-blk-test.c
> +++ b/tests/virtio-blk-test.c
> @@ -359,6 +359,39 @@ static void pci_indirect(void)
>      test_end();
>  }
> 
> +static void pci_config(void)
> +{
> +    QVirtioPCIDevice *dev;
> +    QPCIBus *bus;
> +    int n_size = TEST_IMAGE_SIZE / 2;
> +    void *addr;
> +    uint64_t capacity;
> +
> +    bus = test_start();
> +
> +    dev = virtio_blk_init(bus);
> +
> +    /* MSI-X is not enabled */
> +    addr = dev->addr + QVIRTIO_DEVICE_SPECIFIC_NO_MSIX;
> +
> +    capacity = qvirtio_config_readq(&qvirtio_pci, &dev->vdev, addr);
> +    g_assert_cmpint(capacity, ==, TEST_IMAGE_SIZE / 512);
> +
> +    qvirtio_set_driver_ok(&qvirtio_pci, &dev->vdev);
> +
> +    qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0', "
> +                                                    " 'size': %d } }", 
> n_size);
> +    g_assert(qvirtio_wait_isr(&qvirtio_pci, &dev->vdev, 0x2,
> +                                                        
> QVIRTIO_BLK_TIMEOUT));
> +
> +    capacity = qvirtio_config_readq(&qvirtio_pci, &dev->vdev, addr);
> +    g_assert_cmpint(capacity, ==, n_size / 512);
> +
> +    qvirtio_pci_device_disable(dev);
> +    g_free(dev);
> +    test_end();
> +}
> +
>  int main(int argc, char **argv)
>  {
>      int ret;
> @@ -367,6 +400,7 @@ int main(int argc, char **argv)
> 
>      g_test_add_func("/virtio/blk/pci/basic", pci_basic);
>      g_test_add_func("/virtio/blk/pci/indirect", pci_indirect);
> +    g_test_add_func("/virtio/blk/pci/config", pci_config);
> 
>      ret = g_test_run();
>