From nobody Tue Feb 10 18:44:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1667469317; cv=none; d=zohomail.com; s=zohoarc; b=ZWYKvcNu2+ir/FXpIntUz2LZfboydWnzDJaLKP9mcfgHxjohWuu0bdEORh+fha4ejEivZadA0FGoS54YHtwnECm6MaYQN2F3FzaqfD7HgFhfI31aut4bkny99YmSjHjnWIfC+U73R06yEMyLov0a+ZRRITF8m7rHaD+ot+0p4YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667469317; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject; bh=e8aiEB3an3hN4X7cLKD167dH+Ev6j9iEvmfA6IzzE+8=; b=D3crHRVu0g3x9M4uj8PLgkKpkeidr8HQII51P/yNY2w5F6pWGVmbqdk6cR18MRQStmj5DpGa8IgcjXDVhp+MzMR8ku9t56vzv4B95PNsWTq5pOnu7DAdlYMjyr1bpjX7+1BRhkYTEtsRvI0cGeEOE8pHqaDTAE0tBvxAVBQ3EfA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1667469317920369.61407985243204; Thu, 3 Nov 2022 02:55:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqWvy-0003ph-1i; Thu, 03 Nov 2022 05:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqWvj-0003nt-F9 for qemu-devel@nongnu.org; Thu, 03 Nov 2022 05:54:37 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oqWvf-0006xz-KC for qemu-devel@nongnu.org; Thu, 03 Nov 2022 05:54:34 -0400 Received: by mail-pf1-x435.google.com with SMTP id y203so1128736pfb.4 for ; Thu, 03 Nov 2022 02:54:31 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id qe15-20020a17090b4f8f00b0020d9c2f6c39sm2952514pjb.34.2022.11.03.02.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=e8aiEB3an3hN4X7cLKD167dH+Ev6j9iEvmfA6IzzE+8=; b=Bg/Q0fzmMfZoWh+nPwt5e0pU/VzRIjPSoJepDqLsPkusZPGcFZcjHDQb8gUZAUuqH3 326zngLGcw2IdIPt1cA57+wzOYJSDIHFvx3Onxh3OKcauGnYb/Wz+PDJlVERp6CwSiKp xfWJbqr/ujPd5sgx7zaI4euX+RfC7HZRVYc6jb9txM1UvkejWQp8rwEBwcChTdWG02gL UhxFFXdBDAwscLRdJH/msL0dkPlp9KHXhduiPSA03MSPwssvwSu9if67w8D72hWb9UV7 NEpfSp21V8Rn2Iku4EYm0ZXzyBKklZi1Ku1q7gwR8EPofLgGAF300ZoCVaQcSazaoRwm ma1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e8aiEB3an3hN4X7cLKD167dH+Ev6j9iEvmfA6IzzE+8=; b=6EuwFT2ZWFFjkl/XtWf6rK8cJm2YjIVbpNdFHI/CLZVB9TB5vRuSeTvavZedQNROmj hFX7WokSyGVirg1ku7/TTAOYVrgUADqWYwbrhawQhDWpy/5zayIZQTEUYFDN6zvrEzd8 JHWTvh9AG7fO81UXzvrndIzL74NQ2dAaF7GH3pTqJdHNGXvJJlQ86KOB3Jxhvt2xqjea kmiqRx4tBBb444K+uI6+nuPwTlx2BRRrkmfuFZyoPei9UljH8nmXKm4DmJGBE98bC/Fg 2fDopnsJZiCknFS/jevdvraC/gNqgmrwsuEBZ+WBLFQGms20nJ0XUldXXvbfoodgkM6B CSjw== X-Gm-Message-State: ACrzQf31+sXG0jXXTH1twO3zFkMvy9zC24QCAB+vHoP8o6tkkYaco8Rr wWEmnJ0sz7FhQd9HyBiN1JgfYmqaw5elPY5X X-Google-Smtp-Source: AMsMyM59qycQEs7KmAanyIUP7uI0TMGP87cnveU+C0Shbe5Rjtzqu0ORkaXdc4JVethxxKSPxi+bcg== X-Received: by 2002:a63:1110:0:b0:46f:b040:f5a with SMTP id g16-20020a631110000000b0046fb0400f5amr19014999pgl.84.1667469269478; Thu, 03 Nov 2022 02:54:29 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, Thomas Huth , Laurent Vivier , Paolo Bonzini , Yan Vugenfirer , Yuri Benditovich , Akihiko Odaki Subject: [PATCH] tests/qtest/e1000e-test: Use e1000_regs.h Date: Thu, 3 Nov 2022 18:54:16 +0900 Message-Id: <20221103095416.110162-1-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::435; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x435.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1667469319132100003 Content-Type: text/plain; charset="utf-8" The register definitions in tests/qtest/e1000e-test.c had names different from hw/net/e1000_regs.h, which made it hard to understand what test codes corresponds to the implementation. Use hw/net/e1000_regs.h from tests/qtest/libqos/e1000e.c to remove these duplications. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/e1000e-test.c | 66 ++++++--------------------------------- 1 file changed, 10 insertions(+), 56 deletions(-) diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c index c98779c7c0..9e7cb1eb2d 100644 --- a/tests/qtest/e1000e-test.c +++ b/tests/qtest/e1000e-test.c @@ -33,34 +33,11 @@ #include "qemu/bitops.h" #include "libqos/malloc.h" #include "libqos/e1000e.h" +#include "hw/net/e1000_regs.h" =20 static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAlloca= tor *alloc) { - struct { - uint64_t buffer_addr; - union { - uint32_t data; - struct { - uint16_t length; - uint8_t cso; - uint8_t cmd; - } flags; - } lower; - union { - uint32_t data; - struct { - uint8_t status; - uint8_t css; - uint16_t special; - } fields; - } upper; - } descr; - - static const uint32_t dtyp_data =3D BIT(20); - static const uint32_t dtyp_ext =3D BIT(29); - static const uint32_t dcmd_rs =3D BIT(27); - static const uint32_t dcmd_eop =3D BIT(24); - static const uint32_t dsta_dd =3D BIT(0); + struct e1000_tx_desc descr; static const int data_len =3D 64; char buffer[64]; int ret; @@ -73,10 +50,10 @@ static void e1000e_send_verify(QE1000E *d, int *test_so= ckets, QGuestAllocator *a /* Prepare TX descriptor */ memset(&descr, 0, sizeof(descr)); descr.buffer_addr =3D cpu_to_le64(data); - descr.lower.data =3D cpu_to_le32(dcmd_rs | - dcmd_eop | - dtyp_ext | - dtyp_data | + descr.lower.data =3D cpu_to_le32(E1000_TXD_CMD_RS | + E1000_TXD_CMD_EOP | + E1000_TXD_CMD_DEXT | + E1000_TXD_DTYP_D | data_len); =20 /* Put descriptor to the ring */ @@ -86,7 +63,8 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a e1000e_wait_isr(d, E1000E_TX0_MSG_ID); =20 /* Check DD bit */ - g_assert_cmphex(le32_to_cpu(descr.upper.data) & dsta_dd, =3D=3D, dsta_= dd); + g_assert_cmphex(le32_to_cpu(descr.upper.data) & E1000_TXD_STAT_DD, =3D= =3D, + E1000_TXD_STAT_DD); =20 /* Check data sent to the backend */ ret =3D recv(test_sockets[0], &recv_len, sizeof(recv_len), 0); @@ -101,31 +79,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_so= ckets, QGuestAllocator *a =20 static void e1000e_receive_verify(QE1000E *d, int *test_sockets, QGuestAll= ocator *alloc) { - union { - struct { - uint64_t buffer_addr; - uint64_t reserved; - } read; - struct { - struct { - uint32_t mrq; - union { - uint32_t rss; - struct { - uint16_t ip_id; - uint16_t csum; - } csum_ip; - } hi_dword; - } lower; - struct { - uint32_t status_error; - uint16_t length; - uint16_t vlan; - } upper; - } wb; - } descr; - - static const uint32_t esta_dd =3D BIT(0); + union e1000_rx_desc_extended descr; =20 char test[] =3D "TEST"; int len =3D htonl(sizeof(test)); @@ -162,7 +116,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator =20 /* Check DD bit */ g_assert_cmphex(le32_to_cpu(descr.wb.upper.status_error) & - esta_dd, =3D=3D, esta_dd); + E1000_RXD_STAT_DD, =3D=3D, E1000_RXD_STAT_DD); =20 /* Check data sent to the backend */ memread(data, buffer, sizeof(buffer)); --=20 2.38.1