From patchwork Fri Jun 15 19:46:21 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: 138786 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1271061lji; Fri, 15 Jun 2018 13:13:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIPfuWIszdy+8gWHl6OvQCioVn39i2qRDxXVjZDJ+s3USPy4qc1DNKbJx84ylEFhIjKqHXJ X-Received: by 2002:ac8:5155:: with SMTP id h21-v6mr2828528qtn.311.1529093595951; Fri, 15 Jun 2018 13:13:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529093595; cv=none; d=google.com; s=arc-20160816; b=C9K5j38zKefnsgZDu7Pp4xQYNL3IbgI3uCeyV9u7OuYGgLPknFmwSXpgYimvCEJc39 ryjEfLztf2ODKFlpo7WQzRzZyFAScWZDzcC7EXZV6JznXFxdD1rJv95DBa6DFTOTLEji V9Qg+9eizqbV8D4vcGyIxBI56l798wztWvoTTbvWIf7HiTYNdoGcYTOvHyTSLLIm93zM vNx7tU1SvSozGSKyp0tt5RaIhJYXxDQ5ddSbBlGGJjapud05hoFhrFlHir8ToVFehIGT NIyWT43G29IJJ8RlwSJBxKAr9Ey9P6jGvBe17cKxqxOM1Zj2Zuu4Q+It2G829XmYDsHf Ar3A== 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=1QcK4F/pzBjEIcLo7xpk+NmEvJypaJEaoEwy5nuua3I=; b=0BQNtSRi9XBjdt6YirdhMqZH/rbRXvHT6k41O9zq76TFnoGtEmcOyfm+f+8wc5QTgo 57Unk2ROwnXGppnDtWiSHjmgmKg0s8cW9zLRIcJO/L8DS8wQLqasU3lJ1DlchA6B6cTN o2rWSMl0FW6abc13vBdthBr3dx0mL55r41X5fcjexINsCwUq1aZ5BZSYEeH7plnHWlBi ctQY4mw7DA8kz+otDA6VSVSdeV0us7+QRdldgRTk9s4xVOBvfAJx5iO42FGlEzhyJGV0 4IQ1A2MnVStKudea3sKT/idpPoskm602aT7g1kpcs4dnazvmQjT5cwqLuILyxSBc4iDS UIhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DxNyTpZt; 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 i6-v6si3027965qvf.88.2018.06.15.13.13.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:13:15 -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=DxNyTpZt; 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]:49114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTv5v-0006bO-CE for patch@linaro.org; Fri, 15 Jun 2018 16:13:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52390) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTugp-0002aV-SS for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTugo-0005Tv-Js for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:19 -0400 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:43812) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTugo-0005S5-98 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:47:18 -0400 Received: by mail-wr0-x232.google.com with SMTP id d2-v6so10942122wrm.10 for ; Fri, 15 Jun 2018 12:47:18 -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=1QcK4F/pzBjEIcLo7xpk+NmEvJypaJEaoEwy5nuua3I=; b=DxNyTpZt7JDDejZOGhXNbk2BtFc3Nlah8+eKc8QRGGZGUTWP/ZZJoONbu9kebeUIZh BX8YWceNeMfrtEwgWffX4KlCXNsi6+nJmXX9WQHQvYDpjimpivUgwdccg52XQxIY2p1v jbYz447w++HnsH4PbfaLaAtJbNOgU5awNEEmw= 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=1QcK4F/pzBjEIcLo7xpk+NmEvJypaJEaoEwy5nuua3I=; b=C1uO7fohBNKmbctOSm5P/jYskOM0NR45xqOT9u+xHLQpgrs7Vkw8EEPnxxJir8heEq caeVJr1jb18zUxCbTdo/eiRHM/JZCcWcW2uVs/bJTIFqKl8x01NPX5xypgDnpPkpEqyC My2WcLwVG3n1Ki4oadQOFnXzP/rf0pOr6E4hdRxYuDewbCKC3c0x+CQydklZWJGZifnP LNAUAv4tCIJxL6lWZBLh/Z5wo5ivS0j/QvfG1PoAuiNdIo8mnEun9Sdl96QHnt3xqFeK UwaJqxdMxsDH8M2Ynma3I3vQhrw4FEC1GqyX3JP2CpTsIwiIEy+HLBR8dJHg+Si8cmhI 6YCA== X-Gm-Message-State: APt69E3vsyyXfo7sy2TNSykHQpzEwH7k8yZDvDj6wJOrnz2wmbKxTCQQ +lRfAPp6A8s4dJKrsScupfGZ2Q== X-Received: by 2002:adf:ba8f:: with SMTP id p15-v6mr2919430wrg.139.1529092037112; Fri, 15 Jun 2018 12:47:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p6-v6sm12260368wrq.19.2018.06.15.12.47.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:47:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 44C0D3E0930; Fri, 15 Jun 2018 20:47:06 +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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:21 +0100 Message-Id: <20180615194705.28019-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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::232 Subject: [Qemu-devel] [PATCH v7 10/54] 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.1 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;