From nobody Tue May 13 17:27:26 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1673517949; cv=none; d=zohomail.com; s=zohoarc; b=DAqg+ySoPujJ+GObLR/F2RdInywsam4lCePrrTtrx8pOOwqDYvIZNz6bRmGzB1V5DSkvSHcSBygPw7tm2mOXNMiWfSrxv9etajTEfdO6mcKUSEZrrS+i1R22C4hWuHLbZzUIZhufFKK06hvjV2QJuotjyyIqR8mgnvDpD3Mb6V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673517949; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=QKz8NM0/A8Hgswx+4MXKSDHppx0dxLxGzCKxbK2Z1F0=; b=fRmyEfRmluo71ZQakyTlK4GfJGaL7UwAzeH+7rjiOPFdcSn0iu90m3zqKlLn1t2j3kDhXWW0dmTblylO5w0T/cGoKuIT1SIWhuRzn/NThgNUYRwuLSjlIpogsqGS4IEQCVKJx6nIUGG6DvnQjGLJPtr4wJ76j/I/orzAYUbEhvE= 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+importer2=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 1673517949284232.40018652239462; Thu, 12 Jan 2023 02:05:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFuNZ-0004Wp-4O; Thu, 12 Jan 2023 05:00:13 -0500 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 1pFuNX-0004W5-Qf for qemu-devel@nongnu.org; Thu, 12 Jan 2023 05:00:11 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFuNV-0004i0-09 for qemu-devel@nongnu.org; Thu, 12 Jan 2023 05:00:11 -0500 Received: by mail-pj1-x102a.google.com with SMTP id v13-20020a17090a6b0d00b00219c3be9830so20253064pjj.4 for ; Thu, 12 Jan 2023 02:00:08 -0800 (PST) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id k13-20020a17090a3ccd00b00219025945dcsm12095450pjd.19.2023.01.12.02.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 02:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QKz8NM0/A8Hgswx+4MXKSDHppx0dxLxGzCKxbK2Z1F0=; b=MsMfm8lgrBYhj9aiTChYg+WlRh1Q3KXR6mMpHFuh/kRx1oYjhWya6c5508e0W7RLPk uY6V/adk/hX4GUXJ3f9NAn4M0+nLZeomsEsICV7ZZDD/4SkN6GHOonqtB9lCkwzdvsVA 8ugHyodWWjAfgllP67zzjdB1f6NsQrTKUiT4dpAM6C6bD1Ud0gJ/ja5PdUaAGFjOKS8e vqRXptnSo1eToU2lLcC08tVe/OaKqkVFhikfBx0cJt5o3N7NmNldUfF+RKOn9hGjz/t8 W6ZKNLmlciVf7pnLsa3u3veye/IVaCQzj8DRuoTpDfnJMY1Uw69EjBRKsu+T8godoSXf a2zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QKz8NM0/A8Hgswx+4MXKSDHppx0dxLxGzCKxbK2Z1F0=; b=bRpgFXg2zzgtN6AQHZUZ9ImBqC76zGfN4r4JjdGxob95EGcJ91+pIgRq/cU98J9IXP kA2t/I8x2uGKIGBnGGRzvsAmcq4bAxi/bB90iyJtI65va32LWcfsvyZix7XNALu3rTc3 gWifxquw/7ZGObGyRAPnBcb5iZhCzBiMTCmv07cGGzgILQwohmBoPz2pacVqfSDBGyV0 oX5D2ucSsWKV7cn0oSKOw8k1fEouC7/1n/CMogHpypffGl9IFHTMdMW1JTIoDB4u9ceV XDYyxCXUQ9Sj1XzFd/j4I6xlK4q6DsQ6Kk7Dy10o0zWrBe0IUCzI3ejkE9V4E521TDn/ ra6A== X-Gm-Message-State: AFqh2kqnL2IrKD6j7JNZY6OzbCgpssrfQrUImEAQSDck5DqIiQhe3OHC WI47jI0YYHi+uJQbJaDWygpaSQ== X-Google-Smtp-Source: AMrXdXt1W4Sa7ORLh19lAEpz/oG1xE4whD312pa0sqJqgxkWiEkRg6Oa5Ywo1pEvy990nXcmYEWstQ== X-Received: by 2002:a17:90a:7f86:b0:227:cdd:89bd with SMTP id m6-20020a17090a7f8600b002270cdd89bdmr15152959pjl.10.1673517607810; Thu, 12 Jan 2023 02:00:07 -0800 (PST) From: Akihiko Odaki To: Cc: Akihiko Odaki , Jason Wang , Dmitry Fleytman , "Michael S. Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , Alexander Bulekov , Bandan Das , Stefan Hajnoczi , Darren Kenny , Qiuhao Li , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, devel@daynix.com, Yan Vugenfirer , Yuri Benditovich , Sriram Yagnaraman Subject: [PATCH 26/31] tests/qtest/e1000e-test: Fabricate ethernet header Date: Thu, 12 Jan 2023 18:57:38 +0900 Message-Id: <20230112095743.20123-27-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112095743.20123-1-akihiko.odaki@daynix.com> References: <20230112095743.20123-1-akihiko.odaki@daynix.com> 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102a.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=unavailable 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1673517950227100001 Content-Type: text/plain; charset="utf-8" e1000e understands ethernet header so fabricate something convincing. Signed-off-by: Akihiko Odaki --- tests/qtest/e1000e-test.c | 17 +++++++++++------ tests/qtest/libqos/e1000e.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c index b63a4d3c91..98706355e3 100644 --- a/tests/qtest/e1000e-test.c +++ b/tests/qtest/e1000e-test.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "libqtest-single.h" #include "libqos/pci-pc.h" +#include "net/eth.h" #include "qemu/sockets.h" #include "qemu/iov.h" #include "qemu/module.h" @@ -35,9 +36,13 @@ #include "libqos/e1000e.h" #include "hw/net/e1000_regs.h" =20 +static const struct eth_header test =3D { + .h_dest =3D E1000E_ADDRESS, + .h_source =3D E1000E_ADDRESS, +}; + static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAlloca= tor *alloc) { - static const char test[] =3D "TEST"; struct e1000_tx_desc descr; char buffer[64]; int ret; @@ -45,7 +50,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a =20 /* Prepare test data buffer */ uint64_t data =3D guest_alloc(alloc, sizeof(buffer)); - memwrite(data, test, sizeof(test)); + memwrite(data, &test, sizeof(test)); =20 /* Prepare TX descriptor */ memset(&descr, 0, sizeof(descr)); @@ -71,7 +76,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a g_assert_cmpint(ret, =3D=3D , sizeof(recv_len)); ret =3D recv(test_sockets[0], buffer, sizeof(buffer), 0); g_assert_cmpint(ret, =3D=3D, sizeof(buffer)); - g_assert_cmpstr(buffer, =3D=3D , test); + g_assert_false(memcmp(buffer, &test, sizeof(test))); =20 /* Free test data buffer */ guest_free(alloc, data); @@ -81,14 +86,14 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator { union e1000_rx_desc_extended descr; =20 - char test[] =3D "TEST"; + struct eth_header test_iov =3D test; int len =3D htonl(sizeof(test)); struct iovec iov[] =3D { { .iov_base =3D &len, .iov_len =3D sizeof(len), },{ - .iov_base =3D test, + .iov_base =3D &test_iov, .iov_len =3D sizeof(test), }, }; @@ -119,7 +124,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator =20 /* Check data sent to the backend */ memread(data, buffer, sizeof(buffer)); - g_assert_cmpstr(buffer, =3D=3D , test); + g_assert_false(memcmp(buffer, &test, sizeof(test))); =20 /* Free test data buffer */ guest_free(alloc, data); diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h index 091ce139da..5e2b201aa7 100644 --- a/tests/qtest/libqos/e1000e.h +++ b/tests/qtest/libqos/e1000e.h @@ -25,6 +25,8 @@ #define E1000E_RX0_MSG_ID (0) #define E1000E_TX0_MSG_ID (1) =20 +#define E1000E_ADDRESS { 0x52, 0x54, 0x00, 0x12, 0x34, 0x56 } + typedef struct QE1000E QE1000E; typedef struct QE1000E_PCI QE1000E_PCI; =20 --=20 2.39.0