diff mbox series

[v2,22/24] tests/avocado: switch to using xen-net-device for Xen guest tests

Message ID 20231019154020.99080-23-dwmw2@infradead.org
State New
Headers show
Series Get Xen PV shim running in Qemu, add net & console | expand

Commit Message

David Woodhouse Oct. 19, 2023, 3:40 p.m. UTC
From: David Woodhouse <dwmw@amazon.co.uk>

Fix the filename in the MAINTAINERS file too.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
 MAINTAINERS                    | 2 +-
 tests/avocado/kvm_xen_guest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Woodhouse Oct. 23, 2023, 7:33 a.m. UTC | #1
On Thu, 2023-10-19 at 16:40 +0100, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
> 
> Fix the filename in the MAINTAINERS file too.
> 
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
>  MAINTAINERS                    | 2 +-
>  tests/avocado/kvm_xen_guest.py | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9bd4fe378d..d74043d8a9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -476,7 +476,7 @@ S: Supported
>  F: include/sysemu/kvm_xen.h
>  F: target/i386/kvm/xen*
>  F: hw/i386/kvm/xen*
> -F: tests/avocado/xen_guest.py
> +F: tests/avocado/kvm_xen_guest.py
>  
>  Guest CPU Cores (other accelerators)
>  ------------------------------------
> diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py
> index 5391283113..f098028eeb 100644
> --- a/tests/avocado/kvm_xen_guest.py
> +++ b/tests/avocado/kvm_xen_guest.py
> @@ -61,7 +61,7 @@ def run_and_check(self):
>                           '-append', self.kernel_params,
>                           '-drive',  f"file={self.rootfs},if=none,format=raw,id=drv0",
>                           '-device', 'xen-disk,drive=drv0,vdev=xvda',
> -                         '-device', 'virtio-net-pci,netdev=unet',
> +                         '-device', 'xen-net-device,netdev=unet',
>                           '-netdev', 'user,id=unet,hostfwd=:127.0.0.1:0-:22')
>  
>          try:

Actually I'm going to drop this one. Testing PCI INTx and MSI delivery
through i8259, I/O APIC and Xen PIRQs is actually *much* more
entertaining than testing the Xen PV driver stuff which is exercised by
xen-block in these tests anyway.
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 9bd4fe378d..d74043d8a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -476,7 +476,7 @@  S: Supported
 F: include/sysemu/kvm_xen.h
 F: target/i386/kvm/xen*
 F: hw/i386/kvm/xen*
-F: tests/avocado/xen_guest.py
+F: tests/avocado/kvm_xen_guest.py
 
 Guest CPU Cores (other accelerators)
 ------------------------------------
diff --git a/tests/avocado/kvm_xen_guest.py b/tests/avocado/kvm_xen_guest.py
index 5391283113..f098028eeb 100644
--- a/tests/avocado/kvm_xen_guest.py
+++ b/tests/avocado/kvm_xen_guest.py
@@ -61,7 +61,7 @@  def run_and_check(self):
                          '-append', self.kernel_params,
                          '-drive',  f"file={self.rootfs},if=none,format=raw,id=drv0",
                          '-device', 'xen-disk,drive=drv0,vdev=xvda',
-                         '-device', 'virtio-net-pci,netdev=unet',
+                         '-device', 'xen-net-device,netdev=unet',
                          '-netdev', 'user,id=unet,hostfwd=:127.0.0.1:0-:22')
 
         try: