From nobody Mon May 13 04:11:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646649869; cv=none; d=zohomail.com; s=zohoarc; b=Y25FGur+ky1TKx1dFhWJxOza8X4MKmyZ8RZWZlFSdyRJyf7d1mvqnDEF76dDuIkcJbUEdIceHJBSr4X3sI8e18m+/Zpkp+buc6CeUNyNNFvkvjeJs6qxZRbrR5NK6PZx3H05l5jT4m4EeZbauJuNPpcAonSU6ykXteFP9JtKUVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646649869; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ixF4MLCZQ6I++5qKbmAffo81zxGV5zf11wbRfDdm6cY=; b=jIVYpNyxSYEnykEOTAMiVd2nqwet2It1GLij77ibpUyRTdAdA9gx1x9Djfpo1QNA5z0Ts6VCNQAvmio1mzbSnXScjKal9Z6CB7eW8ORA7SEAaboF9DG3lk+29eQ+6iRUik/yfYkMQ65iKAji0HO7HJ2nyxawD/I7gNgYQjizoPs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1646649869367173.10416312538962; Mon, 7 Mar 2022 02:44:29 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-ZhZ6p3U5Or2h_H5j9QOL3w-1; Mon, 07 Mar 2022 05:44:25 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF46C3C0010A; Mon, 7 Mar 2022 10:44:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65715C0809B; Mon, 7 Mar 2022 10:44:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 094C11931BE9; Mon, 7 Mar 2022 10:44:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7E1E81931BDD for ; Mon, 7 Mar 2022 10:44:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 385DD2026987; Mon, 7 Mar 2022 10:44:20 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 31DBE2026980 for ; Mon, 7 Mar 2022 10:44:15 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C9EB882A6C2 for ; Mon, 7 Mar 2022 10:44:15 +0000 (UTC) Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-384-RCWc5pRCN7GZj9cyEocMcw-1; Mon, 07 Mar 2022 05:44:14 -0500 Received: by mail-ej1-f71.google.com with SMTP id ey18-20020a1709070b9200b006da9614af58so4761730ejc.10 for ; Mon, 07 Mar 2022 02:44:14 -0800 (PST) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id h22-20020a1709062dd600b006dac66b8076sm3145087eji.95.2022.03.07.02.44.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Mar 2022 02:44:12 -0800 (PST) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 5A86C4F8819E for ; Mon, 7 Mar 2022 11:44:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646649868; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ixF4MLCZQ6I++5qKbmAffo81zxGV5zf11wbRfDdm6cY=; b=C3vTS5IvCfnWl4eDLr1e4RUULayTmw1U/MwUs5Ac/oN/OOMQDPeH5fHanhxgYrOgf2gmsa h0MzUZ5Mt/RZ18ALYsWY1hb3VdaqT6OKu7Vmsl/gDykByMT+AWs0oqYDZRNcmpspixaJSq JA5hcC+v9AqKGN1QnEy4hME0Fv1IRVw= X-MC-Unique: ZhZ6p3U5Or2h_H5j9QOL3w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: RCWc5pRCN7GZj9cyEocMcw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ixF4MLCZQ6I++5qKbmAffo81zxGV5zf11wbRfDdm6cY=; b=WecdpZey5AVLQQjBzsaiPJbmOvsZ4Hc79EYRw1q2x5KHYbz8AfV9PfazFXcC8Z9r1o VIjcyHl2MEKt/IW3GTWBjENUNg4U0EfFSAx9JXtsULXyKXFaDURnn/ypQ+pwbTaBNoYc kfVl8EQ/iMdwJh1OHT6NZ+L0rJ+Agwi68MTrGbhePuYj275AeEamHaU/JVZupLX4dZYu sljrl7nIDVe++8xzd4vctEgpRyuWd31BScAOy5SOz2IEQ2GDoBYAywSYix0RgCvqXGkb s02xkU0ghg6fU/rmHVvb+UunPfjFhMPQBwNtWTF+9+ZzlH5Jxn0OZaCCBg9osxXF03nq V/Ng== X-Gm-Message-State: AOAM533IaW/wtMKmeV64sYf+/4MzFhIj+/kq+JgbP6DlGkI1FkrnMjxC LGTKJU8d6xkUhvccE7mtbVEokMDH1MahOoIHNwiFL6/5qDN07hjb9mjnmERfcp2wb8ROww+Wm2w ZYZy9od+K7KaYw4G9q8k0P569TM/H2iMVKtXBK9usSek3+s9VF5pg122gXZZ9QK4FyPxjils= X-Received: by 2002:aa7:cc02:0:b0:411:487e:36fe with SMTP id q2-20020aa7cc02000000b00411487e36femr10431305edt.338.1646649853423; Mon, 07 Mar 2022 02:44:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwW+qK56aSJxA7Vh4rVlukdfbV+/Pq8OJyeJDZeD2tFikF+TvyPCXXLCl845yHm//AuQEi9lA== X-Received: by 2002:aa7:cc02:0:b0:411:487e:36fe with SMTP id q2-20020aa7cc02000000b00411487e36femr10431293edt.338.1646649853179; Mon, 07 Mar 2022 02:44:13 -0800 (PST) From: Martin Kletzander To: libvir-list@redhat.com Subject: [libvirt PATCH] wireshark: Fix dissector for quad types Date: Mon, 7 Mar 2022 11:44:12 +0100 Message-Id: <40f656b430db5f845d2baab3f435ed83cd9afb6b.1646649842.git.mkletzan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646649869948100001 Content-Type: text/plain; charset="utf-8" This uses the right type that is expected to make it work even on platforms where gint64 !=3D quad_t. Due to indentation changes it is best to view this patch with -w. Signed-off-by: Martin Kletzander --- tools/wireshark/src/packet-libvirt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index eeacbcdf0e14..ee20e3734d74 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -74,17 +74,17 @@ static gint ett_libvirt_stream_hole =3D -1; =20 VIR_WARNINGS_NO_UNUSED_FUNCTION =20 -XDR_PRIMITIVE_DISSECTOR(int, gint32, int) -XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) -XDR_PRIMITIVE_DISSECTOR(short, gint16, int) -XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) -XDR_PRIMITIVE_DISSECTOR(char, gchar, int) -XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) -XDR_PRIMITIVE_DISSECTOR(hyper, gint64, int64) -XDR_PRIMITIVE_DISSECTOR(u_hyper, guint64, uint64) -XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) -XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) -XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) +XDR_PRIMITIVE_DISSECTOR(int, gint32, int) +XDR_PRIMITIVE_DISSECTOR(u_int, guint32, uint) +XDR_PRIMITIVE_DISSECTOR(short, gint16, int) +XDR_PRIMITIVE_DISSECTOR(u_short, guint16, uint) +XDR_PRIMITIVE_DISSECTOR(char, gchar, int) +XDR_PRIMITIVE_DISSECTOR(u_char, guchar, uint) +XDR_PRIMITIVE_DISSECTOR(hyper, quad_t, int64) +XDR_PRIMITIVE_DISSECTOR(u_hyper, u_quad_t, uint64) +XDR_PRIMITIVE_DISSECTOR(float, gfloat, float) +XDR_PRIMITIVE_DISSECTOR(double, gdouble, double) +XDR_PRIMITIVE_DISSECTOR(bool, bool_t, boolean) =20 VIR_WARNINGS_RESET =20 --=20 2.35.1