From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNAd1-0005p4-1O for qemu-devel@nongnu.org; Sun, 06 Nov 2011 16:51:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNAcz-0005WM-Ql for qemu-devel@nongnu.org; Sun, 06 Nov 2011 16:51:46 -0500 Received: from smtp22.services.sfr.fr ([93.17.128.10]:45341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNAcz-0005WE-LD for qemu-devel@nongnu.org; Sun, 06 Nov 2011 16:51:45 -0500 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 6 Nov 2011 22:52:05 +0100 Message-Id: <1320616325-22073-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1320616325-22073-1-git-send-email-hpoussin@reactos.org> References: <1320616325-22073-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/2] net: store correct timestamp in dump file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Signed-off-by: Herv=C3=A9 Poussineau --- net/dump.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/net/dump.c b/net/dump.c index 8132411..4b48d48 100644 --- a/net/dump.c +++ b/net/dump.c @@ -30,6 +30,7 @@ =20 typedef struct DumpState { VLANClientState nc; + int64_t start_ts; int fd; int pcap_caplen; } DumpState; @@ -70,7 +71,7 @@ static ssize_t dump_receive(VLANClientState *nc, const = uint8_t *buf, size_t size ts =3D muldiv64(qemu_get_clock_ns(vm_clock), 1000000, get_ticks_per_= sec()); caplen =3D size > s->pcap_caplen ? s->pcap_caplen : size; =20 - hdr.ts.tv_sec =3D ts / 1000000; + hdr.ts.tv_sec =3D ts / 1000000 + s->start_ts; hdr.ts.tv_usec =3D ts % 1000000; hdr.caplen =3D caplen; hdr.len =3D size; @@ -104,6 +105,7 @@ static int net_dump_init(VLANState *vlan, const char = *device, struct pcap_file_hdr hdr; VLANClientState *nc; DumpState *s; + struct tm tm; int fd; =20 fd =3D open(filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0644)= ; @@ -136,6 +138,9 @@ static int net_dump_init(VLANState *vlan, const char = *device, s->fd =3D fd; s->pcap_caplen =3D len; =20 + qemu_get_timedate(&tm, 0); + s->start_ts =3D mktime(&tm); + return 0; } =20 --=20 1.7.6.3