From patchwork Tue Apr 24 15:23:32 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: 134138 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2428619lji; Tue, 24 Apr 2018 09:15:13 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrSAqpEA1GT29BFF3Q63J4VSVh3IWJVXa5sZoFDPPrrNzEmbmzCJQ4QixKj3LMhjnOtM4gf X-Received: by 10.55.20.103 with SMTP id e100mr28450351qkh.6.1524586513503; Tue, 24 Apr 2018 09:15:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524586513; cv=none; d=google.com; s=arc-20160816; b=DBXcE8gk2SeKkuCTCzwjMkTfKJGfFMBjMWi4V6pel2JsJxfkNHNaq9G2NnqvN2tK+G Dbz4/halISwTumHra5sPbZGnb7kWFW0OdvXxX+LDnJjaZCUGTk70d8Wrmg5EE2uMyC66 Pxt4u/hh1qBTcZTJlIBx00TDCqTo4AnzRivXpFfEo3VMkhTZfzTavOJW0Lnut7Qw/fPv 6d2CN6fZq0WTYIsGvXaOSewaAm3lSGrK90NoAApu3AoB12Xa2Qvpe9jWblWwff8QKMd2 5+opTmzntR0L0TJd4UGB/XHVkkyGGgop45kG4SIXxa5vGTyMsdpRpewbDfgsosLAz+K1 tOaA== 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=EiFcVfhMjf9AXXl4rTHN8NJQbIPZJGrxc0yc25niYXM=; b=GdvHHK2bIbfJRE0VVtPpZsTMt4O/XeO8Fu+zot6+5XUIsNy1nMYSs6oWKfqhoFyl2J 7kH/49giWdkHXis4870zSw+x9EzHEL9PtvlN//S0MxaDQRwJtoIguIcdeqkjFUwU8xch EQOQKjWGp3lIpHfn2CVacz0syQs6YesYEI3cwxP5cQ6jZ+E+yIK42F0NcTsUypt/svB5 EhOtx5pvhsSfUcCFMxNe5hU3PReBptfF0lelVsUgt0JW8cF4DvmYssK+hfwcusVWrxVf LD4dxR2PnpEjuDzU/p+Nhdz7WwpvNldwwxVVYO/z23QqYSxS1UCUPtsi0XJiGgoRBvRc Ds6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gpLZpS54; 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 p52-v6si535323qtc.122.2018.04.24.09.15.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Apr 2018 09:15:13 -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=gpLZpS54; 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]:59403 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB0b2-0005jF-T6 for patch@linaro.org; Tue, 24 Apr 2018 12:15:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB06J-0005PX-MN for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fB06E-0000j5-GB for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:27 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fB06E-0000ic-6M for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:43:22 -0400 Received: by mail-wr0-x243.google.com with SMTP id w3-v6so50431872wrg.2 for ; Tue, 24 Apr 2018 08:43:22 -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=EiFcVfhMjf9AXXl4rTHN8NJQbIPZJGrxc0yc25niYXM=; b=gpLZpS54gmYRnqFTG4dmzMtPkUIxna9R1Smj2lIq0Z62dSlM/z74wBnxO4jeNeL+ff cqlpzq8U5xTWwqSeRqI49Sz7vdtOcTfmJu4MsTjw58aUNHRV7EcNz+IguugfjXGjddiT vMJergS1VjQVVGYCU0sYjn+Fn+78bfyA74/WY= 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=EiFcVfhMjf9AXXl4rTHN8NJQbIPZJGrxc0yc25niYXM=; b=Ny/hGlIapIGR5MVL+3CmjfUry1rKVjSA/y7zc/H2sEXq4E72C4Nf6QLHagwsMHT0P/ 1OmCsa0bwNTY5vj9M/flPlf2BoqWvMLZVVzI/AU4DsRgMSSF+xTDbGjlA7eDizXOdLSU ITOaq371kF6quMv9qebVzEOcye34VTmTxcnTY7WIXDDkBgrVdUu+wJfKORTODeWdM/b+ V3kVveLaxHLZ3+05Q4yCuzhMuU2+NG6pgvVkKBwOy5KjVXTvpL2ZW/T7WsSXYVw2RoVb QDHNuAYon9whJlD3xYFS/2C8hPh3lYLrUqZVtW1rGK3sgTWJpxqesW2l8o6j47SPufSw 6vyA== X-Gm-Message-State: ALQs6tDPm8iXxfThC8TZBzfMp0uYI/O8FwN5MN1oDnMwlFRFfIlzT3nB XalWwz4KJS1LTtzDmqUReHKEIQ== X-Received: by 2002:adf:8425:: with SMTP id 34-v6mr21863344wrf.254.1524584601024; Tue, 24 Apr 2018 08:43:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t130sm10406118wmt.0.2018.04.24.08.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 08:43:15 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 65C113E0A5F; Tue, 24 Apr 2018 16:24:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, 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: Tue, 24 Apr 2018 16:23:32 +0100 Message-Id: <20180424152405.10304-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180424152405.10304-1-alex.bennee@linaro.org> References: <20180424152405.10304-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::243 Subject: [Qemu-devel] [PATCH v3 13/46] 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 --- tests/tcg/multiarch/linux-test.c | 68 ++++++++++---------------------- 1 file changed, 21 insertions(+), 47 deletions(-) -- 2.17.0 Reviewed-by: Richard Henderson 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;