From patchwork Sat Sep 5 06:23:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306121 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E92AC433E2 for ; Sat, 5 Sep 2020 06:25:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3F32208DB for ; Sat, 5 Sep 2020 06:25:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WhStefGg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3F32208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERdW-0008GC-Qp for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:25:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcB-0006Su-OJ; Sat, 05 Sep 2020 02:23:55 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:40784) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcA-0003UZ-6F; Sat, 05 Sep 2020 02:23:55 -0400 Received: by mail-pj1-x102b.google.com with SMTP id gf14so3998485pjb.5; Fri, 04 Sep 2020 23:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bM8au98PWoeNJSV4TV/fhw7ws62pAWVvuMLjtZdOgq4=; b=WhStefGg3ym29O/azclYOzuYCMZ0N6D6h1xo9lyj/yjz9m2PS5/J/N63htH61/2lLe 7Q5pQFQfZEEQxw/V36MPQHr3Q4eFbuiXjNXvAVr4LifZ82Dns8IogVtYySpQgrQnjq9a rdbJa37LLCQkMNX2+2C5s2dDMTKYJo2TZI9HYXGLKp9k1jhfJDSqac40mDEZWltwpq3d iCDgyiUKS9F0pQHYGuAUHSGBgmUT+LfcVHplosK9+jV8KZAfXWSExs66PhDhRHC/kCEd dpZWzZuBsffOtqzJlPC1qFBYDU3ecBCQJjopRAUmA5rWiUTArIMToaa7LHHf6B+gTTXb RduQ== 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=bM8au98PWoeNJSV4TV/fhw7ws62pAWVvuMLjtZdOgq4=; b=Ph+sB5a4jLcnRNzxpjwFbKFGea0oU8QgGcVwgdqQp7gEnpgp76KMP+/Ib3OmT/4CsI Rlr3D+Ohg6o9veqzRFoW3MadkpYzJfwEBc7/8dWOZqkBvKju1ZTXEqMWdzD23CbHubmC NKX1IIN+4QYOmNx0aVbNV0O8W85wAKmoTtWg/tpTC2lU4rg6P3mc3S+X3EGG8SjqVLWB zhZYrLAuagzRpIkzvpaNn6WMn9iN7sU/xIYnn0Vv4+J6yExCPF4/CeriLDaGxbCZI2Xf hQG6HBb/LV5igkH8GxaK/i2HyGp1DTRV1FE+uYQEbh5I3lc+1O4WFj+PKWsXySHf93E7 nsTA== X-Gm-Message-State: AOAM531myjB38Kr9sYxjypnIAxe5IH103GTqsl9sk4xjyv8BcYTZPavE we/0f6sIBpTtEvd8Odr4axdiLVPb8xWvtg== X-Google-Smtp-Source: ABdhPJwcAwwpvAE7Bhdq/x4vcM2OU4LCzkgaePdpLrtb54QjYzxKj3l7RsGsdyw8jrPhUoy7d/oI3g== X-Received: by 2002:a17:90a:7f8a:: with SMTP id m10mr11739392pjl.47.1599287031969; Fri, 04 Sep 2020 23:23:51 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.23.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:23:51 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 01/11] Revert "configure: add --ninja option" Date: Sat, 5 Sep 2020 14:23:23 +0800 Message-Id: <20200905062333.1087-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x102b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This reverts commit 48328880fddf0145bdccc499160fb24dfabfbd41. Signed-off-by: Yonggang Luo --- configure | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/configure b/configure index d3495e107f..5d8bf4d8bb 100755 --- a/configure +++ b/configure @@ -517,7 +517,6 @@ rng_none="no" secret_keyring="" libdaxctl="" meson="" -ninja="" skip_meson=no gettext="" @@ -984,8 +983,6 @@ for opt do ;; --meson=*) meson="$optarg" ;; - --ninja=*) ninja="$optarg" - ;; --smbd=*) smbd="$optarg" ;; --extra-cflags=*) @@ -1758,7 +1755,6 @@ Advanced options (experts only): --python=PYTHON use specified python [$python] --sphinx-build=SPHINX use specified sphinx-build [$sphinx_build] --meson=MESON use specified meson [$meson] - --ninja=NINJA use specified ninja [$ninja] --smbd=SMBD use specified smbd [$smbd] --with-git=GIT use specified git [$git] --static enable static build [$static] @@ -1995,16 +1991,6 @@ case "$meson" in *) meson=$(command -v meson) ;; esac -# Probe for ninja (used for compdb) - -if test -z "$ninja"; then - for c in ninja ninja-build samu; do - if has $c; then - ninja=$(command -v "$c") - break - fi - done -fi # Check that the C compiler works. Doing this here before testing # the host CPU ensures that we had a valid CC to autodetect the @@ -7917,7 +7903,7 @@ fi mv $cross config-meson.cross rm -rf meson-private meson-info meson-logs -NINJA=${ninja:-$PWD/ninjatool} $meson setup \ +NINJA=$PWD/ninjatool $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ From patchwork Sat Sep 5 06:23:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 274447 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2208C43461 for ; Sat, 5 Sep 2020 06:27:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F341208DB for ; Sat, 5 Sep 2020 06:27:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aY0RsVob" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F341208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERff-0003jJ-6W for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcF-0006d8-RZ; Sat, 05 Sep 2020 02:23:59 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:42294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcE-0003VU-1a; Sat, 05 Sep 2020 02:23:59 -0400 Received: by mail-pg1-x543.google.com with SMTP id m5so5410071pgj.9; Fri, 04 Sep 2020 23:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bscWSrwzBlA91ho91MKRFqbKOrFCfnhQG9RPGa7f72A=; b=aY0RsVob/SJYu2MYTAzRf9jyHOAFu1wfwV9SpQMXVQd6kgWAmG841k2AjQ90Vv3wSC 7Yv2EMxKTQbL3TrAzPIUcYSTtf3K7VhXiIrqYnH2XKtPrrdRxEoj/v4h1UprVpiPX1Em JT52XQYvZkfujQAjbbRbwwV8pTP6eMbZDK4O979RXKReWDV1uqKF0ozROZWwHmwEq+0n XjlWefV/dE+kT8f1iGnhIeJk6tNRoO8UTGvUJEfuaN/06bqEFZxGCJx1jg0skP8Xu/TY epu7u8e1fl1yekmA4UP86dr3hNJobyQwxJ3gA253TosnyhtVBYSd4el4uXaTpjHUlLaz sL3g== 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=bscWSrwzBlA91ho91MKRFqbKOrFCfnhQG9RPGa7f72A=; b=QdbKIeeBxfhCDKYQ0eT4EiUcu2gfTQ+Yt+ofXtoo6kN+vMiDyor8C7ow8DUTUEjfE1 Z38AvL3j+Szp3pQo73eLjBcVT+O30rgnFvET4g7U7yeOhkI0AmOLsl8sMAVAze+cqEju lLk032wBUBJfKbzs+86AubiUbpl3fe2RtuY+/IYz/HsAnAbHaNjwuF9Nx0P4B+Tzbcoc w1nKMCCfpYQZcyr+Gj4mBF5BobDeh/nNWDnQLQLo+mpA8/k1TeOtxv+xeR4fQ2/AcgR8 NBfe8NWAU4ksX9dXTAskytriR0BCvWdeORKOjpaJXiV6cDV3LxLccgwd/3j2OjC4xcs4 jf5w== X-Gm-Message-State: AOAM532BG2agKpNslSR8pF0PgXruLhbZ6DKBrAv83j6/XZdX0DtsRGPt ooq/4xK7JgENxJeHprYxq/k8HcSs8pOoYLAZ X-Google-Smtp-Source: ABdhPJysbaa/8tzmzVw7fLth/Vhz8OeJF41mhOCi9dtBbd419rSY9piDKanXzRp7KvxAiGsLL5LXOg== X-Received: by 2002:a63:780a:: with SMTP id t10mr10170735pgc.184.1599287034925; Fri, 04 Sep 2020 23:23:54 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:23:54 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 02/11] block: Fixes nfs on msys2/mingw Date: Sat, 5 Sep 2020 14:23:24 +0800 Message-Id: <20200905062333.1087-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::543; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- block/nfs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 61a249a9fc..34b2cd5708 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -24,7 +24,9 @@ #include "qemu/osdep.h" +#if !defined(_WIN32) #include +#endif #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -51,6 +53,12 @@ #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) #define QEMU_NFS_MAX_DEBUG_LEVEL 2 +#if defined (_WIN32) +#define nfs_stat __stat64 +#else +#define nfs_stat stat +#endif + typedef struct NFSClient { struct nfs_context *context; struct nfsfh *fh; @@ -58,7 +66,7 @@ typedef struct NFSClient { bool has_zero_init; AioContext *aio_context; QemuMutex mutex; - blkcnt_t st_blocks; + int64_t st_size; bool cache_used; NFSServer *server; char *path; @@ -70,7 +78,7 @@ typedef struct NFSRPC { int ret; int complete; QEMUIOVector *iov; - struct stat *st; + struct nfs_stat *st; Coroutine *co; NFSClient *client; } NFSRPC; @@ -419,7 +427,7 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, int flags, int open_flags, Error **errp) { int64_t ret = -EINVAL; - struct stat st; + struct nfs_stat st; char *file = NULL, *strp = NULL; qemu_mutex_init(&client->mutex); @@ -545,7 +553,7 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, } ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); - client->st_blocks = st.st_blocks; + client->st_size = st.st_size; client->has_zero_init = S_ISREG(st.st_mode); *strp = '/'; goto out; @@ -729,11 +737,11 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) { NFSClient *client = bs->opaque; NFSRPC task = {0}; - struct stat st; + struct nfs_stat st; if (bdrv_is_read_only(bs) && !(bs->open_flags & BDRV_O_NOCACHE)) { - return client->st_blocks * 512; + return client->st_size; } task.bs = bs; @@ -746,7 +754,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) nfs_set_events(client); BDRV_POLL_WHILE(bs, !task.complete); - return (task.ret < 0 ? task.ret : st.st_blocks * 512); + return (task.ret < 0 ? task.ret : st.st_size); } static int coroutine_fn @@ -778,7 +786,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, BlockReopenQueue *queue, Error **errp) { NFSClient *client = state->bs->opaque; - struct stat st; + struct nfs_stat st; int ret = 0; if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { @@ -800,7 +808,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, nfs_get_error(client->context)); return ret; } - client->st_blocks = st.st_blocks; + client->st_size = st.st_size; } return 0; From patchwork Sat Sep 5 06:23:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 274448 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 957F3C433E2 for ; Sat, 5 Sep 2020 06:25:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A0DB208DB for ; Sat, 5 Sep 2020 06:25:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZQYU85b0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A0DB208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERdc-0008V5-6o for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:25:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcI-0006ib-6A; Sat, 05 Sep 2020 02:24:02 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:43666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcG-0003W4-HO; Sat, 05 Sep 2020 02:24:01 -0400 Received: by mail-pl1-x631.google.com with SMTP id y6so2113390plk.10; Fri, 04 Sep 2020 23:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=++1aA2Xl9ysD8wDWmIeGZJ6wyUNL9z15K1e2nNVJtLE=; b=ZQYU85b0F+JvYt5zVicobgeS9DA14vfNMjkdPD/J3pGVLfg8qO17N+50PEyYrXGP4Q 40QEQyvO9JHvjSXsPMoG90PVMkOSqphpJt1nu5RmpZGn9hegijfmT8diwoViwc1+B9G/ 1jMtyA8Jzqpu3msY+rYF7IuKIhL4URISx4dbJ7b9GnS/9X5nxCh7mSPTlYqTZaivCZrV EQHRsM4UOGGxPWqWDBQoWTginH3C9pVHHJIR09XdmbULFRMI7Fgb4V8GaiWW5fyiFEL+ PBx5HsZD2pqMj1jJIFk5dS4Tq7UV45Akq0BHAoapKPEqiFgU8yIKd4vndLzUKJIrhtdq 6NgQ== 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=++1aA2Xl9ysD8wDWmIeGZJ6wyUNL9z15K1e2nNVJtLE=; b=N6zYi49EYz+uOwyyJMDA2Xd9+r2M1zPbE4KS9U0baYRunWQLj8kle5+h/tSN9M1eBE F1+KEYgzx85iSGmd8qZpDl18DGYJf9OVEbqwkJRtOFp0CnZmDUiR0BLRU0IedRxdwh5G wwdMdDSVDK5dl0p0ROHAkMjFRgbY2m+/LI9s3oc5WWAU9uYiGn1tjCly0kL5iI8XPWjt 97UjjnFJKzPQqpFNF+ZzFD+I1dkehJgax3QmwbqIoshI1C9y+rZZ9YgAblSN31jRoa8K U6DzqZV8pfvJCk/wtQsI5V4ocYeIzSXQR5moczW/GEV2k8cftk16eMd8T4gT0jnt23qh ksCg== X-Gm-Message-State: AOAM530xEum+OoeAzjTU55eM3QhmBVnSGmnT12jUUAzF2FlHPaXjf4SA qQCN3kJOzvfj9M8/2/shmf4noTguayeY6D+v X-Google-Smtp-Source: ABdhPJx4yAXVmMPCeKS94k6r+BdnG4Ny1bMvzSZ3TrPcMCNZPAenCcdkfFF8nsCga2Pk+wlq8C+m8w== X-Received: by 2002:a17:90a:e207:: with SMTP id a7mr3923491pjz.117.1599287038443; Fri, 04 Sep 2020 23:23:58 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:23:57 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 03/11] ci: fixes msys2 build by upgrading capstone to 4.0.2 Date: Sat, 5 Sep 2020 14:23:25 +0800 Message-Id: <20200905062333.1087-4-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x631.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- capstone | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/capstone b/capstone index 22ead3e0bf..1d23053284 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit 1d230532840a37ac032c6ab80128238fc930c6c1 diff --git a/configure b/configure index 5d8bf4d8bb..f8cbd2898c 100755 --- a/configure +++ b/configure @@ -5117,7 +5117,7 @@ case "$capstone" in LIBCAPSTONE=libcapstone.a fi capstone_libs="-Lcapstone -lcapstone" - capstone_cflags="-I${source_path}/capstone/include" + capstone_cflags="-I${source_path}/capstone/include -I${source_path}/capstone/include/capstone" ;; system) From patchwork Sat Sep 5 06:23:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC089C433E2 for ; Sat, 5 Sep 2020 06:25:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 63CBA208DB for ; Sat, 5 Sep 2020 06:25:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nHz+mKQS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63CBA208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERdi-0000I5-Hu for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:25:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcL-0006qL-8d; Sat, 05 Sep 2020 02:24:05 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:33013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcJ-0003Wi-BB; Sat, 05 Sep 2020 02:24:04 -0400 Received: by mail-pf1-x442.google.com with SMTP id c196so300398pfc.0; Fri, 04 Sep 2020 23:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=K1kiquLcp3jZlvGJbkVDS6+TjJzTJus3sZYsM0LRxls=; b=nHz+mKQSoBUCF2snijWK9lMursS8pXhE/2n3ov3+R0cjVE+StoxLM2+8LGU22JK3J9 fyAujJ43eTE6+0iPoX2Ew24EC6nIvXoJKk5a/++zooK/F0s/wNPWf1Nz/jc22tR+IbmA hfQDIhL7ASz+xbEvdQNo9rFMXhUpxCOkZNa3aAm3/yvzBhC/JnjMUuXkpgZarCaYYJpq fl2k4XFISupUTWy0y7fUsuxFZEsqAKW3hzxatxHKRiJyZ/AvzCOLYkPYBg5SFiPaO8bg i9s3q45O7kMCL7T9FuHv8oBE5HX5uYJJBEWIzC/CE0dzYL4OyE004G45sWvxRDn2LIBh EBnA== 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=K1kiquLcp3jZlvGJbkVDS6+TjJzTJus3sZYsM0LRxls=; b=trnbJfgtgA5ThLJUZDC9d1btGhH+qzywhCj1PmHoW/toPWkvfcMZpkEHVkwWdN6TcE oZp4Y3QdBtKKsOGf6gS+CZ9wpxtPWfsB448p2eu0HpMuUsEr3lYiU2zWIzjkZGHuQZHj oIhOEOb4L6QV3+wtKpJFjShQEZY6vIWK2gluXPE8nosNKjxbwGHl5w1zbo59aPAIYKck nsPkfzrkxVnWY3leyt4fAy3MCG4N8sOnYITdPFEHcCvZJwPQjqIpw/3Iw/CfnrxKuqqH bPleEKDNGChavh7sZM1BDOBJ1me4JHjDACz783uLujWXKtRlEyjH+77U1SBY0dc3Nxxt dVHg== X-Gm-Message-State: AOAM531fokdxkQaaKZNKJOqtKP7SZIV5NjW7c1ngbPRDZ0RRZILQ6J9S IiiLp9KXHoyn9la5XN1iSjE2StvHqhDs/CNT X-Google-Smtp-Source: ABdhPJzxOLcuOJx5Q1Vh+bFJSRvcJWt/t8RmONjvdtVHj6sJIGQiBUC2AeME32K8irdwozEBE1HoEQ== X-Received: by 2002:a62:1989:0:b029:138:932a:8869 with SMTP id 131-20020a6219890000b0290138932a8869mr10429771pfz.1.1599287041280; Fri, 04 Sep 2020 23:24:01 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:00 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 04/11] meson: upgrade meson for execute custom ninjatool under msys2 properly Date: Sat, 5 Sep 2020 14:23:26 +0800 Message-Id: <20200905062333.1087-5-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::442; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The ninja options now have no need anymore. Signed-off-by: Yonggang Luo --- meson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson b/meson index 68ed748f84..492afe50a4 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 68ed748f84f14c2d4e62dcbd123816e5898eb04c +Subproject commit 492afe50a439d70df99d6e3e59572aff55e14c6b From patchwork Sat Sep 5 06:23:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306118 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2448C43461 for ; Sat, 5 Sep 2020 06:29:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 413F120FC3 for ; Sat, 5 Sep 2020 06:29:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D+rgPHD5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 413F120FC3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERh5-0006IM-CW for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:28:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcO-00070H-GA; Sat, 05 Sep 2020 02:24:08 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:43021) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcM-0003XO-GJ; Sat, 05 Sep 2020 02:24:08 -0400 Received: by mail-pf1-x443.google.com with SMTP id f18so5764355pfa.10; Fri, 04 Sep 2020 23:24:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JKpIfWL/hMusaXWduI57Hsr7ijHQZtG8tbpSkLPslEQ=; b=D+rgPHD5TVTR4LqkIHYGc+eTNCQTfRelfpH/I9hmvJN0FxEuLjLvHj099wRw/dYtQS yXJTlzHxnQBjrkF1SjtVUGmps7QpqOf7uOmZnyYnxU03k1VsDeTTGpuL4JVbW8SoR0Bf gHpJg4aTYW4Az4NFhoOb3MPGzFMhnOo1KYMAUjNWW+azV3WkkRcoaV2G9epaqYBw1Cfj 9KWDI43AKc4i/zgc7BzJ6IXJ5n+fw0HEHA0bo/5n+ZB0vuOkNxWN9UCje/I/NMLbtWQg WqllgWfRclW35IsFZjvII1OFxEsuqv2tmN9zZts0MEqihdt4kAtYCAPGdPBiMZhZTJIR fmAg== 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=JKpIfWL/hMusaXWduI57Hsr7ijHQZtG8tbpSkLPslEQ=; b=Ua8tNxl8SXLEoFeTTVOVRedm5vusj3Do8CeLS40udGU/e9aMXlsSXbF7zj92Eh6M9R Cz0939qH703slz4M1hL/k/+SkevtvO/f2u3IGtRkaW2tWrj7vSA9loNX4AuHiBeHu1fo u/5OmgrD/5mn/rakNKmKcXWWa9/xyrdwrvnrGqt8ne88gOJEGRc7E8lE5nPXUa84ZB/O swCo6JUJRJaO4zFNsNgDYK5AepsNy7A+jZV9ZpgR+FS4WfKLWgGgNRe73ukphdhrVB2r 1kIrlcHXMWdezMcJdM/FJZ0L8i7bEQZJgKnekMNPvXoIkVl+YiYypW7K9xSxCwUFVrjr xexw== X-Gm-Message-State: AOAM531ptYtEqy/vZpNgGjT9RqDGI9UoCZCrHw8phtUYtIDYrXQdClBs Bs3BzucBoEKHB4czpXKomsvaa69NAGRyOCr0 X-Google-Smtp-Source: ABdhPJzeRiyTtRLW7AwRuo2D4/lcN6IgiTUnCOE+1UxHFTFvpPdG6R11gf1b9ZJ5gzLu6Mnw854LrQ== X-Received: by 2002:a05:6a00:22c9:: with SMTP id f9mr12347361pfj.212.1599287044198; Fri, 04 Sep 2020 23:24:04 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:03 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 05/11] ci: Enable msys2 ci in cirrus Date: Sat, 5 Sep 2020 14:23:27 +0800 Message-Id: <20200905062333.1087-6-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Install msys2 in a proper way refer to https://github.com/cirruslabs/cirrus-ci-docs/issues/699 The https://wiki.qemu.org/Hosts/W32#Native_builds_with_MSYS2 need to be updated. There is no need of --cross-prefix, open mingw64.exe instead of msys2.exe then we don't need the --cross-prefix, besides we using environment variable settings: MSYS: winsymlinks:nativestrict MSYSTEM: MINGW64 CHERE_INVOKING: 1 to opening mingw64 native shell. We now running tests with make -i check to skip tests errors. Signed-off-by: Yonggang Luo --- .cirrus.yml | 24 +++++++++++++++++++++ scripts/ci/windows/msys2-build.sh | 27 +++++++++++++++++++++++ scripts/ci/windows/msys2-install.sh | 33 +++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 scripts/ci/windows/msys2-build.sh create mode 100644 scripts/ci/windows/msys2-install.sh diff --git a/.cirrus.yml b/.cirrus.yml index 3dd9fcff7f..49335e68c9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -63,3 +63,27 @@ macos_xcode_task: --enable-werror --cc=clang || { cat config.log; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check + +windows_msys2_task: + windows_container: + image: cirrusci/windowsservercore:cmake + os_version: 2019 + cpu: 8 + memory: 8G + env: + MSYS: winsymlinks:nativestrict + MSYSTEM: MINGW64 + CHERE_INVOKING: 1 + printenv_script: + - C:\tools\msys64\usr\bin\bash.exe -lc 'printenv' + install_script: + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm" + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --needed --noconfirm -S bash pacman pacman-mirrors msys2-runtime" + - taskkill /F /IM gpg-agent.exe + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Su" + - C:\tools\msys64\usr\bin\bash.exe -lc "sh scripts/ci/windows/msys2-install.sh" + script: + - C:\tools\msys64\usr\bin\bash.exe -lc "sh scripts/ci/windows/msys2-build.sh" diff --git a/scripts/ci/windows/msys2-build.sh b/scripts/ci/windows/msys2-build.sh new file mode 100644 index 0000000000..532cb847c0 --- /dev/null +++ b/scripts/ci/windows/msys2-build.sh @@ -0,0 +1,27 @@ +mkdir build +cd build +../configure \ +--python=python3 \ +--enable-stack-protector \ +--enable-guest-agent \ +--disable-pie \ +--enable-gnutls --enable-nettle \ +--enable-sdl --enable-sdl-image --enable-gtk --disable-vte --disable-curses --enable-iconv \ +--enable-vnc --enable-vnc-sasl --enable-vnc-jpeg --enable-vnc-png \ +--enable-slirp=git \ +--disable-brlapi --enable-curl \ +--enable-fdt \ +--disable-kvm --enable-hax --enable-whpx \ +--enable-libnfs --enable-libusb --enable-live-block-migration --enable-usb-redir \ +--enable-lzo --enable-snappy --enable-bzip2 --enable-zstd \ +--enable-membarrier --enable-coroutine-pool \ +--enable-libssh --enable-libxml2 \ +--enable-jemalloc --enable-avx2 \ +--enable-replication \ +--enable-tools \ +--enable-bochs --enable-cloop --enable-dmg --enable-qcow1 --enable-vdi --enable-vvfat --enable-qed --enable-parallels \ +--enable-sheepdog \ +--enable-capstone=git + +make -j$NUMBER_OF_PROCESSORS +make -i -j$NUMBER_OF_PROCESSORS check diff --git a/scripts/ci/windows/msys2-install.sh b/scripts/ci/windows/msys2-install.sh new file mode 100644 index 0000000000..6086452399 --- /dev/null +++ b/scripts/ci/windows/msys2-install.sh @@ -0,0 +1,33 @@ +pacman --noconfirm -S --needed \ +base-devel \ +git \ +mingw-w64-x86_64-python \ +mingw-w64-x86_64-python-setuptools \ +mingw-w64-x86_64-toolchain \ +mingw-w64-x86_64-SDL2 \ +mingw-w64-x86_64-SDL2_image \ +mingw-w64-x86_64-gtk3 \ +mingw-w64-x86_64-glib2 \ +mingw-w64-x86_64-ninja \ +mingw-w64-x86_64-make \ +mingw-w64-x86_64-jemalloc \ +mingw-w64-x86_64-lzo2 \ +mingw-w64-x86_64-zstd \ +mingw-w64-x86_64-libjpeg-turbo \ +mingw-w64-x86_64-pixman \ +mingw-w64-x86_64-libgcrypt \ +mingw-w64-x86_64-capstone \ +mingw-w64-x86_64-libpng \ +mingw-w64-x86_64-libssh \ +mingw-w64-x86_64-libxml2 \ +mingw-w64-x86_64-snappy \ +mingw-w64-x86_64-libusb \ +mingw-w64-x86_64-usbredir \ +mingw-w64-x86_64-libtasn1 \ +mingw-w64-x86_64-libnfs \ +mingw-w64-x86_64-nettle \ +mingw-w64-x86_64-cyrus-sasl \ +mingw-w64-x86_64-curl \ +mingw-w64-x86_64-gnutls \ +mingw-w64-x86_64-zstd \ + From patchwork Sat Sep 5 06:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47362C43461 for ; Sat, 5 Sep 2020 06:27:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C414B208DB for ; Sat, 5 Sep 2020 06:27:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AGY3srBk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C414B208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERfl-00042n-Tp for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:27:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcR-00076D-Ft; Sat, 05 Sep 2020 02:24:12 -0400 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]:40465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcP-0003Xd-AA; Sat, 05 Sep 2020 02:24:11 -0400 Received: by mail-pl1-x644.google.com with SMTP id z15so2124982plo.7; Fri, 04 Sep 2020 23:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=S0CdT7EJuAl1EvDXm+oKp2XSA+jKypIYBOFAUPRceZg=; b=AGY3srBkrJ8hAMq30GuKDomzi7MVozMGpAejXJis8rx7KAU2uM6a7XJklnKp21lZfY BnCRsGuGQqdjNZ2ESpJAdjsBYSwWiN3SbrbbhgmAM+ZntfEwHRWSqr7wqO6GFbUsFZKk S9mUqLjvP3/PfVfOYlUTVz/yGOOHBr/FWp2Dp7znmNys3ukt6bjnIk39SheXrrKsDN7e VoYsj98hgx4JzbtG70fqezXqQcH3+PF5MKH5JUNAfHuA1xG676OkMBTbMB+P6/xWdPIq /bJ0feoqOa1aQc5ZGkAjY1GokJ2OllQtIMJgLB7Kv+81h15KUqH3E40oXP5UkOWiB/Qt C+vQ== 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=S0CdT7EJuAl1EvDXm+oKp2XSA+jKypIYBOFAUPRceZg=; b=lbiW//b7Q3TyDBrVPt7N1vuX7y0m/9r0oZgYR7qCIon3RoQ/JLa6Vf32QdBqZ8Vkuh KTOs7eEKXNOW4InEcAqBThAmzD8E369G9PDKaABIzSwxBhCjL5/DaZOoX5bDo+tQjQww cX4hc4rimf5wuaBvmMfq5+C6YHzLl4iL2EEIkyz84XEsQN/W+pDYftEI6+oxFgyVlPNr Ud3ys54MNK53KUB2dbA/6DE5r177DgXT5ug9SLZtGnWPjyhWgvnbN2L2rFI4kphOcBl2 +xCDPHAV2fhKY0aCiDeEwFQ/Hi8o+Z5C+dBnMZGEG4dx8Zyb3B1MdkHadnt9+QEDjxqs OPnA== X-Gm-Message-State: AOAM533W5Ki6+pmp/eGIRKY6EctlWJA176gq53LiOlp4U5R1bOIuyLLU kbbsSNo6Hq9yJ92JIUD7AANpxH+vkBBqq7IC X-Google-Smtp-Source: ABdhPJzj2rJz8oO4+aR3EzrqGR6k8EHpEZI4E/1qOHEKkVWkuQCbG4mxBOTOBHotdvmhQuvzQq1y6A== X-Received: by 2002:a17:90b:4acd:: with SMTP id mh13mr11709545pjb.147.1599287047099; Fri, 04 Sep 2020 23:24:07 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:06 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 06/11] tests: Trying fixes test-replication.c on msys2. Date: Sat, 5 Sep 2020 14:23:28 +0800 Message-Id: <20200905062333.1087-7-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::644; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- tests/test-replication.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/test-replication.c b/tests/test-replication.c index 9ab3666a90..d0e06f8d77 100644 --- a/tests/test-replication.c +++ b/tests/test-replication.c @@ -23,14 +23,18 @@ /* primary */ #define P_ID "primary-id" -static char p_local_disk[] = "/tmp/p_local_disk.XXXXXX"; +#define P_LOCAL_DISK "%s/p_local_disk.XXXXXX" +static char p_local_disk[PATH_MAX]; /* secondary */ #define S_ID "secondary-id" #define S_LOCAL_DISK_ID "secondary-local-disk-id" -static char s_local_disk[] = "/tmp/s_local_disk.XXXXXX"; -static char s_active_disk[] = "/tmp/s_active_disk.XXXXXX"; -static char s_hidden_disk[] = "/tmp/s_hidden_disk.XXXXXX"; +#define S_LOCAL_DISK "%s/s_local_disk.XXXXXX" +static char s_local_disk[PATH_MAX]; +#define S_ACTIVE_DISK "%s/s_active_disk.XXXXXX" +static char s_active_disk[PATH_MAX]; +#define S_HIDDEN_DISK "%s/s_hidden_disk.XXXXXX" +static char s_hidden_disk[PATH_MAX]; /* FIXME: steal from blockdev.c */ QemuOptsList qemu_drive_opts = { @@ -571,7 +575,12 @@ static void setup_sigabrt_handler(void) int main(int argc, char **argv) { int ret; + const char *tmpdir = g_get_tmp_dir(); qemu_init_main_loop(&error_fatal); + sprintf(p_local_disk, P_LOCAL_DISK, tmpdir); + sprintf(s_local_disk, S_LOCAL_DISK, tmpdir); + sprintf(s_active_disk, S_ACTIVE_DISK, tmpdir); + sprintf(s_hidden_disk, S_HIDDEN_DISK, tmpdir); bdrv_init(); g_test_init(&argc, &argv, NULL); From patchwork Sat Sep 5 06:23:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 274444 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6ED6C433E2 for ; Sat, 5 Sep 2020 06:32:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51E7220797 for ; Sat, 5 Sep 2020 06:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Tm7nYRFx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51E7220797 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERkk-0000e8-At for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:32:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcU-00077Y-CD; Sat, 05 Sep 2020 02:24:15 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:43903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcS-0003Xt-Iv; Sat, 05 Sep 2020 02:24:14 -0400 Received: by mail-pg1-x543.google.com with SMTP id d19so5401705pgl.10; Fri, 04 Sep 2020 23:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ptTGH2qI85N+szgczRA8YGLjVKH01noRoeLoG/lJ5SE=; b=Tm7nYRFxnPJsDqIyA9OeScujNzxou/2ZoWhYCAGM7dEcXSp6WAk/M0VFrSlWTTWVB6 JjIHK3M3xmXfHD6tsiRsi4YeBKb+uIkvPAkoSYlpWLr5mgIBgcGvP6G686lACLUv18Fr V5yZbRy+bL5Sc0ZQyGKmrXvPCbO0CY7m6X3QI8AoMBMmE49Nbzh0eveMfltlYBkG1gmK d4jlWE0o4ClA2ppBN4ioaPw6xMibfl0XMR0w84+rtlhOZkWQPuEAanvpacmS3dw/LmVD t4pirq39PXENI7t2ouhOGLlhpY+TmyaSMMWn/62FCL63/nu+FLr1CIWM4jNP4wdIt08c 6L+A== 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=ptTGH2qI85N+szgczRA8YGLjVKH01noRoeLoG/lJ5SE=; b=VDLJ156dy/rz72+Xkttppe5wODovy6jWUFygDpbVyPYI7TbncaPdnvnUIenkPOaVBY Rx+11cXWA2VBhGwvJ/p+QvBDu4JXFEnstCJQzM4gedh7P8GbYTjXoaj1own13vlRcnis WnN63nfguC+WUKz8SvP4j2RmnAfzg68w36gXNb9j7VtxIZ4Q9w9/Z2nJSwI/wY4VYjJP /K2Rr+boXufH70QUVtmjAjJLTe2jVX4Vvd0Ep2oRBE9dgjhXadm4RwjKJ78MfgOERTox QuHmFEeqIneyx4eOai+9sN1603uHE0KjC+HW1rxqPvnrcFrU47YUyYLSyYSYG6Y/PAdN Wi2g== X-Gm-Message-State: AOAM530rqHK3Qkz03cZLCzR/byIK0+yhoNWOMBeSyiuu2mg6UFe6EhsU c0g4yJBvXBNAVWwbu5ThzKEBsGpCXx4RSwoM X-Google-Smtp-Source: ABdhPJz2IcaSrrolwIbbd0a0f2NPNAGN527a9mYy7zoxiKtNJ6Xjw+Mn1gWkl41DoLHeSSQPKLEpEQ== X-Received: by 2002:a65:6a0f:: with SMTP id m15mr464718pgu.93.1599287050039; Fri, 04 Sep 2020 23:24:10 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:09 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 07/11] block: get file-win32.c handle locking option consistence with file-posix.c Date: Sat, 5 Sep 2020 14:23:29 +0800 Message-Id: <20200905062333.1087-8-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::543; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- block/file-win32.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/block/file-win32.c b/block/file-win32.c index ab69bd811a..14e5f5c3b5 100644 --- a/block/file-win32.c +++ b/block/file-win32.c @@ -299,6 +299,11 @@ static QemuOptsList raw_runtime_opts = { .type = QEMU_OPT_STRING, .help = "host AIO implementation (threads, native)", }, + { + .name = "locking", + .type = QEMU_OPT_STRING, + .help = "file locking mode (on/off/auto, default: auto)", + }, { /* end of list */ } }, }; @@ -334,6 +339,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, const char *filename; bool use_aio; int ret; + OnOffAuto locking; s->type = FTYPE_FILE; @@ -342,11 +348,24 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, ret = -EINVAL; goto fail; } - - if (qdict_get_try_bool(options, "locking", false)) { + locking = qapi_enum_parse(&OnOffAuto_lookup, + qemu_opt_get(opts, "locking"), + ON_OFF_AUTO_AUTO, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret = -EINVAL; + goto fail; + } + switch (locking) { + case ON_OFF_AUTO_ON: error_setg(errp, "locking=on is not supported on Windows"); ret = -EINVAL; goto fail; + case ON_OFF_AUTO_OFF: + case ON_OFF_AUTO_AUTO: + break; + default: + g_assert_not_reached(); } filename = qemu_opt_get(opts, "filename"); From patchwork Sat Sep 5 06:23:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 274446 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86A1EC43461 for ; Sat, 5 Sep 2020 06:27:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 23441208DB for ; Sat, 5 Sep 2020 06:27:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KpYLphlu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23441208DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERg2-0004em-AU for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:27:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcX-0007Au-Sk; Sat, 05 Sep 2020 02:24:17 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:39195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcV-0003YB-JG; Sat, 05 Sep 2020 02:24:17 -0400 Received: by mail-pl1-x643.google.com with SMTP id x18so2126637pll.6; Fri, 04 Sep 2020 23:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XFEZh3+xvAfqz2f0h/nVnmxCipA8eA9k8U4UHOk894U=; b=KpYLphlucvzJhRb09Aq11w7D+uhL+xrFv0qXRROlO5AjZILWVqtv3jXXsOCRT/Q6sb vlLWsT1JHSxgT6RbO/0986GgRPZM+kbzfRd4PONkz70ZU3TIqISDU2VoRc4g2WQmTRek j4YqEM39pCj0jdaU6dU52SMFvguP9UDdBb/0wWZId4XNnUJuisoo++edEsseUFLBOOp4 aWVwQyRVVwUNkmHm8fkJYh8N9c/LCmEHBa5Gh6NyYrFQOWF8vijjSZR1SdmI5fBPhLp1 5AUpbhEIa5FuixwfMfOefC1r92gNNchvr5NpmT/Pvebgt/fyzDI32umS0SJIb4NGNTN4 /pFA== 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=XFEZh3+xvAfqz2f0h/nVnmxCipA8eA9k8U4UHOk894U=; b=F9Lwe70JhwFKktCiLbQ512htBu5Fx6+3hIOyPEyX4vCrN4dxm96RtCdr2arWRob3mD vbDjO6R8hePxvih2mgUvu+oCjJKCZZAJexP5mVcQX7HafScYOiIGJAP+ODl03RFU31sK MfIGOVYvZm6U104H8g7NibJ6JwYJ3Ihxy1hH2QGfcXCL6TlrYkYEDveuvOoyv+PVSHlX MFwQXB1hXCButBz9cF3rHqwq7ZOPumUTIuDUdAROuhiUgCtruZdst+6CmSmwi9AA0UXY OLkYT2ULUTSsQz5HF34tknP7zdY9HWXKD9ceXv5E1DR+cVShGKt1jhhLtWQt+uN5yOTU QV+g== X-Gm-Message-State: AOAM5324kthadKZ1mUsEceOeUjpNawMYMEYIGXbfBbsIUetMvLC0Fn8j 4amvLJYRZ0EMYyL/edwTxskLHsNoQop3Wurr X-Google-Smtp-Source: ABdhPJx4HEWl37FH1mRyVREEasvM88+bDyjtTp5Nsf1QqlVPKU4c4s6ejy13JEgM3QMSbfBqaBheeQ== X-Received: by 2002:a17:902:d88e:b029:d0:89f4:6222 with SMTP id b14-20020a170902d88eb02900d089f46222mr10534156plz.10.1599287053050; Fri, 04 Sep 2020 23:24:13 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:12 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 08/11] osdep: These function are only available on Non-Win32 system. Date: Sat, 5 Sep 2020 14:23:30 +0800 Message-Id: <20200905062333.1087-9-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive); int qemu_unlock_fd(int fd, int64_t start, int64_t len); int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive); bool qemu_has_ofd_lock(void); Signed-off-by: Yonggang Luo --- include/qemu/osdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 412962d91a..e80fddd1e8 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -502,11 +502,11 @@ int qemu_close(int fd); int qemu_unlink(const char *name); #ifndef _WIN32 int qemu_dup(int fd); -#endif int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive); int qemu_unlock_fd(int fd, int64_t start, int64_t len); int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive); bool qemu_has_ofd_lock(void); +#endif #if defined(__HAIKU__) && defined(__i386__) #define FMT_pid "%ld" From patchwork Sat Sep 5 06:23:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306116 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D296C43461 for ; Sat, 5 Sep 2020 06:34:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B800520797 for ; Sat, 5 Sep 2020 06:34:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HuONuXGp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B800520797 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERlv-0002Na-Nj for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:33:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERca-0007DR-D0; Sat, 05 Sep 2020 02:24:20 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:36673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcY-0003YR-4Y; Sat, 05 Sep 2020 02:24:19 -0400 Received: by mail-pf1-x42e.google.com with SMTP id m8so5790838pfh.3; Fri, 04 Sep 2020 23:24:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Bq1eYS85B3lVfUWOPYt+//P+vJhXogDV3XY3bX1W5SI=; b=HuONuXGpUAzuMPwrSAueD74wQQy5qHeVO/lPP+88LwzK0pVBVSxlVz8RMRJSc9nb+h PG2Ud3cB+oNtjoFNjIruwZU0ZkMHdwS0a1wBbQ2IZk9zVM0+crRwtVaXdTKyj6m8Hzux EwuQcaxhVadS8KUje58zphiKjUuhQAgzJtFNS099nwh2upG7cf878jxTdwkD8/9L5I/r MC0zFLWvBpUvtyEKX4te5C7/Z322iK7oOdldVWKgWfGKdyUexLU5ycGK67jSQNax45u3 pBqIbdjeuzkGakV/Smqj/bxY1sVasJROE4x8XnZnpy6k0l7MmbFySlHwtSSuIRXP1iV9 Lrmw== 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=Bq1eYS85B3lVfUWOPYt+//P+vJhXogDV3XY3bX1W5SI=; b=EB2Pu1YAKI/fgQRLAqaPYP74f+EJlzKAsrFUMXNV1I4qUHCtHj8ihkHY43P+E5XmIG mYYmZyX1A4VhNF3SBcWAdwJ30P1sVpU3exDdM+hxtBNvT+sTFGLTwA3YtG9syNC6vbC8 tUHyi5MU1OxrHEdLfU2PR+Q1CX8JOJA/hmwrFSowrs/VVAbCDxS11f46UNbwnDvXrP9P 2mljAJRFjEv4DhgQ66WyrZKQPFIFdQZtbXgba7wMybUhUFRlKZZVW0oZDxPFKDN4NodK jj6MeLdB+nJJY0Ncg0aDha6qwLx1piIPfA20aNtKuNCnGxyGCyEthXqi57jTLXqXr4zP irSQ== X-Gm-Message-State: AOAM530WeCTk5dm4KUsLCxqVlOl73Bjm/Qq2EibS4HYVQMeXxvMaiZb+ fmbe16io/ki7go3V6JAHkkFMdvjXBLlpTL27 X-Google-Smtp-Source: ABdhPJykUqv8G5QXcVj/KLG8WPZwAhiVCO95ZimWMbyZkZ7AGnUVrNLBJyiUIAkaP21CGZ0rFnMrIA== X-Received: by 2002:a63:4c:: with SMTP id 73mr10121113pga.286.1599287055936; Fri, 04 Sep 2020 23:24:15 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:15 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 09/11] meson: Fixes qapi tests. Date: Sat, 5 Sep 2020 14:23:31 +0800 Message-Id: <20200905062333.1087-10-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The error are: +@end table + +@end deftypefn + make: *** [Makefile.mtest:63: check-qapi-schema] Error 1 Signed-off-by: Yonggang Luo --- tests/qapi-schema/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index c87d141417..67ba0a5ebd 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -220,6 +220,7 @@ qapi_doc = custom_target('QAPI doc', # "full_path()" needed here to work around # https://github.com/mesonbuild/meson/issues/7585 -test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), qapi_doc[0].full_path()], +test('QAPI doc', diff, args: ['--strip-trailing-cr', + '-u', files('doc-good.texi'), qapi_doc[0].full_path()], depends: qapi_doc, suite: ['qapi-schema', 'qapi-doc']) From patchwork Sat Sep 5 06:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 274445 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7024C433E2 for ; Sat, 5 Sep 2020 06:29:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B93A20FC3 for ; Sat, 5 Sep 2020 06:29:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XoKHfsD5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B93A20FC3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERho-0006ma-EX for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcc-0007Iu-VC; Sat, 05 Sep 2020 02:24:22 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:33392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcb-0003Yi-5q; Sat, 05 Sep 2020 02:24:22 -0400 Received: by mail-pg1-x543.google.com with SMTP id e33so5435900pgm.0; Fri, 04 Sep 2020 23:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/soWbwhyXIQvyhXLT89cpgQV3vO3BDPhxGB8xLxnnps=; b=XoKHfsD5apDeI6vKAScjSIkWVr85sdTufj5elAMdNbFx49e+po5LvYsiXWj1Oa3ChD 1yWqEfQafp8iD7v/UIO1MBg6/3Tl6RrcIDUfvh6Sy5e5yaSEjQ1rO9PTz9bN62LEQHlt Kjnp6uUL8gnUsLitbxqiZO9LiVLKZ73kfc7exA6zDqLLr25dB8nq/9VupxZ0NLoY9UEs 45oh3R0xGoyBlDBWN8R2t8537CGXDQwWWUp3383Phpu77kbrQSp+uonEFkumttcuxzGK CcyUpFk8s+0vDZrWfFdcera96hdxYGCaKvTinK6HfKUmbc+cJJOTQNgrZRptL96PCNmu ey1Q== 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=/soWbwhyXIQvyhXLT89cpgQV3vO3BDPhxGB8xLxnnps=; b=P+6BUVuS8zPFSD96MVsvtap0j52d9CgAIbXAxKxj0rm2EXaPK33QfVGPNAJoLE5/ha npCA3oNruGZr89O/RCopsPTfInq0koL0cc8AmGwvN3uclrwXw4NNwydWUVuXZMJwcr2c cFN1wLVqc+aEdbov/p8+OWRB5AYD6FJIRxl+0yfYxuzIz8LSp+3bachnu7K2qP1CnvrZ 9eh8QsYUelsgztuQ3RwgjUrS+aN95sHmSR3bgsJgTBpQWYZs32N2wnRH6mMWkT5A16p/ SLpKI4qDk+gxaf6mGJpRSNHVjDElRSO078R+ivPHy+ZJNnw5kHZuIyAUEey9bsQiMXW6 zWpQ== X-Gm-Message-State: AOAM530JnAjKu8+/ESM6fS499YjUHDxdqlhLS9zrbcE52ne4zvl1O0oI MXr3835lNiIbO3M/DvL61WrVTMbz6IRZyGJf X-Google-Smtp-Source: ABdhPJyXWItJfDicUN6q5RkHu+5yWQnfCsu18VldMLtTTULt7quJtcpsjFqvSKgCyWCsSl1dvoW24A== X-Received: by 2002:a63:4621:: with SMTP id t33mr10124064pga.32.1599287058907; Fri, 04 Sep 2020 23:24:18 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:18 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 10/11] docker: Add win32/msys2/mingw64 docker Date: Sat, 5 Sep 2020 14:23:32 +0800 Message-Id: <20200905062333.1087-11-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::543; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- tests/docker/dockerfiles/msys2.docker | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tests/docker/dockerfiles/msys2.docker diff --git a/tests/docker/dockerfiles/msys2.docker b/tests/docker/dockerfiles/msys2.docker new file mode 100644 index 0000000000..f898e0803d --- /dev/null +++ b/tests/docker/dockerfiles/msys2.docker @@ -0,0 +1,11 @@ +FROM cirrusci/windowsservercore:cmake +RUN echo | choco install -y --no-progress --ignore-package-exit-codes --params "/NoUpdate /InstallDir:C:\tools\msys64" msys2 +COPY msys2_install.sh C:/tools +RUN C:\tools\msys64\usr\bin\bash.exe -lc "grep -rl 'repo.msys2.org/' /etc/pacman.d/mirrorlist.* | xargs sed -i 's/repo.msys2.org\//mirrors.ustc.edu.cn\/msys2\//g'" +RUN C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sy" +RUN C:\tools\msys64\usr\bin\bash.exe -lc "sh /c/tools/msys2_install.sh" +RUN C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*" + +# docker build --tag lygstate/windowsservercore:msys2 -f "../../../tests/docker/dockerfiles/msys2.docker" . +# docker run -it lygstate/windowsservercore:msys2 cmd +# docker push lygstate/windowsservercore:msys2 From patchwork Sat Sep 5 06:23:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 306117 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A5BCC433E2 for ; Sat, 5 Sep 2020 06:32:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F1FA20797 for ; Sat, 5 Sep 2020 06:32:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="T/MsKliW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F1FA20797 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kERkW-0000D3-Pg for qemu-devel@archiver.kernel.org; Sat, 05 Sep 2020 02:32:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kERcf-0007QS-Pg; Sat, 05 Sep 2020 02:24:25 -0400 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:38388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kERcd-0003Yv-Vi; Sat, 05 Sep 2020 02:24:25 -0400 Received: by mail-pl1-x62d.google.com with SMTP id c3so1863643plz.5; Fri, 04 Sep 2020 23:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wj+Yr1ojVwv967bfAJb6JSFv1AmJxc96MtVHTxvr4+4=; b=T/MsKliWg2sRL4/K6Deq4W7T5vAlFTNji/sRCl2TvVsEj+UK//5bQcUSri+uxh8zPR ZJeTjbODywXw8JZ2JlZQX+tsh8IpHqW4j5I4vSqQaSqecOhsz2azENK0+6xpx7CugHOM B1CsPwig3jk92P/zri8qG/EC3F0RszWg0ymwn5b/Il+PRqu+pkHTb3kxFDh4lIdSZVh+ 7iL30CvyIvcFympD6KHjGx6vZAZf4HAeaCiLJQ7RUm8W13EaW8Gz5YbCqd2Q2NMM+czK /znrARICtMjo0cuWepiGwCRZHNJIWBDq5QZqCgyHTeTf0YgNHFL8B8Cm1ClQBDGjOFyx VDQg== 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=Wj+Yr1ojVwv967bfAJb6JSFv1AmJxc96MtVHTxvr4+4=; b=iVUx7R5yHpOdF5qrXhBxTOuXNbL1gxJUwKvl3cvKwg3pJDqRwWdDs39i2fCFdUaahX /G1QX/y5g6M2TIQZ3RrOM9VDV6Yqt3zRMaATQHn675CbJz8IYuictqEDjyGT0MmcLNvz u1UFKw0pOKPePJCiWj+gwXNjO+SsAA2gkaNWoEfBXq4waEWSm9qYNq/enNXkbVybtOAs 7LeM3gpzwbcM62R9XmBIL5dvxiUmuRnpS8u1UPohCqawqyLQGBQ3jXQJ6nkegvETPfPR 2Pg6MzdZCB0uBjdrMbzyoz164jzF3efEFWHFRPJDlyCqDC5c/9r+t8xhifpfpNohC8Ib 5u4A== X-Gm-Message-State: AOAM530rF+X1aPfT0bmluOi8xslaLEu9z1q3Vc5EL7esEmDeTEGB40YT qer4Imnad3QzpXTXLFkvG3nFHrxhq6Y8i4ug X-Google-Smtp-Source: ABdhPJwNLzba9j1GjbOsJw39l8dvPJFWSIl/NRowNmSCuaS5aszefhK/m72BJMwaCrsgpQYohocusA== X-Received: by 2002:a17:90b:108e:: with SMTP id gj14mr11690122pjb.225.1599287061802; Fri, 04 Sep 2020 23:24:21 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id v8sm21436381pju.1.2020.09.04.23.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 23:24:21 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v5 11/11] ci: Enable Github actions. Date: Sat, 5 Sep 2020 14:23:33 +0800 Message-Id: <20200905062333.1087-12-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200905062333.1087-1-luoyonggang@gmail.com> References: <20200905062333.1087-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=luoyonggang@gmail.com; helo=mail-pl1-x62d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , QEMU Block , Stefan Weil , Peter Lieven , Yonggang Luo , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo --- .github/workflows/main.yml | 31 +++++++++++++++++++++++++++ scripts/ci/windows/msys2-download.bat | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 .github/workflows/main.yml create mode 100644 scripts/ci/windows/msys2-download.bat diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..758bbf6641 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,31 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the action will run. Triggers the workflow on push or pull request +# events but only for the master branch +on: + push: + branches: [ master, msys2 ] + pull_request: + branches: [ master ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + msys2-build: + name: C++ msys2 (Windows) + runs-on: windows-latest + strategy: + fail-fast: false + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - name: Install MSYS2 + run: scripts/ci/windows/msys2-download + - name: Build + env: + MSYS: winsymlinks:nativestrict + MSYSTEM: MINGW64 + CHERE_INVOKING: 1 + run: C:\tools\msys64\usr\bin\bash.exe -lc "sh scripts/ci/windows/msys2-build.sh" + diff --git a/scripts/ci/windows/msys2-download.bat b/scripts/ci/windows/msys2-download.bat new file mode 100644 index 0000000000..2c7c41899e --- /dev/null +++ b/scripts/ci/windows/msys2-download.bat @@ -0,0 +1,4 @@ +mkdir C:\tools +cd /d C:\tools +curl -LJ -s https://github.com/lygstate/qemu/releases/download/v5.1.0/msys64-v5.1.0.7z --output msys64.7z +7z -mmt8 x msys64.7z