diff mbox series

tests/qtest/virtio-net: fix hotplug test case

Message ID 20211028173014.139692-1-lvivier@redhat.com
State New
Headers show
Series tests/qtest/virtio-net: fix hotplug test case | expand

Commit Message

Laurent Vivier Oct. 28, 2021, 5:30 p.m. UTC
virtio-net-test has an hotplug testcase that is never executed.

This is because the testcase is attached to virtio-pci interface
rather than to virtio-net-pci.

  $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
  /x86_64/.../pci-ohci-tests/ohci_pci-test-hotplug
  /x86_64/.../e1000e/e1000e-tests/hotplug
  /x86_64/.../virtio-blk-pci/virtio-blk-pci-tests/hotplug
  /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
  /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
  /x86_64/.../virtio-scsi/virtio-scsi-tests/hotplug
  /x86_64/.../virtio-serial/virtio-serial-tests/hotplug

With this fix:

  $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
  ...
  /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
  /x86_64/.../virtio-net-pci/virtio-net-pci-tests/hotplug
  /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
  ...
  $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -p /x86_64/.../virtio-net-pci-tests/hotplug
  /x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net-pci-tests/hotplug: OK

Fixes: 6ae333f91b99 ("qos-test: virtio-net test node")
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
 tests/qtest/virtio-net-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jason Wang Oct. 29, 2021, 2:35 a.m. UTC | #1
On Fri, Oct 29, 2021 at 1:30 AM Laurent Vivier <lvivier@redhat.com> wrote:
>
> virtio-net-test has an hotplug testcase that is never executed.
>
> This is because the testcase is attached to virtio-pci interface
> rather than to virtio-net-pci.
>
>   $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>   /x86_64/.../pci-ohci-tests/ohci_pci-test-hotplug
>   /x86_64/.../e1000e/e1000e-tests/hotplug
>   /x86_64/.../virtio-blk-pci/virtio-blk-pci-tests/hotplug
>   /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>   /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>   /x86_64/.../virtio-scsi/virtio-scsi-tests/hotplug
>   /x86_64/.../virtio-serial/virtio-serial-tests/hotplug
>
> With this fix:
>
>   $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>   ...
>   /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>   /x86_64/.../virtio-net-pci/virtio-net-pci-tests/hotplug
>   /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>   ...
>   $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -p /x86_64/.../virtio-net-pci-tests/hotplug
>   /x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net-pci-tests/hotplug: OK
>
> Fixes: 6ae333f91b99 ("qos-test: virtio-net test node")
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Applied.

Thanks

> ---
>  tests/qtest/virtio-net-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a08e2ffe123f..8bf74e516cce 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -319,7 +319,7 @@ static void register_virtio_net_test(void)
>          .before = virtio_net_test_setup,
>      };
>
> -    qos_add_test("hotplug", "virtio-pci", hotplug, &opts);
> +    qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
>  #ifndef _WIN32
>      qos_add_test("basic", "virtio-net", send_recv_test, &opts);
>      qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);
> --
> 2.31.1
>
Thomas Huth Nov. 8, 2021, 5:12 p.m. UTC | #2
On 28/10/2021 19.30, Laurent Vivier wrote:
> virtio-net-test has an hotplug testcase that is never executed.
> 
> This is because the testcase is attached to virtio-pci interface
> rather than to virtio-net-pci.
> 
>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>    /x86_64/.../pci-ohci-tests/ohci_pci-test-hotplug
>    /x86_64/.../e1000e/e1000e-tests/hotplug
>    /x86_64/.../virtio-blk-pci/virtio-blk-pci-tests/hotplug
>    /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>    /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>    /x86_64/.../virtio-scsi/virtio-scsi-tests/hotplug
>    /x86_64/.../virtio-serial/virtio-serial-tests/hotplug
> 
> With this fix:
> 
>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>    ...
>    /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>    /x86_64/.../virtio-net-pci/virtio-net-pci-tests/hotplug
>    /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>    ...
>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -p /x86_64/.../virtio-net-pci-tests/hotplug
>    /x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net-pci-tests/hotplug: OK
> 
> Fixes: 6ae333f91b99 ("qos-test: virtio-net test node")
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
>   tests/qtest/virtio-net-test.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
> index a08e2ffe123f..8bf74e516cce 100644
> --- a/tests/qtest/virtio-net-test.c
> +++ b/tests/qtest/virtio-net-test.c
> @@ -319,7 +319,7 @@ static void register_virtio_net_test(void)
>           .before = virtio_net_test_setup,
>       };
>   
> -    qos_add_test("hotplug", "virtio-pci", hotplug, &opts);
> +    qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
>   #ifndef _WIN32
>       qos_add_test("basic", "virtio-net", send_recv_test, &opts);
>       qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);
> 

Acked-by: Thomas Huth <thuth@redhat.com>
Laurent Vivier Nov. 9, 2021, 7:11 a.m. UTC | #3
Le 08/11/2021 à 18:12, Thomas Huth a écrit :
> On 28/10/2021 19.30, Laurent Vivier wrote:
>> virtio-net-test has an hotplug testcase that is never executed.
>>
>> This is because the testcase is attached to virtio-pci interface
>> rather than to virtio-net-pci.
>>
>>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>>    /x86_64/.../pci-ohci-tests/ohci_pci-test-hotplug
>>    /x86_64/.../e1000e/e1000e-tests/hotplug
>>    /x86_64/.../virtio-blk-pci/virtio-blk-pci-tests/hotplug
>>    /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>>    /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>>    /x86_64/.../virtio-scsi/virtio-scsi-tests/hotplug
>>    /x86_64/.../virtio-serial/virtio-serial-tests/hotplug
>>
>> With this fix:
>>
>>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -l | grep hotplug
>>    ...
>>    /x86_64/.../vhost-user-blk-pci/vhost-user-blk-pci-tests/hotplug
>>    /x86_64/.../virtio-net-pci/virtio-net-pci-tests/hotplug
>>    /x86_64/.../virtio-rng-pci/virtio-rng-pci-tests/hotplug
>>    ...
>>    $ QTEST_QEMU_BINARY=./qemu-system-x86_64 tests/qtest/qos-test -p 
>> /x86_64/.../virtio-net-pci-tests/hotplug
>>    /x86_64/pc/i440FX-pcihost/pci-bus-pc/pci-bus/virtio-net-pci/virtio-net-pci-tests/hotplug: OK
>>
>> Fixes: 6ae333f91b99 ("qos-test: virtio-net test node")
>> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
>> ---
>>   tests/qtest/virtio-net-test.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
>> index a08e2ffe123f..8bf74e516cce 100644
>> --- a/tests/qtest/virtio-net-test.c
>> +++ b/tests/qtest/virtio-net-test.c
>> @@ -319,7 +319,7 @@ static void register_virtio_net_test(void)
>>           .before = virtio_net_test_setup,
>>       };
>> -    qos_add_test("hotplug", "virtio-pci", hotplug, &opts);
>> +    qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
>>   #ifndef _WIN32
>>       qos_add_test("basic", "virtio-net", send_recv_test, &opts);
>>       qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);
>>
> 
> Acked-by: Thomas Huth <thuth@redhat.com>
> 
> 

Applied to my trivial-patches branch.

Thanks,
Laurent
diff mbox series

Patch

diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index a08e2ffe123f..8bf74e516cce 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -319,7 +319,7 @@  static void register_virtio_net_test(void)
         .before = virtio_net_test_setup,
     };
 
-    qos_add_test("hotplug", "virtio-pci", hotplug, &opts);
+    qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
 #ifndef _WIN32
     qos_add_test("basic", "virtio-net", send_recv_test, &opts);
     qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);