From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18112D10F58 for ; Wed, 26 Nov 2025 14:26:31 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vOGTB-0000Nr-1e; Wed, 26 Nov 2025 09:26:09 -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 1vOGT9-0000N3-Rv for qemu-devel@nongnu.org; Wed, 26 Nov 2025 09:26:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vOGT7-0006YD-GF for qemu-devel@nongnu.org; Wed, 26 Nov 2025 09:26:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764167164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UpWA4flCdk9F+i36KGIcPFvvLP3A+c4pIOB6fsgACdM=; b=N7OUJ7s8S6vGUt5OsQr6yVq5t+ZDh1Bfb8sRqGumi84hZZzdFGGjN5UcnQy2uzPVQ4mnt6 6o4KwjvHgQ6TGLxjoxTnGrScshwv6mF+qxbz+UUr4IVxSyyaMlYJKYte5VdAtbEiQNgkRr 17TpTEyToyQUrsbx49ozuQZ4PR82tHY= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-440-bnnzMhI4NPOzB1vLCPjhiQ-1; Wed, 26 Nov 2025 09:26:02 -0500 X-MC-Unique: bnnzMhI4NPOzB1vLCPjhiQ-1 X-Mimecast-MFC-AGG-ID: bnnzMhI4NPOzB1vLCPjhiQ_1764167162 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 208871956066 for ; Wed, 26 Nov 2025 14:26:02 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.44.33.126]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B3376195608E; Wed, 26 Nov 2025 14:26:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9BB071800395; Wed, 26 Nov 2025 15:25:59 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Subject: [PATCH 1/2] move pcap structs to header file Date: Wed, 26 Nov 2025 15:25:58 +0100 Message-ID: <20251126142559.4081483-2-kraxel@redhat.com> In-Reply-To: <20251126142559.4081483-1-kraxel@redhat.com> References: <20251126142559.4081483-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.224, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Allow reusing them elsewhere in qemu. Signed-off-by: Gerd Hoffmann --- include/qemu/pcap.h | 27 +++++++++++++++++++++++++++ hw/usb/pcap.c | 24 +----------------------- 2 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 include/qemu/pcap.h diff --git a/include/qemu/pcap.h b/include/qemu/pcap.h new file mode 100644 index 000000000000..48e6070ffe04 --- /dev/null +++ b/include/qemu/pcap.h @@ -0,0 +1,27 @@ +#ifndef QEMU_PCAP_H +#define QEMU_PCAP_H + +#define PCAP_MAGIC 0xa1b2c3d4 +#define PCAP_MAJOR 2 +#define PCAP_MINOR 4 + +/* https://wiki.wireshark.org/Development/LibpcapFileFormat */ + +struct pcap_hdr { + uint32_t magic_number; /* magic number */ + uint16_t version_major; /* major version number */ + uint16_t version_minor; /* minor version number */ + int32_t thiszone; /* GMT to local correction */ + uint32_t sigfigs; /* accuracy of timestamps */ + uint32_t snaplen; /* max length of captured packets, in octets */ + uint32_t network; /* data link type */ +}; + +struct pcaprec_hdr { + uint32_t ts_sec; /* timestamp seconds */ + uint32_t ts_usec; /* timestamp microseconds */ + uint32_t incl_len; /* number of octets of packet saved in file */ + uint32_t orig_len; /* actual length of packet */ +}; + +#endif /* QEMU_PCAP_H */ diff --git a/hw/usb/pcap.c b/hw/usb/pcap.c index dbff00be252e..10ca6279f7d3 100644 --- a/hw/usb/pcap.c +++ b/hw/usb/pcap.c @@ -8,31 +8,9 @@ */ #include "qemu/osdep.h" +#include "qemu/pcap.h" #include "hw/usb.h" -#define PCAP_MAGIC 0xa1b2c3d4 -#define PCAP_MAJOR 2 -#define PCAP_MINOR 4 - -/* https://wiki.wireshark.org/Development/LibpcapFileFormat */ - -struct pcap_hdr { - uint32_t magic_number; /* magic number */ - uint16_t version_major; /* major version number */ - uint16_t version_minor; /* minor version number */ - int32_t thiszone; /* GMT to local correction */ - uint32_t sigfigs; /* accuracy of timestamps */ - uint32_t snaplen; /* max length of captured packets, in octets */ - uint32_t network; /* data link type */ -}; - -struct pcaprec_hdr { - uint32_t ts_sec; /* timestamp seconds */ - uint32_t ts_usec; /* timestamp microseconds */ - uint32_t incl_len; /* number of octets of packet saved in file */ - uint32_t orig_len; /* actual length of packet */ -}; - /* https://www.tcpdump.org/linktypes.html */ /* linux: Documentation/usb/usbmon.rst */ /* linux: drivers/usb/mon/mon_bin.c */ -- 2.52.0