From patchwork Tue Nov 13 17:54:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 997344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42vb1J5zBRz9s7W for ; Wed, 14 Nov 2018 04:57:07 +1100 (AEDT) Received: from localhost ([::1]:55488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMcvv-00005D-UH for incoming@patchwork.ozlabs.org; Tue, 13 Nov 2018 12:57:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMcvV-0008WC-25 for qemu-devel@nongnu.org; Tue, 13 Nov 2018 12:56:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMcvP-0002jq-VI for qemu-devel@nongnu.org; Tue, 13 Nov 2018 12:56:36 -0500 Received: from mout.kundenserver.de ([212.227.126.133]:33931) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMcvJ-0002fJ-Kb for qemu-devel@nongnu.org; Tue, 13 Nov 2018 12:56:27 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N2lzA-1fMBW11EFQ-0134oX; Tue, 13 Nov 2018 18:56:17 +0100 From: Laurent Vivier To: =?utf-8?q?Alex_Benn=C3=A9e?= Date: Tue, 13 Nov 2018 18:54:37 +0100 Message-Id: <20181113175437.26492-1-laurent@vivier.eu> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:YwMXVnkgwa9qTJux1BisAKB+iRDlaEMT/Ps6mfSygwIwOP/tsiB I5+mEj7957Pj7+PVH9fRjeB7HTr6qyVqO/1l6Ye0aUqnzKMWwrhRscYofWCjnUHRcVBvPf8 cKarQVXMdTsHX9lOD6vRWbbYi1I14GKDy6xtZqc7chyGeXkea+kH6Kupt4be8MXXuuqd0SJ S8B2RcGt8KXorG3YS0rIg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Zob8ee5njCM=:uYNh4Opu+nWi5OeZYr/kUu k+2gmDIMNV4VGO2EDumOyYB2ZZGFm4zGSQ6YNvdHfRoR1dupjRZB+fSolgcvtYH1YYLj1f3aJ GKOfBeyxSQE8YEtoaliIJHmxGRNtXoBhKUpmi16h/uefqO5Nbt5es+tiCbjAxXElSKpxI14qw sDyKg9eN4VMluaOFo+ngE1bRKiGd7pM4ogfLgBu4tIY365L2TlVqAqW+D3YVHLAYL4Vrk7DgG NQOpc2g0MY6gQromCAw7ztQp9ksQyyHhH+ifd5sNqvgIq9LclxOlo9EAus14IYc2/iuWmDp4z uUk3YO7buwoBdKuzjC2JeNYa/RpZuMkuIY3+zZAmj+0C7hi0tNPCqydm3GOHkEW+9W9yHP4Kj 27tixeYx1qqg5im6eTzFd7QUzg0w2RrKl2HSXEbhU55AnuG86yhy7cg5TzXRYzyFWyyTS8EPT Te6ZmR1VpD4kGZnMiir9hk+dgl7Vxe5TIArcs+3lKOIDiCQKWUBH+IsNTM0/EtFZHOT5z5OCm PBy3Ka3pjCIO2JaGsmtpcF5lRi22208VmTa0PISmN213LtuPisflnPUjrtqWq8b2KxcB9OCMy SZhSW9jVvy7vabBiQ//I7gN9c1eXxmAN+LRHx0d2UdLes5pFyUEjZFglVg7eQHS/4IWjf69u4 t6rbIdK23Fd8jdBVpwMN8GCiYZG3nue6RVtBeErYixM2IcDV751ngR9/Q+wcyIslCFlt1eXc0 n7YatpG55tE9cpUMeQ96RjrnaV8BicBCj2a9dUf2H0N5Mn1sjcOZOqHm8gr/sIybtZYABJCJg z+E/Lyh X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH] tests/tcg/multiarch: fix 32bit linux-test on 64bit host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?b?YXVkw6k=?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Fix: TEST linux-test on i386 .../tests/tcg/multiarch/linux-test.c:201: readdir readdir() calls getdents64() to have the list of the entries in a directory, and getdents64() can return 64bit d_off values (with ext4, for instance) that will not fit in the 32bit d_off field of the readdir() dirent structure. To avoid that, use readdir64() to use a 64bit d_off field too. Signed-off-by: Laurent Vivier Reviewed-by: Alex Bennée --- tests/tcg/multiarch/linux-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index e80eccc0ce..fa4243fc04 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -83,7 +83,7 @@ static void test_file(void) struct utimbuf tbuf; struct iovec vecs[2]; DIR *dir; - struct dirent *de; + struct dirent64 *de; /* TODO: make common tempdir creation for tcg tests */ char template[] = "/tmp/linux-test-XXXXXX"; char *tmpdir = mkdtemp(template); @@ -186,7 +186,7 @@ static void test_file(void) error("opendir"); len = 0; for(;;) { - de = readdir(dir); + de = readdir64(dir); if (!de) break; if (strcmp(de->d_name, ".") != 0 &&