[PATCH] tests/qtest/libqos/e1000e: Refer common PCI ID definitions

Akihiko Odaki posted 1 patch 1 year, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20221103015017.19947-1-akihiko.odaki@daynix.com
Maintainers: Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>
tests/qtest/libqos/e1000e.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
[PATCH] tests/qtest/libqos/e1000e: Refer common PCI ID definitions
Posted by Akihiko Odaki 1 year, 6 months ago
This is yet another minor cleanup to ease understanding and
future refactoring of the tests.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
 tests/qtest/libqos/e1000e.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c
index 2ea5db65d8..1f2ccccb8f 100644
--- a/tests/qtest/libqos/e1000e.c
+++ b/tests/qtest/libqos/e1000e.c
@@ -18,6 +18,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/net/e1000_regs.h"
+#include "hw/pci/pci_ids.h"
 #include "../libqtest.h"
 #include "pci-pc.h"
 #include "qemu/sockets.h"
@@ -217,8 +218,8 @@ static void *e1000e_pci_create(void *pci_bus, QGuestAllocator *alloc,
 static void e1000e_register_nodes(void)
 {
     QPCIAddress addr = {
-        .vendor_id = 0x8086,
-        .device_id = 0x10D3,
+        .vendor_id = PCI_VENDOR_ID_INTEL,
+        .device_id = E1000_DEV_ID_82574L,
     };
 
     /* FIXME: every test using this node needs to setup a -netdev socket,id=hs0
-- 
2.38.1
Re: [PATCH] tests/qtest/libqos/e1000e: Refer common PCI ID definitions
Posted by Philippe Mathieu-Daudé 1 year, 6 months ago
On 3/11/22 02:50, Akihiko Odaki wrote:
> This is yet another minor cleanup to ease understanding and
> future refactoring of the tests.
> 
> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
> ---
>   tests/qtest/libqos/e1000e.c | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c
> index 2ea5db65d8..1f2ccccb8f 100644
> --- a/tests/qtest/libqos/e1000e.c
> +++ b/tests/qtest/libqos/e1000e.c
> @@ -18,6 +18,7 @@
>   
>   #include "qemu/osdep.h"
>   #include "hw/net/e1000_regs.h"
> +#include "hw/pci/pci_ids.h"
>   #include "../libqtest.h"
>   #include "pci-pc.h"
>   #include "qemu/sockets.h"
> @@ -217,8 +218,8 @@ static void *e1000e_pci_create(void *pci_bus, QGuestAllocator *alloc,
>   static void e1000e_register_nodes(void)
>   {
>       QPCIAddress addr = {
> -        .vendor_id = 0x8086,
> -        .device_id = 0x10D3,
> +        .vendor_id = PCI_VENDOR_ID_INTEL,
> +        .device_id = E1000_DEV_ID_82574L,
>       };
>   
>       /* FIXME: every test using this node needs to setup a -netdev socket,id=hs0

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>