From patchwork Fri May 25 13:38:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 136891 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3617621lji; Fri, 25 May 2018 06:51:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL+ZWPkJFjZL2j831SBx9y9FRO49Y+2hzq0fPXDXobaFpy7Wm0yc5tkwYiJ2J8rcv7ehUdl X-Received: by 2002:ac8:2627:: with SMTP id u36-v6mr2328640qtu.189.1527256286219; Fri, 25 May 2018 06:51:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527256286; cv=none; d=google.com; s=arc-20160816; b=lntvK5XiYkH9/4S5yN5SQMZCOOHWlbTN1/SL1P9CoKEEPPqAJpBxBFT5iZmT7fFqLt e1i2SYecN35HBtNjS7aE4BhrIcULgLWgyVYljY4mupSNcuuPAV0L2JR+SRw4wNMSrgHB Ae6fINK6IcCFdSQoVKqUFIEaBiLHs/8AtsqYXEF3iylxhz4CgR8xLAjSi8iOEgZl0HzC bbtft98MGsHXyxdMFnYs6AmFQjvPeHDz5XOmF54ljusvgFViNEEUJo+9A6+SiNsdwMtL nOtJls7XYHXy1xSkQ4nHSPf1DLgfuJnAIK7BHvG2JQ1QA7nQld2IbnW+BYWi0XgtEAaT qHNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=WnwOe6OFO9ZheDJkVo5K/0K4122AtXWxiX6YZgaZ8+k=; b=c5cwuVW+epCAo+YZyjDGt57uLwzu1jvVdUX18I87lnCBVOr8LnPTThfJBAVtEee5oN SAwqfVEZz6ZENB9kK+jRp6USgfENN61YqN9lDTkDSvrtup6uWlz963GgGA2s2WlvrlVi 3vZQ341hW1Qg22/audvvhURa2iqasojhO+Ty/FMRHI7mKtfyZn8aY2h7qA8498t1Mmou baIZfoE2sJFL/U7di3MyNNSxbYIsyPZ4Uvd9PpYhVlTmc9f0+Cy8KIdLU+wvQGwBpqSv eO/AeIWQjBrqQm9c2S0fNtdfcIMxG/T34hWybzxFXrWmL1oTtZZaK7eGvVksC0Br+L+f 4XOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Y06tqyNA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u1-v6si239788qkh.207.2018.05.25.06.51.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 May 2018 06:51:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Y06tqyNA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMD7t-000722-Jg for patch@linaro.org; Fri, 25 May 2018 09:51:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMD1a-00023l-UC for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMD1X-0008Rn-Q0 for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:54 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:39231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMD1X-0008Ra-Fc for qemu-devel@nongnu.org; Fri, 25 May 2018 09:44:51 -0400 Received: by mail-wr0-x22f.google.com with SMTP id w18-v6so9357685wrn.6 for ; Fri, 25 May 2018 06:44:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WnwOe6OFO9ZheDJkVo5K/0K4122AtXWxiX6YZgaZ8+k=; b=Y06tqyNAnvB4rgoqsda6JNUk1fL7oMvIedD0WAJz0NChw5Oms+6Mcdw1b8ssq73mev 3cQJxNYXrGlX+/CQ94yySCe4FzqsF5h82qsTssT7kH3JRZsWVDVwkkrrogTdpyEPjKZ8 h/HMdBCIteXo6R+q1pL/5epSNaBv7v6mZjPP4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WnwOe6OFO9ZheDJkVo5K/0K4122AtXWxiX6YZgaZ8+k=; b=q/GH4mbtYBsWLZF7BkVt2plM3fZmwmxufgQHE8n97T64fIldPAESxTc7njLsrCUNKP OoLkg3ZLPynRDCTTVb/wJQ8qrFUz8nezcRT4yN5JvsOXe5l/KTuXlxdU6Bxstb2zt3fC BeJhAIHWEPBSREsVsalkE+VQB8Hd9dvMkpHwC/UnBsoqyo2Y8W+Nupfa0umwZv2+b5tG UczHpUfSLbsGruPTTOAWRdllQcSChaiq3zlupauNUcr8LcLb7/p7jnUCy6tGsK93njie hZRIY1r7v5coPvm2ye6M2gHJzemFTm2PyxfZCYZxXXAEUPmxKdjUqNujSvC9Fwvgb43w E94A== X-Gm-Message-State: ALKqPwfunNw4K38d2Ui2TX9imV5w8qBoJazFxQkLZlapOPYAFbP5y19M HekahYJt3oFYd7+2pfte5J+UQA== X-Received: by 2002:adf:ea0f:: with SMTP id q15-v6mr1689724wrm.9.1527255890277; Fri, 25 May 2018 06:44:50 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m69-v6sm10765545wmd.47.2018.05.25.06.44.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 06:44:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 506AB3E08B3; Fri, 25 May 2018 14:38:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 25 May 2018 14:38:15 +0100 Message-Id: <20180525133851.27161-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525133851.27161-1-alex.bennee@linaro.org> References: <20180525133851.27161-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [PATCH v5 13/49] tests/tcg/multiarch: Build fix for linux-test 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Fam Zheng To keep the compiler happy, and to fit in our buildsys flags: - Make local functions "static" - #ifdef out unused functions - drop cutils/osdep dependencies Signed-off-by: Fam Zheng [AJB: drop cutils/osdep dependencies] Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tests/tcg/multiarch/linux-test.c | 68 ++++++++++---------------------- 1 file changed, 21 insertions(+), 47 deletions(-) -- 2.17.0 diff --git a/tests/tcg/multiarch/linux-test.c b/tests/tcg/multiarch/linux-test.c index 5070d31446..4457bd04ba 100644 --- a/tests/tcg/multiarch/linux-test.c +++ b/tests/tcg/multiarch/linux-test.c @@ -16,7 +16,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#define _GNU_SOURCE #include #include #include @@ -31,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -39,13 +39,12 @@ #include #include #include -#include "qemu/cutils.h" #define TESTPATH "/tmp/linux-test.tmp" #define TESTPORT 7654 #define STACK_SIZE 16384 -void error1(const char *filename, int line, const char *fmt, ...) +static void error1(const char *filename, int line, const char *fmt, ...) { va_list ap; va_start(ap, fmt); @@ -56,7 +55,7 @@ void error1(const char *filename, int line, const char *fmt, ...) exit(1); } -int __chk_error(const char *filename, int line, int ret) +static int __chk_error(const char *filename, int line, int ret) { if (ret < 0) { error1(filename, line, "%m (ret=%d, errno=%d)", @@ -73,7 +72,7 @@ int __chk_error(const char *filename, int line, int ret) #define FILE_BUF_SIZE 300 -void test_file(void) +static void test_file(void) { int fd, i, len, ret; uint8_t buf[FILE_BUF_SIZE]; @@ -210,7 +209,7 @@ void test_file(void) chk_error(rmdir(TESTPATH)); } -void test_fork(void) +static void test_fork(void) { int pid, status; @@ -224,7 +223,7 @@ void test_fork(void) error("waitpid status=0x%x", status); } -void test_time(void) +static void test_time(void) { struct timeval tv, tv2; struct timespec ts, rem; @@ -251,34 +250,7 @@ void test_time(void) error("getrusage"); } -void pstrcpy(char *buf, int buf_size, const char *str) -{ - int c; - char *q = buf; - - if (buf_size <= 0) - return; - - for(;;) { - c = *str++; - if (c == 0 || q >= buf + buf_size - 1) - break; - *q++ = c; - } - *q = '\0'; -} - -/* strcat and truncate. */ -char *pstrcat(char *buf, int buf_size, const char *s) -{ - int len; - len = strlen(buf); - if (len < buf_size) - pstrcpy(buf + len, buf_size - len, s); - return buf; -} - -int server_socket(void) +static int server_socket(void) { int val, fd; struct sockaddr_in sockaddr; @@ -298,7 +270,7 @@ int server_socket(void) } -int client_socket(void) +static int client_socket(void) { int fd; struct sockaddr_in sockaddr; @@ -312,9 +284,9 @@ int client_socket(void) return fd; } -const char socket_msg[] = "hello socket\n"; +static const char socket_msg[] = "hello socket\n"; -void test_socket(void) +static void test_socket(void) { int server_fd, client_fd, fd, pid, ret, val; struct sockaddr_in sockaddr; @@ -348,9 +320,10 @@ void test_socket(void) chk_error(close(server_fd)); } +#if 0 #define WCOUNT_MAX 512 -void test_pipe(void) +static void test_pipe(void) { fd_set rfds, wfds; int fds[2], fd_max, ret; @@ -391,10 +364,10 @@ void test_pipe(void) chk_error(close(fds[1])); } -int thread1_res; -int thread2_res; +static int thread1_res; +static int thread2_res; -int thread1_func(void *arg) +static int thread1_func(void *arg) { int i; for(i=0;i<5;i++) { @@ -404,7 +377,7 @@ int thread1_func(void *arg) return 0; } -int thread2_func(void *arg) +static int thread2_func(void *arg) { int i; for(i=0;i<6;i++) { @@ -435,27 +408,28 @@ void test_clone(void) thread2_res != 6) error("clone"); } +#endif /***********************************/ volatile int alarm_count; jmp_buf jmp_env; -void sig_alarm(int sig) +static void sig_alarm(int sig) { if (sig != SIGALRM) error("signal"); alarm_count++; } -void sig_segv(int sig, siginfo_t *info, void *puc) +static void sig_segv(int sig, siginfo_t *info, void *puc) { if (sig != SIGSEGV) error("signal"); longjmp(jmp_env, 1); } -void test_signal(void) +static void test_signal(void) { struct sigaction act; struct itimerval it, oit; @@ -510,7 +484,7 @@ void test_signal(void) #define SHM_SIZE 32768 -void test_shm(void) +static void test_shm(void) { void *ptr; int shmid;