From nobody Tue Apr 30 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571109465; cv=none; d=zoho.com; s=zohoarc; b=TWcAJfvqMKxRIzQbRfyZNJF9KjKiSZqLVoIpsr2agj5BQ3wkx5ydnFM6pt3shMhOqTmmd6HDYHFXbaunhOXXIk9BspijgN5AeMR4tYIQFtc0VZ3Te6vtliVH47QcGYhXYJ/CXG4kn2w0zc6eYgyU2Eu0dgravWo6p3c1Wi+drqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571109465; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=uA0V+5bbEqMWv4AJgxwRDxDQGcutKg911ZR+TnKYBO4=; b=WjfB359XYbvyTdn0HIeF3ueAQVaYssZANqlS8304lUA+JuaKJqhXG1wN/297RJPKIzw+AmPG8T1+IcrjKNoFt1+eM6sljGC3A2TxjSZz4wwFtcvvw8+9pAesu9+Vm3BP14dOEWIB0YLGEufoH8q3TGVkPxuhewSNPHXhIAWEdCQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571109465489540.2395200215218; Mon, 14 Oct 2019 20:17:45 -0700 (PDT) Received: from localhost ([::1]:59824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKDLE-0000Dz-Gr for importer@patchew.org; Mon, 14 Oct 2019 23:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKDK9-0007ZZ-R6 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 23:16:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKDK7-0007Mt-Th for qemu-devel@nongnu.org; Mon, 14 Oct 2019 23:16:37 -0400 Received: from mga14.intel.com ([192.55.52.115]:34171) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKDK0-0006Wv-5Z; Mon, 14 Oct 2019 23:16:31 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 20:14:24 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga002.jf.intel.com with ESMTP; 14 Oct 2019 20:14:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,297,1566889200"; d="scan'208";a="207412346" From: Wei Yang To: kwolf@redhat.com, mreitz@redhat.com, jasowang@redhat.com, alex.bennee@linaro.org, dgilbert@redhat.com, richard.henderson@linaro.org Subject: [PATCH 1/2] tests/tcg/multiarch: fix code style in function main of test-mmap.c Date: Tue, 15 Oct 2019 11:13:49 +0800 Message-Id: <20191015031350.4345-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015031350.4345-1-richardw.yang@linux.intel.com> References: <20191015031350.4345-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This file uses quite a different code style and changing just one line would leads to some awkward appearance. This is a preparation for the following replacement of sysconf(_SC_PAGESIZE). BTW, to depress ERROR message from checkpatch.pl, this patch replaces strtoul with qemu_strtoul. Signed-off-by: Wei Yang --- tests/tcg/multiarch/test-mmap.c | 67 ++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index 11d0e777b1..9ea49e2307 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -456,49 +456,54 @@ void check_invalid_mmaps(void) =20 int main(int argc, char **argv) { - char tempname[] =3D "/tmp/.cmmapXXXXXX"; - unsigned int i; - - /* Trust the first argument, otherwise probe the system for our - pagesize. */ - if (argc > 1) - pagesize =3D strtoul(argv[1], NULL, 0); - else - pagesize =3D sysconf(_SC_PAGESIZE); + char tempname[] =3D "/tmp/.cmmapXXXXXX"; + unsigned int i; + + /* + * Trust the first argument, otherwise probe the system for our + * pagesize. + */ + if (argc > 1) { + qemu_strtoul(argv[1], NULL, 0, &pagesize); + } else { + pagesize =3D sysconf(_SC_PAGESIZE); + } =20 - /* Assume pagesize is a power of two. */ - pagemask =3D pagesize - 1; - dummybuf =3D malloc (pagesize); - printf ("pagesize=3D%u pagemask=3D%x\n", pagesize, pagemask); + /* Assume pagesize is a power of two. */ + pagemask =3D pagesize - 1; + dummybuf =3D malloc(pagesize); + printf("pagesize=3D%u pagemask=3D%x\n", pagesize, pagemask); =20 - test_fd =3D mkstemp(tempname); - unlink(tempname); + test_fd =3D mkstemp(tempname); + unlink(tempname); =20 - /* Fill the file with int's counting from zero and up. */ + /* Fill the file with int's counting from zero and up. */ for (i =3D 0; i < (pagesize * 4) / sizeof i; i++) { checked_write(test_fd, &i, sizeof i); } =20 - /* Append a few extra writes to make the file end at non=20 - page boundary. */ + /* + * Append a few extra writes to make the file end at non + * page boundary. + */ checked_write(test_fd, &i, sizeof i); i++; checked_write(test_fd, &i, sizeof i); i++; checked_write(test_fd, &i, sizeof i); i++; =20 - test_fsize =3D lseek(test_fd, 0, SEEK_CUR); + test_fsize =3D lseek(test_fd, 0, SEEK_CUR); =20 - /* Run the tests. */ - check_aligned_anonymous_unfixed_mmaps(); - check_aligned_anonymous_unfixed_colliding_mmaps(); - check_aligned_anonymous_fixed_mmaps(); - check_file_unfixed_mmaps(); - check_file_fixed_mmaps(); - check_file_fixed_eof_mmaps(); - check_file_unfixed_eof_mmaps(); - check_invalid_mmaps(); + /* Run the tests. */ + check_aligned_anonymous_unfixed_mmaps(); + check_aligned_anonymous_unfixed_colliding_mmaps(); + check_aligned_anonymous_fixed_mmaps(); + check_file_unfixed_mmaps(); + check_file_fixed_mmaps(); + check_file_fixed_eof_mmaps(); + check_file_unfixed_eof_mmaps(); + check_invalid_mmaps(); =20 - /* Fails at the moment. */ - /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */ + /* Fails at the moment. */ + /* check_aligned_anonymous_fixed_mmaps_collide_with_host(); */ =20 - return EXIT_SUCCESS; + return EXIT_SUCCESS; } --=20 2.17.1 From nobody Tue Apr 30 06:18:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1571109421; cv=none; d=zoho.com; s=zohoarc; b=DE7oQhHDreKQMvQCBdmR0rnzyrsEZM9T+z2jzfaBLMd6b1e9UWKtdUvaMkZs82b2nDwiW5Zpcssu7pZ0PYFpq4gkm2DFqEu1Fib8f7TNp5cdGpEMWLwovOjDVfmYLZQKRwvWUMypmnHwPIpcBF2niTY1dc2NbOSjdxAB8I576MA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571109421; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ajn099a85vjlcwUW1sL7wqZcnyOfSeZtBtMHeJXg8GY=; b=Fg1G0bM76pJ3MnJc3zhd7piymzboWGIOts4qo2Gv9ta24ogbRMV6y9Aedt3uVs54j4QsSpfZSn8+K3tUSgQz67IvOt8zj7KyRvxHHZvIq1hh6+ehfV/GgCMt63yRXn4lux6y7ENOY6QiZYXo0R5plXwpYaoHTFapiRLaNVqZfdU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571109421465255.5518322685108; Mon, 14 Oct 2019 20:17:01 -0700 (PDT) Received: from localhost ([::1]:59814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKDKW-0007e8-8a for importer@patchew.org; Mon, 14 Oct 2019 23:17:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52020) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKDJ6-0006rB-CP for qemu-devel@nongnu.org; Mon, 14 Oct 2019 23:15:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKDJ5-0006xe-CA for qemu-devel@nongnu.org; Mon, 14 Oct 2019 23:15:32 -0400 Received: from mga14.intel.com ([192.55.52.115]:34173) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKDJ3-0006Xv-3F; Mon, 14 Oct 2019 23:15:29 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Oct 2019 20:14:27 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga002.jf.intel.com with ESMTP; 14 Oct 2019 20:14:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,297,1566889200"; d="scan'208";a="207412350" From: Wei Yang To: kwolf@redhat.com, mreitz@redhat.com, jasowang@redhat.com, alex.bennee@linaro.org, dgilbert@redhat.com, richard.henderson@linaro.org Subject: [PATCH 2/2] core: replace sysconf(_SC_PAGESIZE) with qemu_real_host_page_size Date: Tue, 15 Oct 2019 11:13:50 +0800 Message-Id: <20191015031350.4345-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191015031350.4345-1-richardw.yang@linux.intel.com> References: <20191015031350.4345-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.115 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Wei Yang Suggested-by: "Dr. David Alan Gilbert" CC: Richard Henderson Reviewed-by: Stefano Garzarella --- block/file-posix.c | 2 +- net/l2tpv3.c | 2 +- tests/tcg/multiarch/test-mmap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 5d1995a07c..853ed42134 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2562,7 +2562,7 @@ static void check_cache_dropped(BlockDriverState *bs,= Error **errp) off_t end; =20 /* mincore(2) page status information requires 1 byte per page */ - page_size =3D sysconf(_SC_PAGESIZE); + page_size =3D qemu_real_host_page_size; vec =3D g_malloc(DIV_ROUND_UP(window_size, page_size)); =20 end =3D raw_getlength(bs); diff --git a/net/l2tpv3.c b/net/l2tpv3.c index 55fea17c0f..5f843240de 100644 --- a/net/l2tpv3.c +++ b/net/l2tpv3.c @@ -41,7 +41,7 @@ * chosen to be sufficient to accommodate one packet with some headers */ =20 -#define BUFFER_ALIGN sysconf(_SC_PAGESIZE) +#define BUFFER_ALIGN qemu_real_host_page_size #define BUFFER_SIZE 2048 #define IOVSIZE 2 #define MAX_L2TPV3_MSGCNT 64 diff --git a/tests/tcg/multiarch/test-mmap.c b/tests/tcg/multiarch/test-mma= p.c index 9ea49e2307..370842e5c2 100644 --- a/tests/tcg/multiarch/test-mmap.c +++ b/tests/tcg/multiarch/test-mmap.c @@ -466,7 +466,7 @@ int main(int argc, char **argv) if (argc > 1) { qemu_strtoul(argv[1], NULL, 0, &pagesize); } else { - pagesize =3D sysconf(_SC_PAGESIZE); + pagesize =3D qemu_real_host_page_size; } =20 /* Assume pagesize is a power of two. */ --=20 2.17.1