From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472716; cv=none; d=zohomail.com; s=zohoarc; b=I15rT7INnDVTxEa95NOt49PZUuq0pNiI/HJfro9mVLabulJUUiipiOJmweWq+H/Ze/6ihrv8luJkNQ0qleuGWHVW3q25QYEkTgNBp/H4vN1jwIyJ1W7UaoTM1H6uPgpW7rs5vVgBE+lLRCdMvIU2+U7nhMT6wuzqd024AKzrCCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472716; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wVXYg+2R3sIE2qWqVeW5gb+1ADs6d2UuCntMLONV+OQ=; b=SzxBKCyWl4J7urguTABuMK7zQyvVenGOhYhRSWtENf1vT42Gm7z+ZyjSSkQ3HW7i40529aqlNdf2DioxlRp27r79CQXmcAL+bE7bNqhCd+y8tBA3c38rryZ0d6/h2/xWLYjFkWcp3cHN/KXt5bAW/opOJUVKlcnSnaEnp6DxPUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610472716657624.7077415554809; Tue, 12 Jan 2021 09:31:56 -0800 (PST) Received: from localhost ([::1]:58924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNWM-000644-HM for importer@patchew.org; Tue, 12 Jan 2021 12:31:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNFy-0003Y6-GM for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:00 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:39050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFw-0004qE-Ad for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:14:57 -0500 Received: by mail-ej1-x630.google.com with SMTP id n26so4579969eju.6 for ; Tue, 12 Jan 2021 09:14:54 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wVXYg+2R3sIE2qWqVeW5gb+1ADs6d2UuCntMLONV+OQ=; b=SHQcnkM5UGwjnWHmN2SW0gDKN19od/mWagFh+KXkjt7JH6xBUcZFuX/9mML5eU+7bS 9ZNeg9QXxlDohWNOKQVLsuE+u12+01qGDS6qhv9lv+2UJy8OQAXJbhUUk5Y7JddAX66y I/owzbg7P9BZhQMEyRt+MfxC0OmrygcvlNDUAvuWES9W1yL0ptXAXc3uEiwUaGawc1NM P90E+gYhYRjLr4LUwGM+me7Ol3TvU7DgZTuUZB1kj1pU25E6JvSO44kqaFCLb2O7VIxP aJydgH1lh4wwF0oe4moF3Kd4IJLK8IYqTYRyWFUBkF6k/5rBFZXOPx+riJrS7lJgIi+D eIlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wVXYg+2R3sIE2qWqVeW5gb+1ADs6d2UuCntMLONV+OQ=; b=uBbZ5ffRWWAPxtuMNu2hg13Cu32qta59Sj/JdlgRTy818cPKuboXNQWV/pYbCQXfH8 L0Rn6n75gIQyZbx0Mb2v8mGrVGxSQwMXj9hzj1eIKn4aM2Je+UDCXBRhIiTSVWVOcCne KLNRi3AklymzwDRgk2e5A630unlMyqfuyoUPBcGCINyTSYpbdfl19VTIow3gATwDVw4T mFfgjLQB26afDLNc2QNLkQQXVSoN42w+bGGVdC+BWgVRovuYnybUfV6n3bwwVzSyb+u5 ixKv2G+HyNjrEs/+T07WwnJQeBZH7KQ1l6NGZqOpeE8sV0+oG8jdfAfv+5Ft7wTjN5MA l7Tg== X-Gm-Message-State: AOAM5304VEd8qTjWDB7rpvdOvwA8ANTzyCxfFVvvuVWNgwN2jnuVha73 5FlA2n67CoP1C70SgfjhqIz+i78yCnMmcA== X-Google-Smtp-Source: ABdhPJw630uLwKfsH98FxTFxqlsdk/ULGvDCuVAArsUatfl2zamWvAnIdjYACReGlJnIumcpDYM9aQ== X-Received: by 2002:a17:906:495b:: with SMTP id f27mr3922843ejt.338.1610471693414; Tue, 12 Jan 2021 09:14:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/20] meson: do not use CONFIG_VIRTFS Date: Tue, 12 Jan 2021 18:14:31 +0100 Message-Id: <20210112171450.791427-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" CONFIG_VIRTFS is not anymore part of the config_host dictionary. Signed-off-by: Paolo Bonzini --- fsdev/meson.build | 2 +- tests/qtest/meson.build | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fsdev/meson.build b/fsdev/meson.build index 7dd1cc9bfb..65455a179e 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -8,7 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( ), if_false: files('qemu-fsdev-dummy.c')) softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) =20 -have_virtfs_proxy_helper =3D have_tools and libattr.found() and libcap_ng.= found() and 'CONFIG_VIRTFS' in config_host +have_virtfs_proxy_helper =3D have_tools and libattr.found() and libcap_ng.= found() and have_virtfs if have_virtfs_proxy_helper executable('virtfs-proxy-helper', files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marsha= l.c'), diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 6a67c538be..6ec09821d7 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -199,7 +199,9 @@ qos_test_ss.add( 'virtio-serial-test.c', 'vmxnet3-test.c', ) -qos_test_ss.add(when: 'CONFIG_VIRTFS', if_true: files('virtio-9p-test.c')) +if have_virtfs + qos_test_ss.add(files('virtio-9p-test.c')) +endif qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-test= .c')) =20 tpmemu_files =3D ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c'] --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473910; cv=none; d=zohomail.com; s=zohoarc; b=Ju/Kxd69UZINdCpoSHLHtJby7CtQPAeLBZUBrzIadlYkcJQSFMLIpJsPcUB/DXUt4NFgaqQV5/MlTiFbSB6+EIri1ppBhKi+ggjc2sgCkkjqW4l2xCJKqJrdnoGto2DF35DEPafHP46MwAZq5lHi0I/+sOEmYgHdFBHIaNCA4no= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473910; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D0xY+ZzdNwor+r1grB3Tnj6lQncEfhqc2CyqMbCdFlc=; b=WmFR/s20dcdHgUwpyi7PPVCSfi3EhSCkxgajDshK4igmf7CELBqOMG6TOrcU+yAA3uE2+/fUT/RgBpIb2VD5RCvIlzhCaTEpi/PxksDLKAuQt9jsxsmvAflSkwzerSQDwffkyohlkQ0rzUCkRSGMceoIgTh1wkFwkZONNXstfNo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473910269566.3394874681314; Tue, 12 Jan 2021 09:51:50 -0800 (PST) Received: from localhost ([::1]:54850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNpd-0003X9-6K for importer@patchew.org; Tue, 12 Jan 2021 12:51:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNFy-0003Xw-G6 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:00 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:36580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFw-0004qL-B0 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:14:57 -0500 Received: by mail-ej1-x62e.google.com with SMTP id lt17so4622327ejb.3 for ; Tue, 12 Jan 2021 09:14:55 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D0xY+ZzdNwor+r1grB3Tnj6lQncEfhqc2CyqMbCdFlc=; b=iHvB1JU0fPf9XB9XxUdjQFH1SAl4t8xY7BDHz1kx/ZZWc0qqGhd1MSgQT3YGNL7cSd iyknhoSbQj9obplTl8SGDmf0984ODkvxSgRQ3405cuAgTUk9TcfzZOlP9x+foUSnZ7lu 7SoGidLsowb5kwTeDk+Jk+Vnj7r2I7l+MVDqLOUuXURhCdKbHa8LVnHyGo7nxUDjWbZ8 VfLwZYgnJ27IYQ4mFKYoOcbHPOCQHJFgqp7XVVm9kkyabOhRCwq4rvM768s12KopF9Yb uaXUvkOHnwTI9HRer/5zt0p7Q+PO9wSFik0gpVWfelESOnSt8aiBtLoQ9FRpvcAp/SfZ pHag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D0xY+ZzdNwor+r1grB3Tnj6lQncEfhqc2CyqMbCdFlc=; b=gYbmco7qAhlZghiYMpew6h9UKCu5svual6KuySoWNXCVTlSx6+vADnpOcwYCwfnc2n E75xwQXZJu4NnDTwiY49Jz7A2YACL3WcZUYGjCQiev/fW/yzK2j/su7QX4p+c5XrjS8b PkqkhbJRCmusi7SeuJ0+LqLpIu4HZG3XMMNEootLc10pVwwzYfVdrr634pNzLVkr/W0h IdLGJLvLL3tFZg3mYAS5sQPVMieCdZrZf6ckbExWokphlxS87R6a1XN3XPAt9n8dVw3B 4JY3gRR3Ju70xxafpnb1Kg1HzdfP4LipP4NeGa/Ngz0Qn5sV3qF1wn8LpIldrt16sMBN t8KQ== X-Gm-Message-State: AOAM530Eymrz8Z22/P4M4c3bYJOWJqMnBEnxrTmyanfny6jApbpFbN0g dUGW1grq1aVtEed8t1hcKweSDIfd+9HBWg== X-Google-Smtp-Source: ABdhPJysRwZCVuDealOfBygMzGhXknyj5mBRU0FDhfI6e/RlYvkiRde4/HZljanQM8Y4IMMRIux8WA== X-Received: by 2002:a17:906:351a:: with SMTP id r26mr3751934eja.204.1610471694246; Tue, 12 Jan 2021 09:14:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/20] whpx: rename whp-dispatch to whpx-internal.h Date: Tue, 12 Jan 2021 18:14:32 +0100 Message-Id: <20210112171450.791427-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Rename the file in preparation for moving more implementation-internal definitions to it. The build is still broken though. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20201219090637.1700900-2-pbonzini@redhat.com> --- target/i386/whpx/whpx-all.c | 5 +---- target/i386/whpx/whpx-apic.c | 2 +- target/i386/whpx/whpx-cpus.c | 4 +--- target/i386/whpx/{whp-dispatch.h =3D> whpx-internal.h} | 6 +++--- 4 files changed, 6 insertions(+), 11 deletions(-) rename target/i386/whpx/{whp-dispatch.h =3D> whpx-internal.h} (98%) diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 3b824fc9d7..12f79e2cd6 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -26,13 +26,10 @@ #include "qapi/qapi-types-common.h" #include "qapi/qapi-visit-common.h" #include "migration/blocker.h" -#include "whp-dispatch.h" #include =20 #include "whpx-cpus.h" - -#include -#include +#include "whpx-internal.h" =20 #define HYPERV_APIC_BUS_FREQUENCY (200000000ULL) =20 diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index b127a3cb8a..1d330bf749 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -18,7 +18,7 @@ #include "hw/pci/msi.h" #include "sysemu/hw_accel.h" #include "sysemu/whpx.h" -#include "whp-dispatch.h" +#include "whpx-internal.h" =20 static void whpx_put_apic_state(APICCommonState *s, struct whpx_lapic_state *kapic) diff --git a/target/i386/whpx/whpx-cpus.c b/target/i386/whpx/whpx-cpus.c index d9bd5a2d36..f7e69881a3 100644 --- a/target/i386/whpx/whpx-cpus.c +++ b/target/i386/whpx/whpx-cpus.c @@ -15,11 +15,9 @@ #include "qemu/guest-random.h" =20 #include "sysemu/whpx.h" +#include "whpx-internal.h" #include "whpx-cpus.h" =20 -#include -#include - static void *whpx_cpu_thread_fn(void *arg) { CPUState *cpu =3D arg; diff --git a/target/i386/whpx/whp-dispatch.h b/target/i386/whpx/whpx-intern= al.h similarity index 98% rename from target/i386/whpx/whp-dispatch.h rename to target/i386/whpx/whpx-internal.h index cef5d848bd..e0a9ea1dce 100644 --- a/target/i386/whpx/whp-dispatch.h +++ b/target/i386/whpx/whpx-internal.h @@ -1,5 +1,5 @@ -#ifndef WHP_DISPATCH_H -#define WHP_DISPATCH_H +#ifndef WHP_INTERNAL_H +#define WHP_INTERNAL_H =20 #include #include @@ -72,4 +72,4 @@ typedef enum WHPFunctionList { WINHV_PLATFORM_FNS_SUPPLEMENTAL } WHPFunctionList; =20 -#endif /* WHP_DISPATCH_H */ +#endif /* WHP_INTERNAL_H */ --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472930; cv=none; d=zohomail.com; s=zohoarc; b=Htz5E0i+Vd3+NZadm91v4Nw22Ne3xViQ8+TbMsliu5vg9iiOyMxTU42inX572Z03YFTS5thhwlKIrwfDMpKSFk/aL8bVsqdQqRSLrk1lgHXLAftCJBnW/vZFM15XhaQ7dZofE995HUmdDQ7aRWT2Z8hdT9Ywl8Jyb86XHUYMfKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472930; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y2D++BW35zFmYTheLMBecjwElXG7eVrAjCSmYiIui/g=; b=Vj811jnWQP2aMYjY2xyda+xKo7lBcM+BAQ2W5xRzm2GYbTjtmvlDgH9O360tXJQtaN4/F2CrSDMOui/2mfkJ6MU7NpZj2ePhmsJpnKfQdqVywfwq1amTeJhdzXuBfYPXBNs9mMWGn102/8HYYZGIONRdNcTJCHimQOxkJsbU9yU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16104729301799.52487673970063; Tue, 12 Jan 2021 09:35:30 -0800 (PST) Received: from localhost ([::1]:39152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNZm-0001A8-GU for importer@patchew.org; Tue, 12 Jan 2021 12:35:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNFz-0003YN-1M for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:00 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:40555) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFw-0004qU-BE for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:14:58 -0500 Received: by mail-ej1-x631.google.com with SMTP id f4so3497943ejx.7 for ; Tue, 12 Jan 2021 09:14:55 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y2D++BW35zFmYTheLMBecjwElXG7eVrAjCSmYiIui/g=; b=Vw0lKlQmWdjp4KavGpFzJiWQDuWTw7UhZ4Nyg/D/QLAeS2VlhMbqDGt3AhvFzOldWe 5HC4gXTf+viUesuCLCXbcblzklIwQkpXyTG2Rnjr8l7JeUC8PHWVTtUJVS6GnXeGsSaC 5j7iMCEEO3z+Hz+EwNK7AxB+MNfCd6VsdOzfz+xY600rGG4/ecmwYoE4g+E+RI4KPFOr G9hS/SBw2sGUH+s6fs29usks7jNYA2l/uJcxLIuFOVgZBozoRgbhq4wN6yPUnKf+vf9X yIGxkQe2d8C1LikWXwcVbBMbD/AqY/bZR0prawRTzbcgO4fixGB0+IPF0poNuHhXIAAX L32w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=y2D++BW35zFmYTheLMBecjwElXG7eVrAjCSmYiIui/g=; b=X+pRjVIH9siTzcvFUBc9qzjZrUKvpRnUW+YlX6gHhr6zndk4UH8D10xLm1L9UWaJSX G28lk69T4prR1RumZbiRALkMUQDX432aamvK2egZdQksGwrUuE2K+lTBDPuR4/knMaYm FbfBVkP6QRKQmYAoYbc9lr/zQ6ZVovLFS2jh1ryfup8H6pTB5t2uVZnUXleinxwaV7jP g23MIp9dZdVgSRLLiWtTg1k34AH6KPvwFelAY8Npf0l71vaDtoma6/ShhcHdgGOwOMt3 zPYa+QkWdh3A/odMI8x+h8vpltvROzemAqMdUk7G3WmTRnnbMhBUWuhRMzcuni+0Ap5x OUwA== X-Gm-Message-State: AOAM53219ZH9O/M5WzCC2UQMamk5zal9kWp6UhCkPzDcGjehh2XLKCvO SIiSdcdx5jCAnm9zCf4WNPJCIDnHaFAKUQ== X-Google-Smtp-Source: ABdhPJys8R/jCRgG2xnZsMexGN5TUrIDvaw+Zr3gSy0rvQKGxqE7+ht7ftp4R5Uuo4YrYOolUI/6/w== X-Received: by 2002:a17:906:b24c:: with SMTP id ce12mr3843435ejb.89.1610471695106; Tue, 12 Jan 2021 09:14:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/20] whpx: move internal definitions to whpx-internal.h Date: Tue, 12 Jan 2021 18:14:33 +0100 Message-Id: <20210112171450.791427-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Only leave the external interface in sysemu/whpx.h. whpx_apic_in_platform is moved to a .c file because it needs whpx_state. Reported-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201219090637.1700900-3-pbonzini@redhat.com> --- include/sysemu/whpx.h | 22 +--------------------- target/i386/whpx/whpx-all.c | 4 ++++ target/i386/whpx/whpx-internal.h | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 9346fd92e9..8ca1c1c4ac 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -15,28 +15,8 @@ =20 #ifdef CONFIG_WHPX =20 -#include "whp-dispatch.h" - -struct whpx_state { - uint64_t mem_quota; - WHV_PARTITION_HANDLE partition; - bool kernel_irqchip_allowed; - bool kernel_irqchip_required; - bool apic_in_platform; -}; - -struct whpx_lapic_state { - struct { - uint32_t data; - uint32_t padding[3]; - } fields[256]; -}; - -extern struct whpx_state whpx_global; int whpx_enabled(void); - -void whpx_apic_get(DeviceState *s); -#define whpx_apic_in_platform() (whpx_global.apic_in_platform) +bool whpx_apic_in_platform(void); =20 #else /* CONFIG_WHPX */ =20 diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index 12f79e2cd6..985ceba8f8 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1866,6 +1866,10 @@ int whpx_enabled(void) return whpx_allowed; } =20 +bool whpx_apic_in_platform(void) { + return whpx_global.apic_in_platform; +} + static void whpx_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac =3D ACCEL_CLASS(oc); diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-inter= nal.h index e0a9ea1dce..8cfaaef141 100644 --- a/target/i386/whpx/whpx-internal.h +++ b/target/i386/whpx/whpx-internal.h @@ -5,6 +5,24 @@ #include #include =20 +struct whpx_state { + uint64_t mem_quota; + WHV_PARTITION_HANDLE partition; + bool kernel_irqchip_allowed; + bool kernel_irqchip_required; + bool apic_in_platform; +}; + +struct whpx_lapic_state { + struct { + uint32_t data; + uint32_t padding[3]; + } fields[256]; +}; + +extern struct whpx_state whpx_global; +void whpx_apic_get(DeviceState *s); + #define WHV_E_UNKNOWN_CAPABILITY 0x80370300L =20 #define LIST_WINHVPLATFORM_FUNCTIONS(X) \ --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473127; cv=none; d=zohomail.com; s=zohoarc; b=EoqFfUb2gV+Ci84L5Rj8qRWPxCuxNIp4voVkRily4q9AaKqtpBFctDW1VhS5Lqks5tubHcqUYdtW0HrpRzjOVz7izgYkgw32K0FH0fvSIX0RY7BieZNOXi/GShQtywXAlEkatlvSjdPXzjcK9If17LpkQOTnQQUGCKsoca7vPNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473127; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2uDdBDQv1M/RCTaZ/6xEdFdq+6TJMipRFR+HVm3kYAo=; b=gaTiE+EOhd8DoPkKQE5DmyYKeIEpnSzQnMT3cVJrSal1tRz2KP5E6YfamwW2r4bEfdFO1+xgU5dUUeb51IRJ9k8Q+fED1U+RLeR5+VgMuKDfSo79fBOUzHQaO55bMZSS4+ICl94AAV3Zt079wZI4cPbyH8dfLjQou/RHYzjVcr4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473127647576.5520961067574; Tue, 12 Jan 2021 09:38:47 -0800 (PST) Received: from localhost ([::1]:47758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNd0-0004vs-8Z for importer@patchew.org; Tue, 12 Jan 2021 12:38:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG0-0003Yh-Dx for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:02 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:45166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFy-0004qd-7o for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:14:59 -0500 Received: by mail-ed1-x531.google.com with SMTP id r5so3128463eda.12 for ; Tue, 12 Jan 2021 09:14:56 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2uDdBDQv1M/RCTaZ/6xEdFdq+6TJMipRFR+HVm3kYAo=; b=Pos9oaAOAB8eoWXhQoBBhIAPb3RWOc3bh86dtu/IUl3YtE4tsg/SNX+pxTk41fMAyt Es0IGVE5YvmfRcICHwANgPGQXzM6ekp/1LzEPY0OrzabfGObTVeRrxARk5NW56WrgMkP 12Y15dnVp+2WJiWtI1/a3yP0RcEvti3r1elDkft6DokNHDxIBKrnzhFHOGt5oOfief0y c6gujPPCs4tWVhgrYVJhRlY32UsYlwJZHYZBPWDyWf6hhTTlJPo9UBm3mIowlH5/k/YC 5F5bMrRf24BiIPSd/Iwl3W59crnnGJnHpBazS85739M9LQLCB7i3eHDWjb862A6Z0RmC VyQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2uDdBDQv1M/RCTaZ/6xEdFdq+6TJMipRFR+HVm3kYAo=; b=o5nIbTXan3TIzoM/1+qylmiGIFeDNbNKeQRiMOZ7v1yK2qj0SC0Ymwbd4l+QsFoHAJ 2l5Gwd78keRLDsyriUNO3tnj+6YwnzndnjHmJWLvxwuocyUwt6Ua0ADvB2jlA04x+dcb jrV39Q5WgWtwCd/gK7yeGm9cCClObhNJHjxWCrdAc/Y4Yz/cEzvkoE6DfHvafIYSBaug AVMZ34XzHMoAk0G+rmzOKQZZvk4i7t/MMVnVBJV8xuIU8M0+pGf+Zlueb0/JaUqxzP/U XY4TRerzteOZsj6NzcWVsOA3DtuYE+cooNwAm51NMOC/rY1upMoViJyX107e+LyNiH6/ vM+A== X-Gm-Message-State: AOAM533FZpp/d7nv3YSgSkLlvQV5vQ3hNxhYZWhdHZ8ezvjFA4AF+11d xaKE6WwKpW50ygDJ7SE37FdFrwGnDmXIeA== X-Google-Smtp-Source: ABdhPJxBpmHdPUN8YLG16U0pPflMS53kX60CfqC6GjPQtzNZ/J+oIfLLUNqC/lL36Jjeoq/IktDzMw== X-Received: by 2002:a50:e8c4:: with SMTP id l4mr99409edn.337.1610471695925; Tue, 12 Jan 2021 09:14:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/20] cirrus/msys2: Exit powershell with $LastExitCode Date: Tue, 12 Jan 2021 18:14:34 +0100 Message-Id: <20210112171450.791427-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Yonggang Luo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Yonggang Luo Currently if we don't exit with $LastExitCode manually, the cirrus would not report the build/testing failure. Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210107101919.80-2-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3907e036da..68b8a8fa9c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -137,5 +137,7 @@ windows_msys2_task: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --pyt= hon=3Dpython3" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" + - exit $LastExitCode test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=3D1 check" + - exit $LastExitCode --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610474049; cv=none; d=zohomail.com; s=zohoarc; b=NL+3teM9dcCbXFZv2mS+7sFumNWn2dPbSwBBA/OXc35+OLblljoT+XvWZpbiIPPb7ltdSaY3+Ycx15WguTyacd10XsoSDKUmmEq5jnragm6NsapBpRm6cuIFhloJYPtET+Yb/7mqiiQwP2jcFnTiuqFeYs4cb6+X4R+5fnV19qA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610474049; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D6VYmYcxC74HseBh4tGL9VlXtclJEhKjM/IexQ8E7H8=; b=h3AmlV+a31gZvzO8uR0MWmsvXHnH9ABJBlfwFFJN0spZi3yMGAzDdS1k3OOutL2Yl8aLrxq8p6RB5ympveru0ycwSURfoMme8+vyMxWDEdJi8bThODzmoRvwginWJLQLike98fzKKRrDIMUIRZO+siZ2FfWk+sCn4/5Jhkqf9/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610474049495850.8248511314365; Tue, 12 Jan 2021 09:54:09 -0800 (PST) Received: from localhost ([::1]:34066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNrs-0006a0-AO for importer@patchew.org; Tue, 12 Jan 2021 12:54:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG0-0003Yi-Ex for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:02 -0500 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:47007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFy-0004rX-8D for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:14:59 -0500 Received: by mail-ed1-x52d.google.com with SMTP id v26so3125711eds.13 for ; Tue, 12 Jan 2021 09:14:57 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D6VYmYcxC74HseBh4tGL9VlXtclJEhKjM/IexQ8E7H8=; b=AdJvOMQH2UHG1ZA4wN1O1OD2aZ5vPOujOZl6OHTxh+9+OGN5V45Dnm4TJnYV/ROoHG 2+SADcBucBvk7jPpi7P6OasbRXtPzgCYdUDUr6gQdOBBXBOjtbsdI40PTncE7jGqvkUX /grL468vuNkdoe/fLxTcQ0q4QAOUGIcfpAxfmo/C1dtnrxIaHvBR0rxIzw1ApSttlJgr WAB8p1Vgplo+ZBxz1N/A4Gg9PymIt1Dv4WGYZvyRs5k87brzPRxLjfe2VPAeCImoViRQ pI1Do8Ajz47E6DIYhUTVX0IYrHmwZDQ/nwLhDYPITaceT3+RYxvBAWoMxmlszLd8MTSJ yRJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D6VYmYcxC74HseBh4tGL9VlXtclJEhKjM/IexQ8E7H8=; b=rd1i2NtRCv+wwdXeKK6AD94vhvPXWAbHFinnGQp7B3uWc0STcQbCzGW9oGW61ieiRJ azNFhuGs3ODu+k3fu4sSUAnzm46kNwPCk3xuZ4j/SdfyhtcNGraOu2uZLATLaww2X3qA 0WIyRssUZssVqFN/Rksw5AJd9lBgIDJbLajm9zSdTM0SuZnsVGnRhGVeIYK+kv2no6hn HRp2JIZXd1VEzOBkxq5G01DzwmJc9qutLPs0Ly0NgmMGZHEV41+aEGqqLPHPUu5yYcNM gXTKbblOEFgY0Rwvg/HoH10OTN96gmOXkUsnF31aVNC8NKXH24GS0iHb5XtxXye6KY3y KcLQ== X-Gm-Message-State: AOAM531QjiOmGMqhRM7Su4wE8Ja+sP2sruSM3JFHzExJfKGBRAWMj5po 0FdX8B3bJ6/DcxObRkxSlC9Ek1cCQwiJWg== X-Google-Smtp-Source: ABdhPJyFu3USdaisgUQfwruI6YEqWQ4o+2LfDP/hBWVlhOBTlGQnn3JIoG3oLXH9fDYHwnV8YLhQMA== X-Received: by 2002:a05:6402:1c8b:: with SMTP id cy11mr140174edb.256.1610471696842; Tue, 12 Jan 2021 09:14:56 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/20] cirrus/msys2: Cache msys2 mingw in a better way. Date: Tue, 12 Jan 2021 18:14:35 +0100 Message-Id: <20210112171450.791427-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo Signed-off-by: Yonggang Luo Message-Id: <20210107101919.80-3-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- .cirrus.yml | 117 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 49 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 68b8a8fa9c..bc40a0550d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,23 +64,61 @@ windows_msys2_task: CIRRUS_SHELL: powershell MSYS: winsymlinks:nativestrict MSYSTEM: MINGW64 + MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/= 2021-01-05/msys2-base-x86_64-20210105.sfx.exe + MSYS2_FINGERPRINT: 0 + MSYS2_PACKAGES: " + diffutils git grep make pkg-config sed + mingw-w64-x86_64-python + mingw-w64-x86_64-python-sphinx + 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-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-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-nettle + mingw-w64-x86_64-cyrus-sasl + mingw-w64-x86_64-curl + mingw-w64-x86_64-gnutls + mingw-w64-x86_64-libnfs + " CHERE_INVOKING: 1 - setup_script: - - choco install -y --no-progress 7zip - - Write-Output $env:PATH msys2_cache: folder: C:\tools\archive reupload_on_changes: false - fingerprint_script: cat .cirrus.yml + # These env variables are used to generate fingerprint to trigger the = cache procedure + # If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT + fingerprint_script: + - | + echo $env:CIRRUS_TASK_NAME + echo $env:MSYS2_URL + echo $env:MSYS2_FINGERPRINT + echo $env:MSYS2_PACKAGES populate_script: - | - md C:\tools - md C:\tools\archive + md -Force C:\tools\archive\pkg $start_time =3D Get-Date + bitsadmin /transfer msys_download /dynamic /download /priority FOR= EGROUND $env:MSYS2_URL C:\tools\archive\base.exe + Write-Output "Download time taken: $((Get-Date).Subtract($start_ti= me))" cd C:\tools - bitsadmin /transfer msys_download /dynamic /download /priority FOR= EGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-= 03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe - Write-Output "Download time taken: $((Get-Date).Subtract($start_ti= me).Seconds) second(s)" - C:\tools\base.exe -y + C:\tools\archive\base.exe -y + del -Force C:\tools\archive\base.exe + Write-Output "Base install time taken: $((Get-Date).Subtract($star= t_time))" + $start_time =3D Get-Date + ((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-k= ey.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C= :\tools\msys64\etc\\post-install\\07-pacman-key.post C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#Check= Space/g' /etc/pacman.conf" C:\tools\msys64\usr\bin\bash.exe -lc "export" @@ -90,49 +128,30 @@ windows_msys2_task: tasklist C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacne= w /etc/pacman.conf || true" C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --ov= erwrite=3D*" - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --need= ed \ - diffutils git grep make pkg-config sed \ - mingw-w64-x86_64-python \ - 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-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-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-nettle \ - mingw-w64-x86_64-cyrus-sasl \ - mingw-w64-x86_64-curl \ - mingw-w64-x86_64-gnutls \ - mingw-w64-x86_64-libnfs \ - " - bitsadmin /transfer msys_download /dynamic /download /priority FOR= EGROUND ` - https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphi= nx-2.3.1-1-any.pkg.tar.xz ` - C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/too= ls/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz" - del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz - C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg= /*" - cd C:\tools\msys64 - echo "Start archive" - cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\= archive\msys2-x86_64.tar.xz" + Write-Output "Core install time taken: $((Get-Date).Subtract($star= t_time))" + $start_time =3D Get-Date + + C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --need= ed $env:MSYS2_PACKAGES" + Write-Output "Package install time taken: $((Get-Date).Subtract($s= tart_time))" + $start_time =3D Get-Date + + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin + del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout + del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\= var\cache\pacman\pkg + tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64 + + Write-Output "Package archive time taken: $((Get-Date).Subtract($s= tart_time))" + del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64=20 install_script: - | + $start_time =3D Get-Date cd C:\tools - cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -s= imsys2-x86_64.tar -ttar -omsys64" - C:\tools\msys64\usr\bin\bash.exe -lc "export" - + ls C:\tools\archive\msys64.tar + tar xf C:\tools\archive\msys64.tar + Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start= _time))" script: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --pyt= hon=3Dpython3" --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473274; cv=none; d=zohomail.com; s=zohoarc; b=DQ1TgfKJyoaw8+LsX9v9gioZab2kyzAtiiGw0LcqQlwDy7fTGMEAkputdFdahleN20WHEDrqUy1L3OGMehO4Tgzb6J5jFSgmGjNz1JIe3XnNcrqBNuPelx4BJ+N9kUqldJa5cfMLyNviytqSXDsgiOCaJu9ddp2aMSoGHgrLCaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473274; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c7Ps1224Yv/L2Ymofo09xqu1zxw8Gq01q++8CkB6yJE=; b=Us7Xzv8OuOd2DXfUyqFvS7qcLUqpWzVxFbeK/oDKd/brdFMJx/FBqmDh3bJD37ssMhGFXEw/uFH9tykHZA34KowGChejt2CWF5By5wfptDAdvblZ/N/YMV1ZvSM03o29vzf74Mfbig87QaBA8PbocGl/GxeFcL84AeEEbL45lx0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473274148409.119540688917; Tue, 12 Jan 2021 09:41:14 -0800 (PST) Received: from localhost ([::1]:56498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNfM-0000Gf-6X for importer@patchew.org; Tue, 12 Jan 2021 12:41:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG2-0003Zp-BS for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:03 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:39244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNFy-0004rg-S9 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:00 -0500 Received: by mail-ed1-x531.google.com with SMTP id c7so3165919edv.6 for ; Tue, 12 Jan 2021 09:14:58 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c7Ps1224Yv/L2Ymofo09xqu1zxw8Gq01q++8CkB6yJE=; b=P00fSZfqSDCMRmRb69ogaBZbVBbyoz5FehCafvnnxYGIrXkzSzmajZ+NQoy+aMhdp2 +LLMqezIZtFgLBuIGEBir/YbNE2pmpXzV8qbm2BRMWStpSuR988DiMPMIGKS0Ou5WpHO aEaN7HWgVsMA7PBn6bi5mtqZKQGu9265vHCr4Y96cBuuBQj+DVotMDvmFuEo9QM8jtQg a84SEg77uk9G6LNXclgbF+w0LSPrvqLAeZUX5zHruvQpBtLl7T/HykpybNrguU/j+Jkw oC6+YDFYyW4PvLdshB2BSJ/pWsvGJIyjUqMTFWiDE9kixYEtYVXiyZqZ5U0MNVyjkr2Z gEog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=c7Ps1224Yv/L2Ymofo09xqu1zxw8Gq01q++8CkB6yJE=; b=dMDX8T6tVDcvJ4H6jSRQiHf/n6DPmjsB55RGPzRRbQK+sAJvsNTGJUcEPXqSiAQ2hV CfbY/zCqigaQnTm2QzRrWLoOyLU5C7b8kF8n0GSDufq4o45lit1qecBHC99xJ5XHybMf H7yI4fIfizOaJ2RFkn6oQOEf9dx+eL4GdZBO0YOUA54aS9pF+EbmQHFTWoula2hJqEhR Hji70Bx2Nw/3OnExJYfJ/5LTKfESEtHbUyQLh6RDlIB1TS9NPZ9KfXgC7uqz5H4MqRai aiUaA+f7JPqmF6r4I3NNdioJWKLeH90NOiIkIj3ALqdiVHLXVLPAWlDQOtOVZrGUt7K7 ZnHQ== X-Gm-Message-State: AOAM53036dEwMTZ/JPcC0PgvmcS2PurQkt936QgzXSI0AN/3uubZfgfL oxVXZEdpHNemtHi7h9KVk4z1cSa2Kk+igw== X-Google-Smtp-Source: ABdhPJyLhG0i0JDSgp++5fjF9E2ju7roh7BosWSktFWIqHdf/2McBHgJvw1zDszH8mU1a2cLmMyqIA== X-Received: by 2002:a05:6402:1a30:: with SMTP id be16mr151205edb.124.1610471697700; Tue, 12 Jan 2021 09:14:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/20] maintainers: Add me as Windows Hosted Continuous Integration maintainer Date: Tue, 12 Jan 2021 18:14:36 +0100 Message-Id: <20210112171450.791427-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Yonggang Luo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Yonggang Luo Signed-off-by: Yonggang Luo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210107101919.80-4-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4be087b88e..4d9df874a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3198,6 +3198,12 @@ S: Maintained F: .cirrus.yml W: https://cirrus-ci.com/github/qemu/qemu =20 +Windows Hosted Continuous Integration +M: Yonggang Luo +S: Maintained +F: .cirrus.yml +W: https://cirrus-ci.com/github/qemu/qemu + GitLab Continuous Integration M: Thomas Huth M: Philippe Mathieu-Daud=C3=A9 --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473446; cv=none; d=zohomail.com; s=zohoarc; b=fbw1+jGHAe70g2ata1e0gPsm5Epx97mADR/CJQtLD5XElF+4pthgm1asPV9O1unAKXO/Vaoe0iQKHgT91Sf0BEcns+xGsqw3rEX9PxPM618MscUUYOWx4UCsCYO/TK3mON7WewXny6/iaQW0GpMMgC3tmkGdIayte4CqI2FFPHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473446; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ai6Dke2w38UTjcYZCpwJxxn4izLkmiEXd15tKX5teqg=; b=UV30vEnG0U2QDhJrdfD/XULhsurC0eVKUh80VQaBKXaEl1r9hatUb1aP10y90BnfDHfBSy7Kr3QDxADfna1SJvHZ/n+UbAevd38vzEv4cg3W2XRC+cOmd97jO6eIgXzfnrPPUV9uBGQN3SQdtJRZuzR6IpAQrhsgjCHPl4bnbVU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161047344665119.343852359162497; Tue, 12 Jan 2021 09:44:06 -0800 (PST) Received: from localhost ([::1]:36740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNi9-0003ub-HB for importer@patchew.org; Tue, 12 Jan 2021 12:44:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35250) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG2-0003Zo-B3 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:03 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:40667) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG0-0004s1-5g for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:01 -0500 Received: by mail-ed1-x52c.google.com with SMTP id h16so3155633edt.7 for ; Tue, 12 Jan 2021 09:14:59 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ai6Dke2w38UTjcYZCpwJxxn4izLkmiEXd15tKX5teqg=; b=ifbxgapAI6iOvxaoeOmO6PWum2uVHr3cpL7XrijStMqJLOUrcbAXSgXX4sEhAmI6jl h0aFk2rrnuT+xEy7U975CJ4v+0LATBnO+d3gfRHWl+vq2BB/toXFNV6ZRBC6tJplsy18 dV4H1D5psVyp1QPOdN+3JK1VbaDKF9AUtwjQTXsbZSrVNOW7oja3+hFgbgJelSgVnN7D OiMfO4KoFOKe/Q/ffB+oLAqukWPhIDlwTyZfGop4cs8IvDz3sucM/+jLetRetXSUfAvl 8N/Nm1YFTWOqznAtrMPUjfCE3eb1D9MvfaHZzpuNJa11KAfYxjyqgjMqjqTvTf+yU9AK FxLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ai6Dke2w38UTjcYZCpwJxxn4izLkmiEXd15tKX5teqg=; b=lt9KMZ1DxaX6CATUZpU5wPpT3EVZwbVGZ9b6GURM9ndPOjYcMqr3lJ8gS6MAGSk3yW +W2pItD921/D9PXt5h8/LZV5vV3nXQLhB9KHqLEHCjzch1we7FuvqLIOjgnXVZVocrsV 9B1sWSKVAWKyyxamYs2Bvo1AuOS+YHVq9A95M3mKTSbp5wOVkJWpVGXPc6aENgxG/Lv6 IVY0CE+RAD/unJkX8TLinggy0qikxht6k8NDu6xL8PgcudDNyP0Pv8GUu2XO/LleK7jt s2w0s6gKUipreEL8HLSZgeAhmEDS5Fr4Mp5j8dvv+C90eZWOTDgjBCBW8E2abD/gfCKE rTVw== X-Gm-Message-State: AOAM530UbApJ1RZ3Q/VkTDitUTocQbeDWZUFd/ekkXJ5NB4R3c70/ZcA 3k/8pbf709RuR5/GtPXO8ZON+b2uGc5gow== X-Google-Smtp-Source: ABdhPJxex0S6ehLHG55IM9eg3JQxLt9UQd7Wn2Gsw12qO0gfvEKrQ8hNdwoxg90uil7EnvyMIAqIFg== X-Received: by 2002:a50:c209:: with SMTP id n9mr117406edf.123.1610471698511; Tue, 12 Jan 2021 09:14:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/20] whpx: move whpx_lapic_state from header to c file Date: Tue, 12 Jan 2021 18:14:37 +0100 Message-Id: <20210112171450.791427-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo This struct only used in whpx-apic.c, there is no need expose it in whpx.h. Signed-off-by: Yonggang Luo Message-Id: <20210107101919.80-6-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/whpx/whpx-apic.c | 7 +++++++ target/i386/whpx/whpx-internal.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c index 1d330bf749..bba36f3ec9 100644 --- a/target/i386/whpx/whpx-apic.c +++ b/target/i386/whpx/whpx-apic.c @@ -20,6 +20,13 @@ #include "sysemu/whpx.h" #include "whpx-internal.h" =20 +struct whpx_lapic_state { + struct { + uint32_t data; + uint32_t padding[3]; + } fields[256]; +}; + static void whpx_put_apic_state(APICCommonState *s, struct whpx_lapic_state *kapic) { diff --git a/target/i386/whpx/whpx-internal.h b/target/i386/whpx/whpx-inter= nal.h index 8cfaaef141..908ababf6d 100644 --- a/target/i386/whpx/whpx-internal.h +++ b/target/i386/whpx/whpx-internal.h @@ -13,13 +13,6 @@ struct whpx_state { bool apic_in_platform; }; =20 -struct whpx_lapic_state { - struct { - uint32_t data; - uint32_t padding[3]; - } fields[256]; -}; - extern struct whpx_state whpx_global; void whpx_apic_get(DeviceState *s); =20 --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610474207; cv=none; d=zohomail.com; s=zohoarc; b=BVYvy2mCOF6H34R1hIAa9GF+Jf0KQ7rPdK+VE9sFXk2osmxhZgNbDMvLh78H0A+TMxf21RdGeSkENoSj5yZ6D55MPbj2t+P57PWdQ0K7y+NDzyVP97LyQY3b/uj7gx79ermZZxOOtx1M3EyvwJFdc+R2KgWycPAFHkTYFwwIv58= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610474207; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u8LZoZ4qXz31cUfEnKnGe7T0fQ7CqFYfht5PRmZkIbM=; b=kEe+lscr88sJWxswX/qVAMeS70mRZ+BwQKT3CThjHswqwoDqyvkAgiGHki5x635SvIiRQTkpqExncAOOL4OY58sY0mfTLeYT1i2dJoBCZVkUkdyqCxo59tuWQ16uvWCVzgPAnFCDb4PTazj+kNTqKnScFN9w6YMbVOCnvpTi3d4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610474207943482.70795388074555; Tue, 12 Jan 2021 09:56:47 -0800 (PST) Received: from localhost ([::1]:40366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNuQ-0000v6-QE for importer@patchew.org; Tue, 12 Jan 2021 12:56:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG7-0003dR-54 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:07 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:47012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG2-0004sK-4U for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:06 -0500 Received: by mail-ed1-x532.google.com with SMTP id v26so3125859eds.13 for ; Tue, 12 Jan 2021 09:15:00 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u8LZoZ4qXz31cUfEnKnGe7T0fQ7CqFYfht5PRmZkIbM=; b=Q+7Pi6EQN3xSBXwV1Qj2+qGsPQDa2a6KJJT7Bw/LG++cVzvhBk4hD5ZlAno4iz7W4z JiQ22bfZbdUgGUujls1RTQyot9sUSRZE9PFs0DyV6eovIh9AZiWoMP/hT2XzKz3dtqDT 0Itvtg3wFIYzj2Bcgdp6x9o9EXTfA7SkTgiKuRDiUdDl638BmS2WEVJ2jXUkrK1/6FUv Z3Qa6GyXR7LldnOlhNF/ygCCKpQkXAmMU98Mcn/53WYlPSP+lWShGHYVx9v+0IUQ6LUr y9tCTc+cXF6hD0UYDnTSIvB4i6qRCZTr0FTKsdjv8u15cxzSIqpWMO5ip5UIhuTI2A9v KKvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u8LZoZ4qXz31cUfEnKnGe7T0fQ7CqFYfht5PRmZkIbM=; b=QzkslIWnjifsHAtgkxt7ZPi5Vhxksk4jly9pg/fzwNVH8WRZr8isn/sHvRzk+Wmopf hL3I3NjijoTo0p7Xtvd94faZoRIzl1RvZsrEAlfKTVf/tLbw6MyGX1cMVYIueCYnciDa ltUn5Q65TbqnqUFJEtv5e5SWDnL5KwmfXrHkk+4yiFP9pGn6Cq9/qKoWE65Zls/CNELi qpkPoRzZ8zKXRMrBtE5S7D4LSWr/iz0EKnV58IllLstsxOpjTdfcCXvaOM2fkysGihPG 8rq9gY/RmdYmslzexdUh+LmTk50TvchC0qA9/MOdzMD58yn4/VAyn8stwD4xRxGQGh8o PlPA== X-Gm-Message-State: AOAM533hH6xwFS9m4VKm02UTczNIFszKpBlwN125Qp5SeAZ9EjJwDrW6 D7XQ+ucDUV24N24/ZLqSQUGJlREzD8ic9A== X-Google-Smtp-Source: ABdhPJwjL3DW4VJ2m8hgXqawMsfnBP/mSeyIFNbYP/8LcAbVqs4aPUqSCc8F2wPZMIm2QtBBDvP6Zw== X-Received: by 2002:a50:eb44:: with SMTP id z4mr109529edp.167.1610471699381; Tue, 12 Jan 2021 09:14:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/20] meson: fix Cocoa option in summary Date: Tue, 12 Jan 2021 18:14:38 +0100 Message-Id: <20210112171450.791427-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=83=C2=A9?= , Chris Hofstaedtler Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Chris Hofstaedtler Cocoa support was always shown as "no", even it if was enabled. Fixes: b4e312e953b ("configure: move cocoa option to Meson") Cc: Paolo Bonzini Cc: Peter Maydell Cc: Philippe Mathieu-Daud=C3=83=C2=A9 Signed-off-by: Chris Hofstaedtler Message-Id: <20201230221623.60423-1-chris@hofstaedtler.name> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e4db67ccf2..bd4ff3118b 100644 --- a/meson.build +++ b/meson.build @@ -2330,7 +2330,7 @@ summary_info +=3D {'profiler': config_host.h= as_key('CONFIG_PROFILER')} summary_info +=3D {'link-time optimization (LTO)': get_option('b_lto')} summary_info +=3D {'static build': config_host.has_key('CONFIG_STATIC= ')} if targetos =3D=3D 'darwin' - summary_info +=3D {'Cocoa support': config_host.has_key('CONFIG_COCOA')} + summary_info +=3D {'Cocoa support': cocoa.found()} endif # TODO: add back version summary_info +=3D {'SDL support': sdl.found()} --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472957; cv=none; d=zohomail.com; s=zohoarc; b=oCAPhmhLXUxM28D7vxPhgeVnmQe0lk0avJJglvPstlXqZhKX9o0KNEjSSF+a397YQg+0G+PP/r0lxOcPpeRQtYxSd4/YC6ZzAvF47X7LusDZwd4BbuF164ozP8QwCA5MA8g5Dbbna3JtMQ9Qv9k26VXUp+4MgxMDaC5fzULM0Yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472957; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yWr91yo72rto7Dn2uyOSF5tkbrOpQMoyc3mdj2af5Ig=; b=kB1NHaaNvKk4X4KKbwpVBAud83TeQvDHZIDQtN0SedVEBy20x/JelMAxYxoHkOtC1pXBmZec4NfCcmysb7Fe/wfuFhxKUMKqQsIN6A9wg0NXGAixTVRRFmrBa+5zNFCQ8HfBjCnv9kCgo1DznvZQOGUShqIrDI7MPTZQoo+z6Kg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610472957434418.5786468106353; Tue, 12 Jan 2021 09:35:57 -0800 (PST) Received: from localhost ([::1]:39964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNaF-0001Uj-Sd for importer@patchew.org; Tue, 12 Jan 2021 12:35:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0003bX-AE for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:06 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:43286) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG2-0004se-4M for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:04 -0500 Received: by mail-ej1-x629.google.com with SMTP id jx16so4551560ejb.10 for ; Tue, 12 Jan 2021 09:15:01 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.14.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:14:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yWr91yo72rto7Dn2uyOSF5tkbrOpQMoyc3mdj2af5Ig=; b=FoBTKFCJwSo1yndhD3JJHqih8G8Js0uKDd9uWQtEQcIBlYkQGwtZoAfbmLgSahE2DP 3I2W9DiFxPKG7LDxMRSCPjrHbL06DNnZL2VoPvN0fbxM7AMqYqDhXhmzRz3CWzxulwko wMtGz815UB4/Zcbpbzoj4O8fSMTv0jrzPHPSR/ByL2jx0X3mrKn1UdPTj6ROZRk2B6Lq DckYLk3dl63Kngaiul72LmzXSN/nKUuUZ+h5x68rDtlrii7oIf+bb/v5OIcBy66QS5KP AU9QfrfbP+RA7mazv9r1BkRihKeNRCAPXsJsYLRzkhd9tRRyS3kD4vbe4UHx6FRFaj7l vdgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yWr91yo72rto7Dn2uyOSF5tkbrOpQMoyc3mdj2af5Ig=; b=FS42UklZAY1LQiOOwfNULchEZ1aCXjXWmjXLtc8z84zGeP+SymWatQQzY1Wps1rDLu VydcEbFTIvFu880qbRAIKXv1bsP7vOEy5g/NJCroxAmpmweFXxvyVQ2q0bZw/D0Mc1gJ bUIbRelHOJlFU4HfSOE35kABwzNwgRRf3ACMp6k2fFgfLKOIbbcZ3LZD1fljtQBQM+GT +3GMQIRvsTQBMOz6gvuzdiJsUHeRaRfZVFcwVJt217DHZG6U/LXzrWs1TB+O9282bpHM DraE54fSb4BeM3IoQqqol3bfVRcIdOylbNan2loURPOkAUrGslUp4GNgRAj93cwHqsGK Ckzg== X-Gm-Message-State: AOAM532Q6k+Usu6zVA1XBdurvSHzx9s0/PP8AVz+EXvv5ESt8szxMqy2 xGjoXbiWU9peBt1Nck8eNcXuXqkSANz4Ww== X-Google-Smtp-Source: ABdhPJzwccGRnK7rZ6AIGMePII6n3E3kdHN7YLPcOng2qLLqQiInwucZuj+zRVpLl19QCmkIF06xtQ== X-Received: by 2002:a17:906:3949:: with SMTP id g9mr3716201eje.493.1610471700299; Tue, 12 Jan 2021 09:15:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/20] scripts/gdb: fix 'qemu coroutine' when users selects a non topmost stack frame Date: Tue, 12 Jan 2021 18:14:39 +0100 Message-Id: <20210112171450.791427-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Maxim Levitsky The code that dumps the stack frame works like that: * save current registers * overwrite current registers (including rip/rsp) with coroutine snapshot in the jmpbuf * print backtrace * restore the saved registers. If the user has currently selected a non topmost stack frame in gdb, the above code will still restore the selected frame registers, but the gdb will then lose the selected frame index, which makes it impossi= ble to switch back to frame 0, to continue debugging the executable. Therefore switch temporarily to the topmost frame of the stack for the above code. Signed-off-by: Maxim Levitsky Message-Id: <20201217155436.927320-2-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/qemugdb/coroutine.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/qemugdb/coroutine.py b/scripts/qemugdb/coroutine.py index db61389022..e1399211e6 100644 --- a/scripts/qemugdb/coroutine.py +++ b/scripts/qemugdb/coroutine.py @@ -70,6 +70,11 @@ def bt_jmpbuf(jmpbuf): regs =3D get_jmpbuf_regs(jmpbuf) old =3D dict() =20 + # remember current stack frame and select the topmost + # so that register modifications don't wreck it + selected_frame =3D gdb.selected_frame() + gdb.newest_frame().select() + for i in regs: old[i] =3D gdb.parse_and_eval('(uint64_t)$%s' % i) =20 @@ -81,6 +86,8 @@ def bt_jmpbuf(jmpbuf): for i in regs: gdb.execute('set $%s =3D %s' % (i, old[i])) =20 + selected_frame.select() + def coroutine_to_jmpbuf(co): coroutine_pointer =3D co.cast(gdb.lookup_type('CoroutineUContext').poi= nter()) return coroutine_pointer['env']['__jmpbuf'] --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472277; cv=none; d=zohomail.com; s=zohoarc; b=P32nzeCQhqbePpjUv8fTT5eS5BjM/59ktf2Uket62lOiz3k+UiI2pmgDAL9LnGbgsJ05P3uWUC5sl9ue/lsYbU1ZcIGBrrvVy8HyPoS+MvqXyJWQySuLF4G3ueJ09iG1oRN6doHsxzGVISHzMWZKyqa3FzGKHDIRacVcKytevOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472277; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MYwXQkjkGyHa6d3oKH/TvhkJ1MzQV0+oIcuJEspAGwE=; b=GDEW5BKy3/xIxrYDF5TwFbChpk5ikfEKbGoD8MyNpSHT2tgF2+ygzUemngh2LAALxLc++kuzYl7CaLZW+Fxz221qI8WJKmRW3tnaqFeB77nbnps9/RuclwecyIbeR+Zj9L/6TwJnxy7Xsaq+EVTMzp3fnjaE8LTBuW6epfMQhSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161047227780145.83652421213901; Tue, 12 Jan 2021 09:24:37 -0800 (PST) Received: from localhost ([::1]:39032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNPI-0005ef-Hw for importer@patchew.org; Tue, 12 Jan 2021 12:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG7-0003eT-Nm for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:07 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:44341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG4-0004tR-0E for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:07 -0500 Received: by mail-ej1-x62e.google.com with SMTP id w1so4547247ejf.11 for ; Tue, 12 Jan 2021 09:15:01 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MYwXQkjkGyHa6d3oKH/TvhkJ1MzQV0+oIcuJEspAGwE=; b=ViXJ9PCJdFmPqnYCysr6cD1igywMN69t76NSAaktnE6Sdtotd6NogzP0UAWY/crok8 6gOtvU9hwgdf9tXepB0A0imcp0vZHgMSuhN4CWToYCA41Ce4912DaStc3VrzcU66FPV1 zpj5roRuxHXuosAmgCbZGVcbRJGN32GhE7fFHKZ5hZ5fUJOD61+RemwcOtE3KQ/s7zst xyoBNl3Pw+YaKAggEu0lyeB/1aBdcoH8FfEfzTnV8BBhLlBzq0UDXUyirOztC0mOO40W e0Gd4Sa9ZxFw6oaT7eC6TGWl2oglYWXlTMniqDAw835ZXP+EsGikOYMm7qCDaCvWaJDe 3oXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MYwXQkjkGyHa6d3oKH/TvhkJ1MzQV0+oIcuJEspAGwE=; b=mvHqoJi1bIZPaXBLpsWBinGTDev3HgoKNB3jd/YjXVb4vWfTRomykYdMdgQgJFNhPR Ez898B7W6ilkqFtPpN2UrQehMN3s/fmX+B2gbpHa/+X51lUWFB9A5B9IrOq81mnv1pD5 uKeMMFadUPTvVxs/Rcx0zQ9Nd9RTmLuAxTuJxS4IcK3I5rm5Y+9xNkb6I8MyqWYPUO0a sho1oYJCaGXgbUB7EMnO+JxQMVOqePuiQwpQOOBeSYGYyeTh5bjL5f2rJUQnIVs1XU3Q VT80tqpHq9yY/Xeck6QbduFph2WCSIE2eY5phMB0VIA+nvlvFvkjfvufP5hMKXC05BnE lFjA== X-Gm-Message-State: AOAM533ZTGGKkon7w7OGJ8pbGJlWWXsCqmDnZW4efRBxpBW1sB6VB9e6 6oPzA+zrPJKrRcAB7Ik/zfN06vBzdxZKPg== X-Google-Smtp-Source: ABdhPJytCZ1DpCPRuGLOv8G8yKUlQqXDC6g+c02ypGjd3LYbIQba5twZ2/VcGsvh5jQuq2L/2ErYHA== X-Received: by 2002:a17:906:8292:: with SMTP id h18mr4030953ejx.481.1610471701162; Tue, 12 Jan 2021 09:15:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/20] scripts/gdb: implement 'qemu bt' Date: Tue, 12 Jan 2021 18:14:40 +0100 Message-Id: <20210112171450.791427-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Maxim Levitsky This script first runs the regular gdb's 'bt' command, and then if we are i= n a coroutine it prints the coroutines backtraces in the order in which they were called. Signed-off-by: Maxim Levitsky Message-Id: <20201217155436.927320-3-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/qemu-gdb.py | 1 + scripts/qemugdb/coroutine.py | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/scripts/qemu-gdb.py b/scripts/qemu-gdb.py index e0bfa7b5a4..4d2a9f6c43 100644 --- a/scripts/qemu-gdb.py +++ b/scripts/qemu-gdb.py @@ -40,6 +40,7 @@ timers.TimersCommand() =20 coroutine.CoroutineSPFunction() coroutine.CoroutinePCFunction() +coroutine.CoroutineBt() =20 # Default to silently passing through SIGUSR1, because QEMU sends it # to itself a lot. diff --git a/scripts/qemugdb/coroutine.py b/scripts/qemugdb/coroutine.py index e1399211e6..7db46d4b68 100644 --- a/scripts/qemugdb/coroutine.py +++ b/scripts/qemugdb/coroutine.py @@ -88,8 +88,11 @@ def bt_jmpbuf(jmpbuf): =20 selected_frame.select() =20 +def co_cast(co): + return co.cast(gdb.lookup_type('CoroutineUContext').pointer()) + def coroutine_to_jmpbuf(co): - coroutine_pointer =3D co.cast(gdb.lookup_type('CoroutineUContext').poi= nter()) + coroutine_pointer =3D co_cast(co) return coroutine_pointer['env']['__jmpbuf'] =20 =20 @@ -107,6 +110,29 @@ class CoroutineCommand(gdb.Command): =20 bt_jmpbuf(coroutine_to_jmpbuf(gdb.parse_and_eval(argv[0]))) =20 +class CoroutineBt(gdb.Command): + '''Display backtrace including coroutine switches''' + def __init__(self): + gdb.Command.__init__(self, 'qemu bt', gdb.COMMAND_STACK, + gdb.COMPLETE_NONE) + + def invoke(self, arg, from_tty): + + gdb.execute("bt") + + if gdb.parse_and_eval("qemu_in_coroutine()") =3D=3D False: + return + + co_ptr =3D gdb.parse_and_eval("qemu_coroutine_self()") + + while True: + co =3D co_cast(co_ptr) + co_ptr =3D co["base"]["caller"] + if co_ptr =3D=3D 0: + break + gdb.write("Coroutine at " + str(co_ptr) + ":\n") + bt_jmpbuf(coroutine_to_jmpbuf(co_ptr)) + class CoroutineSPFunction(gdb.Function): def __init__(self): gdb.Function.__init__(self, 'qemu_coroutine_sp') --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610474337; cv=none; d=zohomail.com; s=zohoarc; b=joFVsiuNiIJdIe5LjXngnj7ceijcmIpOp2y+OjqUdSFOUCUuuagC8QeQ5G2wckSyjkV31y86wxycyYWKd62Mie2IoUWIb7gtFlgPtmnypzQPeb1fm+l0KiFtI5cCMAErrT9GotoQNPeHSnerKcLGuZ6YXbC/UrQF0d0JG14C8OY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610474337; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E32qdYLqzFMMYrI5MZeNvAqG0VE5UJ2Fib0kQ0NVFVk=; b=EGfEk4e6a6ckM2JsTh6ZQPuIHMVRyXUPkhSEXPbfT2YDvbHXo9OFvEgzV6ETyChrMIlqN+Geq73RToUGjueeaUNer31qrJhaNNd7fFlRxlUPJW/gxjDOc1sfe1kN9lsb+J2aK/TuGFfisEce9g/xhINlMmjDVLqt7lpqUCc8Vl0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610474337454324.0402968612615; Tue, 12 Jan 2021 09:58:57 -0800 (PST) Received: from localhost ([::1]:45188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNwW-00035L-4E for importer@patchew.org; Tue, 12 Jan 2021 12:58:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0003gM-HU; Tue, 12 Jan 2021 12:15:08 -0500 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:36587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG5-0004uA-UY; Tue, 12 Jan 2021 12:15:08 -0500 Received: by mail-ej1-x634.google.com with SMTP id lt17so4622880ejb.3; Tue, 12 Jan 2021 09:15:02 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E32qdYLqzFMMYrI5MZeNvAqG0VE5UJ2Fib0kQ0NVFVk=; b=X7Pml1zifvQRoawinF3/zdcGSvahvUQzlo2RTNAW4ouJOUZjIwyYxifxO8Zdd1TEdM 6smXy2SbxMbWE27zFy/vbs4OGu/Y4qBKFQBjCqR4KBa9Xikg8sVJtdqTvxgDxvvgqj/U U6OVlKxy1gENM9EDlwKAsMvgEH50FPV0dv/p2ue8iF0rFEcRlVvNX2vndE/yn1paTg4Y oLb/M0UB2k987hFT+ervjaArmNFic6dzxGYvzr7o6ZwCwLk2OCzWVCXFg8Ng3HPHy0dW flAodCZrdlSc0fIHhUqklhEEHTxWiFZehxAIOokxzqnO7dsUKcHy555vvL7ARTikg1FR eqYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E32qdYLqzFMMYrI5MZeNvAqG0VE5UJ2Fib0kQ0NVFVk=; b=Qa6sZTV63A3Ql3pX+n5E0vl6Bw9Uo/2qDQZX3XdI3+jTLRPoeR2k5FDONSZbpavij1 vrrrENLIgLyD831mUedohqlrNQr96rjPvvCDA+LMy5MQ0bifhGLqEEXLeTtoOE0YyPvI 1GaLUV2fwDDNoUL/z1D5CLZjfBizVYuSsgTPm/BgInWjPHi9C5BIV5JgH/segXgzazFI 4SVAyaV5+3nrnamlr7HXUHvjGY4pLzlPUVDyXBlKlOUN/FrJzPHUzLa+wPXykyEVnDsB KD7For8SNtEV848MdfHyUmZgeu36e4pwyIAQSRYiS+JgVu2207hdeCGaaFG2ePRgHiOo UeIA== X-Gm-Message-State: AOAM532yagIimHWT9q3Yqpfmx5PW4f0YgqhKEYJRMjtO8ZCfAg2O7Hfn lm6cU3rd4vEB3oTh1Pj8oIA9Ey1OEgGC6w== X-Google-Smtp-Source: ABdhPJxInmw1C5G5ffimbSjDXD2DAoodXC8WGcyoSGrpjBFlpPuH8hkD/tDfgYNVD5gXDYMN4POq8Q== X-Received: by 2002:a17:906:4d52:: with SMTP id b18mr3686728ejv.405.1610471702048; Tue, 12 Jan 2021 09:15:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/20] Docs/RCU: Correct sample code of qatomic_rcu_set Date: Tue, 12 Jan 2021 18:14:41 +0100 Message-Id: <20210112171450.791427-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: qemu-trivial@nongnu.org, Keqian Zhu , Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Keqian Zhu Correct sample code to avoid confusing readers. Signed-off-by: Keqian Zhu Cc: qemu-trivial@nongnu.org Reviewed-by: Paolo Bonzini Reviewed-by: Peter Xu Message-Id: <20210106071710.15836-1-zhukeqian1@huawei.com> Signed-off-by: Paolo Bonzini --- docs/devel/rcu.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/rcu.txt b/docs/devel/rcu.txt index cdf002edd8..2e6cc607a1 100644 --- a/docs/devel/rcu.txt +++ b/docs/devel/rcu.txt @@ -392,7 +392,7 @@ Instead, we store the size of the array with the array = itself: =20 /* Removal phase. */ old_array =3D global_array; - qatomic_rcu_set(&new_array->data, new_array); + qatomic_rcu_set(&global_array, new_array); synchronize_rcu(); =20 /* Reclamation phase. */ --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472655; cv=none; d=zohomail.com; s=zohoarc; b=Vp52B2rObi6WaIYm/p5+P7HcRX1o0/Bc1+bWiw64/HZ36OBJwmHqne0u08d0XLkWIHzGkNQFSGW3/s233kqVyRNIz+rhF9777VGHbk+GjpXKeyXbQznmRzum9dM4aM60lRnL9+gBnCXJtWJ7Xlk/1C2QHpr8TIRel+5FwLup+Ec= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472655; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=m6aKmWvrUYkxDPXh3xcQCApzwgc5rhIwNhAxE4bbdXEEvGtYaENaccmjZhrTO0tgaBV52KfIzEdxVq03EwixJWu09hOX+rmHqp5pyA3j3oZPYhwFaEpPNIo8fyRTeQOVUyLxSZCaw6DCHZErfC7CYacp0RN90Dsgohf4adp9g1A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610472655451878.5388060906461; Tue, 12 Jan 2021 09:30:55 -0800 (PST) Received: from localhost ([::1]:56628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNVN-00052Q-Hu for importer@patchew.org; Tue, 12 Jan 2021 12:30:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0003h1-Qg for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:39048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0004ue-1E for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: by mail-ej1-x62b.google.com with SMTP id n26so4580652eju.6 for ; Tue, 12 Jan 2021 09:15:03 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=o3Et6K5ixZkvDmuxUTnYZnbijsfeiA8B+FGEUI92hO7VaReiq2j+2iwblZ7yZVG90K rP9DdU31cHpMGpIM2lgQTq0leWWA517gNtdVa5wE42rWzEKzS7dHO0xi6iRMq6jWrU5K UdA4Tmdca/9qmqsHbaY5Upu+zgsnoHMfN59y3tse0CfdFBV4/CB0H2LGjiwl1458TwSv nihCkzhc3CSlxC0XUYEe2AXHo6MrrTDnO9tp31silSqgf6HVQAZjsyksIlPIjNopbWQO ZBa/Uq4wBCaJ2zy82Aogf5vIzHL/FjQjNW6BE/abaHxTpUkV4yVuknrsM8R2OLL1EW2G hMkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IZ0TOcz3fD2IXmTaYkpIyDqSBkwh9M+ZYZS1uqpiRXY=; b=YaLggcWsu2cH6z6MM95Hn3ZWiPzEUnqkzqBgCDxDhKBDUhjr+PLpp2UTfpZEMlxO6S K6NO9qbNujQl9plFE+LKL0rzuI/dVLw2baxZYyzhZHGFW52852LW1HwD2jw2ebi1gZUE 4pfTG9svoxIBeNlUm2SFxoE6fBwH1lH+TWfPZefj6+gKB7uZ/IXoRe/273yX1ScS4nb3 MbIYsWneHaVCo0bC6X0oEKz8spdIoLBI1pOPeZvilmRsLVKc3+FQ6gJm576XsS1LyYEN QREwpqV1kX+7zV1NfeYJ/CTxeb9kTQuLLBysLoCUle/i4O6XpXvaFwNPj1wdFdN0KTHI zZtQ== X-Gm-Message-State: AOAM531sjq26KZsk+yd4Fn3OQHFWTtarxTRPYfxpM5dAeTp2l3GGGZvR hb1hp2AYLfphGvgbYQEC115Nc1osKnv7rA== X-Google-Smtp-Source: ABdhPJyXREYCFAxTktMEnx1jYEkkBkeKql8gqARt1qYU1Gjx5D+w1XdJOXkb0k/SnY3mm79367ErWw== X-Received: by 2002:a17:907:3f29:: with SMTP id hq41mr2883536ejc.227.1610471702981; Tue, 12 Jan 2021 09:15:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/20] meson: Propagate gnutls dependency Date: Tue, 12 Jan 2021 18:14:42 +0100 Message-Id: <20210112171450.791427-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Roman Bolshakov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Roman Bolshakov crypto/tlscreds.h includes GnuTLS headers if CONFIG_GNUTLS is set, but GNUTLS_CFLAGS, that describe include path, are not propagated transitively to all users of crypto and build fails if GnuTLS headers reside in non-standard directory (which is a case for homebrew on Apple Silicon). Signed-off-by: Roman Bolshakov Message-Id: <20210102125213.41279-1-r.bolshakov@yadro.com> Signed-off-by: Paolo Bonzini --- block/meson.build | 2 +- io/meson.build | 2 +- meson.build | 5 +++-- storage-daemon/meson.build | 2 +- tests/meson.build | 6 +++--- ui/meson.build | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/block/meson.build b/block/meson.build index d44c92ab04..eeaefe5809 100644 --- a/block/meson.build +++ b/block/meson.build @@ -40,7 +40,7 @@ block_ss.add(files( 'vmdk.c', 'vpc.c', 'write-threshold.c', -), zstd, zlib) +), zstd, zlib, gnutls) =20 softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c')) =20 diff --git a/io/meson.build b/io/meson.build index bcd8b1e737..bbcd3c53a4 100644 --- a/io/meson.build +++ b/io/meson.build @@ -12,4 +12,4 @@ io_ss.add(files( 'dns-resolver.c', 'net-listener.c', 'task.c', -)) +), gnutls) diff --git a/meson.build b/meson.build index bd4ff3118b..5e95dd6c93 100644 --- a/meson.build +++ b/meson.build @@ -1814,7 +1814,7 @@ blockdev_ss.add(files( 'blockdev-nbd.c', 'iothread.c', 'job-qmp.c', -)) +), gnutls) =20 # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, # os-win32.c does not @@ -1970,6 +1970,7 @@ qmp =3D declare_dependency(link_whole: [libqmp]) =20 libchardev =3D static_library('chardev', chardev_ss.sources() + genh, name_suffix: 'fa', + dependencies: [gnutls], build_by_default: false) =20 chardev =3D declare_dependency(link_whole: libchardev) @@ -2188,7 +2189,7 @@ if have_tools qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), - dependencies: [blockdev, qemuutil], install: true) + dependencies: [blockdev, qemuutil, gnutls], install: true) =20 subdir('storage-daemon') subdir('contrib/rdmacm-mux') diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index c5adce81c3..68852f3d25 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -1,6 +1,6 @@ qsd_ss =3D ss.source_set() qsd_ss.add(files('qemu-storage-daemon.c')) -qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil) +qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls) =20 subdir('qapi') =20 diff --git a/tests/meson.build b/tests/meson.build index 1fa068f27b..29ebaba48d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -159,11 +159,11 @@ if have_block 'CONFIG_POSIX' in config_host tests +=3D { 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', - tasn1, crypto], + tasn1, crypto, gnutls], 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', - tasn1, crypto], + tasn1, crypto, gnutls], 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', - tasn1, io, crypto]} + tasn1, io, crypto, gnutls]} endif if 'CONFIG_AUTH_PAM' in config_host tests +=3D {'test-authz-pam': [authz]} diff --git a/ui/meson.build b/ui/meson.build index 013258a01c..e6655c94a6 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -29,7 +29,7 @@ vnc_ss.add(files( 'vnc-ws.c', 'vnc-jobs.c', )) -vnc_ss.add(zlib, png, jpeg) +vnc_ss.add(zlib, png, jpeg, gnutls) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) softmmu_ss.add_all(when: vnc, if_true: vnc_ss) softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c')) --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473677; cv=none; d=zohomail.com; s=zohoarc; b=fAecCMv06TNY/4S8MLgjgaMF6lUY2Vr1f4VE+nS43MXmHNWVpCVFcwKT9SoTyyuTScbgVzACbxghNPj8LItS0GomBNwh2aglJnL8oORLEjht43z8v5PBLYToaTN56kRkC4qptQJvUGCpK5r+Z1c3Toa9xiQQ4N8gEIzqXGA/1nM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473677; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UJgSKs3atxrFQ5lheIj9vIfMvt45UwLp5jiCMdV8XNA=; b=XP6IcoFaDOEta918BN/rM7wrMx74fZlJslk1SDNvIcmoHGuX9tY7HiLaq9c3Na1TsW8GsHvJ32WEKRa1NDcnAfmo4kjtt3sC0cGmbWV1mZM5skrOCSucTaeoM+lCE1rOiW8EvUpmbTTolMSg+DTglLTlgzqu68KYXVe0YVqXQkg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473677014752.3263359828169; Tue, 12 Jan 2021 09:47:57 -0800 (PST) Received: from localhost ([::1]:44960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNlp-0007iX-PO for importer@patchew.org; Tue, 12 Jan 2021 12:47:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0003hH-Ud for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:09 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:40561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0004uj-1b for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: by mail-ej1-x636.google.com with SMTP id f4so3498515ejx.7 for ; Tue, 12 Jan 2021 09:15:04 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UJgSKs3atxrFQ5lheIj9vIfMvt45UwLp5jiCMdV8XNA=; b=l9RWrsLMs6lnHuDJGfSpw+DgmUsb+v2Prx5Op47XAcXwxm+MkjuLoPKBDah2FZLepc 7aM69iIJ08xt1WA5bSkjaXcgfeBVSEJ320zRjRA4rXUXXHVvBRE4JFMbiGCju2ZbRWU4 bZ6dOP4i+dZrSQl+2w7ttsYf3TVduzsjFHd1MhAf7OAngNmG1P4WsoyMz+My1+4UF5te tZE2xLi4TywU7Sl/m/VuLVEdGZI8doRQw0QPgl0ErfVjWWi0RGVphEh/bRZX+StDdYXo G96BgLeo6m7R2/8eZlHnryC9Nnbn7ijoFfHqgIfd1g2PPIJoACldYHiGdpfyYXEEfgJi 5rNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UJgSKs3atxrFQ5lheIj9vIfMvt45UwLp5jiCMdV8XNA=; b=GydfbxokttEO/pk055T9azUJPQ7hKa+Zy6Br3LwKh8Y+ld+KOn41x8wb7DUYOzUK8k XrwMuSbFIK6osCIgJGiGmLcMAWRUzHKxTD35ngN02AqDh9sRG5K1dbTtO05I3NSbWoXJ +xcBwcc8kOooN8JJqtLTAPQ/UhF9RsYnnCjKXQZdYV3PQ9NVyXo5Qux0nmSw2tvRJJyk pCO8SnEzGm5IAxchrAGaFGyccefmnJHSImqNuSNeomH0/4oAY8rLIKQIh1ffmfKsHWBQ vfL4SLEoa+Ces5zzwoHkqjcqgnz9Bp+jJ8fZk/BQH7gdNQIP6A2ZsAvGRzIspc0FpYo/ u4qQ== X-Gm-Message-State: AOAM533BXlSua/8UwVzZ+LtIP3OqvmW5fkBs0wkjhNwyYO1mGB6H/CRL fr+0dkaS6X/8aMKFpQjl2/Oxcg76zUo/Dw== X-Google-Smtp-Source: ABdhPJyXkMd9ekrgQryqqHU16mMrlcApknrs4DqvykmvKJhDHTn6jsw4jYBhZqPBE84b/oCnuBv5vQ== X-Received: by 2002:a17:907:d25:: with SMTP id gn37mr2854427ejc.381.1610471703868; Tue, 12 Jan 2021 09:15:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/20] virtio-scsi: trace events Date: Tue, 12 Jan 2021 18:14:43 +0100 Message-Id: <20210112171450.791427-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Hannes Reinecke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Hannes Reinecke Add trace events for virtio command and response tracing. Signed-off-by: Hannes Reinecke Message-Id: <20201116183114.55703-2-hare@suse.de> Signed-off-by: Paolo Bonzini --- hw/scsi/trace-events | 9 +++++++++ hw/scsi/virtio-scsi.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events index 9a4a60ca63..0e0aa9847d 100644 --- a/hw/scsi/trace-events +++ b/hw/scsi/trace-events @@ -294,6 +294,15 @@ lsi_awoken(void) "Woken by SIGP" lsi_reg_read(const char *name, int offset, uint8_t ret) "Read reg %s 0x%x = =3D 0x%02x" lsi_reg_write(const char *name, int offset, uint8_t val) "Write reg %s 0x%= x =3D 0x%02x" =20 +# virtio-scsi.c +virtio_scsi_cmd_req(int lun, uint32_t tag, uint8_t cmd) "virtio_scsi_cmd_r= eq lun=3D%u tag=3D0x%x cmd=3D0x%x" +virtio_scsi_cmd_resp(int lun, uint32_t tag, int response, uint8_t status) = "virtio_scsi_cmd_resp lun=3D%u tag=3D0x%x response=3D%d status=3D0x%x" +virtio_scsi_tmf_req(int lun, uint32_t tag, int subtype) "virtio_scsi_tmf_r= eq lun=3D%u tag=3D0x%x subtype=3D%d" +virtio_scsi_tmf_resp(int lun, uint32_t tag, int response) "virtio_scsi_tmf= _resp lun=3D%u tag=3D0x%x response=3D%d" +virtio_scsi_an_req(int lun, uint32_t event_requested) "virtio_scsi_an_req = lun=3D%u event_requested=3D0x%x" +virtio_scsi_an_resp(int lun, int response) "virtio_scsi_an_resp lun=3D%u r= esponse=3D%d" +virtio_scsi_event(int lun, int event, int reason) "virtio_scsi_event lun= =3D%u event=3D%d reason=3D%d" + # scsi-disk.c scsi_disk_check_condition(uint32_t tag, uint8_t key, uint8_t asc, uint8_t = ascq) "Command complete tag=3D0x%x sense=3D%d/%d/%d" scsi_disk_read_complete(uint32_t tag, size_t size) "Data ready tag=3D0x%x = len=3D%zd" diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 3db9a8aae9..9690bc63c8 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -27,6 +27,7 @@ #include "scsi/constants.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" +#include "trace.h" =20 static inline int virtio_scsi_get_lun(uint8_t *lun) { @@ -239,7 +240,11 @@ static void virtio_scsi_cancel_notify(Notifier *notifi= er, void *data) notifier); =20 if (--n->tmf_req->remaining =3D=3D 0) { - virtio_scsi_complete_req(n->tmf_req); + VirtIOSCSIReq *req =3D n->tmf_req; + + trace_virtio_scsi_tmf_resp(virtio_scsi_get_lun(req->req.tmf.lun), + req->req.tmf.tag, req->resp.tmf.respons= e); + virtio_scsi_complete_req(req); } g_free(n); } @@ -273,6 +278,9 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSI= Req *req) req->req.tmf.subtype =3D virtio_tswap32(VIRTIO_DEVICE(s), req->req.tmf.subtype); =20 + trace_virtio_scsi_tmf_req(virtio_scsi_get_lun(req->req.tmf.lun), + req->req.tmf.tag, req->req.tmf.subtype); + switch (req->req.tmf.subtype) { case VIRTIO_SCSI_T_TMF_ABORT_TASK: case VIRTIO_SCSI_T_TMF_QUERY_TASK: @@ -429,11 +437,23 @@ static void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s= , VirtIOSCSIReq *req) virtio_scsi_bad_req(req); return; } else { + req->req.an.event_requested =3D + virtio_tswap32(VIRTIO_DEVICE(s), req->req.an.event_request= ed); + trace_virtio_scsi_an_req(virtio_scsi_get_lun(req->req.an.lun), + req->req.an.event_requested); req->resp.an.event_actual =3D 0; req->resp.an.response =3D VIRTIO_SCSI_S_OK; } } if (r =3D=3D 0) { + if (type =3D=3D VIRTIO_SCSI_T_TMF) + trace_virtio_scsi_tmf_resp(virtio_scsi_get_lun(req->req.tmf.lu= n), + req->req.tmf.tag, + req->resp.tmf.response); + else if (type =3D=3D VIRTIO_SCSI_T_AN_QUERY || + type =3D=3D VIRTIO_SCSI_T_AN_SUBSCRIBE) + trace_virtio_scsi_an_resp(virtio_scsi_get_lun(req->req.an.lun), + req->resp.an.response); virtio_scsi_complete_req(req); } else { assert(r =3D=3D -EINPROGRESS); @@ -469,6 +489,10 @@ static void virtio_scsi_handle_ctrl(VirtIODevice *vdev= , VirtQueue *vq) =20 static void virtio_scsi_complete_cmd_req(VirtIOSCSIReq *req) { + trace_virtio_scsi_cmd_resp(virtio_scsi_get_lun(req->req.cmd.lun), + req->req.cmd.tag, + req->resp.cmd.response, + req->resp.cmd.status); /* Sense data is not in req->resp and is copied separately * in virtio_scsi_command_complete. */ @@ -566,6 +590,8 @@ static int virtio_scsi_handle_cmd_req_prepare(VirtIOSCS= I *s, VirtIOSCSIReq *req) return -EINVAL; } } + trace_virtio_scsi_cmd_req(virtio_scsi_get_lun(req->req.cmd.lun), + req->req.cmd.tag, req->req.cmd.cdb[0]); =20 d =3D virtio_scsi_device_get(s, req->req.cmd.lun); if (!d) { @@ -767,6 +793,8 @@ void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *= dev, } evt->lun[3] =3D dev->lun & 0xFF; } + trace_virtio_scsi_event(virtio_scsi_get_lun(evt->lun), event, reason); + =20 virtio_scsi_complete_req(req); } =20 --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472427; cv=none; d=zohomail.com; s=zohoarc; b=AHMcO6ETzs+pSHT4fZPk7Q1HO5uKVmBc4vY0iv3FA3ZDpjJuKMrvVTubxGvQZgZ1RIvtYeuIEuWehDp0cESg7sgRdDZn2UUNwzRL+r3B1DLrDBy3msuPNlgZZUzqBEfCt+IEgOGsJZgtKEtvtkSTDWGvtrezoEkQx8VeIj1DVaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472427; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yU3DWehqSKIeVr/KsiVg9solrgmhBRL/G+zOPd0pjuU=; b=HCYFKkajJvWTzx70H/CPw2vE0YkDxkClWgmz/9YlE5A6WPKhykb3bFDeUhLLe0L1MRQtlTJXqtkfkwGN8N7fhXC1IdvejJK/ZAqzT4SUUO+W/1nM5VWmh3c4yFImrlGq0i90R/m0IUNer4QtgKb6t6sNdLepmFl4qWWua0PftAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610472427733378.55621452703497; Tue, 12 Jan 2021 09:27:07 -0800 (PST) Received: from localhost ([::1]:47218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNRi-0000nx-Dz for importer@patchew.org; Tue, 12 Jan 2021 12:27:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0003gp-Nt for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:45882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0004ur-0x for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:08 -0500 Received: by mail-ej1-x62a.google.com with SMTP id e18so3129692ejt.12 for ; Tue, 12 Jan 2021 09:15:05 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yU3DWehqSKIeVr/KsiVg9solrgmhBRL/G+zOPd0pjuU=; b=mw4RwrH+o2U9FSieWzvt79uGPHS+L4k5B7RQExAEMSIqfLXDarczhPjie59kSUEKwH kzC/ahp61RF0CKrUmyHWTJBJ281J8NXpKhSTpNmkKdtTlxGXA3wn8lqDjRnHwEXbH5cf Rlt/gJSHGJ/HKl8ITKKcHe6ZOdkCnUYtXtSF0VqAWomjNVfVno6440ZTAPnHw74jGXJG J3WQ4vvcnqlwSMsAi8kOiDwI55cG71cZv7q4NXt68iTIX80sH+3kngD8Bwk1tKzoUyV7 BQqjkyNFRDPVZBzrKDkG3YP/pdT87ak1QulyGrQNZf/yaZfHMCZfzz+tsQFOV1wCrIxC EW8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yU3DWehqSKIeVr/KsiVg9solrgmhBRL/G+zOPd0pjuU=; b=QFKlxeSnUiDXNj5FtKhSEKYZMbPUizVcw/6VxIDNWXTunkvYYbomZr3/m6RvRvplsu coKOpqlJJLDhKAUQemAojsI3i/lP7+mAI8Gtss3UWDOOYGzRK0YAXmJMDPG1yw3kHSYR Mwh5W8SjDTD62/4b+kyXFP2R8sKkaZHqQo6LmQN4VmjuooLOFX7E8Ix3KZq21QhogHwI YyG6k3cSDoDch99hQRRibMOjDlijpuPGbWFoOqK5EwdR2pVIv4JanLI1OfwPpb5De5NQ WcfL/DCf9z8nplP394nMopKoOHk8DmWRr8QU9GUsw8MIbocKP0ISX2AXU7p+pgtehj8V q+BQ== X-Gm-Message-State: AOAM531LoUHNM5OTLT3nSTkTjguxir/ARzOB4v8xodsKwHw/qt82eP2h E209cfL6/Ovc4j9CNDGWEP69bU0yiMXIGg== X-Google-Smtp-Source: ABdhPJxgyPrEbDkmegZldmkbJGB7xOs+5QUSkSObyzKNkLEcJE9NDoCQ33Ou+fMt7EQhovuHIzVJhw== X-Received: by 2002:a17:906:d81:: with SMTP id m1mr3986125eji.550.1610471704771; Tue, 12 Jan 2021 09:15:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/20] cocoa: do not enable coreaudio automatically Date: Tue, 12 Jan 2021 18:14:44 +0100 Message-Id: <20210112171450.791427-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove the automagic connection between --enable-cocoa and enabling coreaudio in audio_drv_list. It can be overridden anyway just by placing --enable-cocoa before --audio-drv-list. Signed-off-by: Paolo Bonzini --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index 5860bdb77b..10f43d59fe 100755 --- a/configure +++ b/configure @@ -1149,9 +1149,7 @@ for opt do ;; --disable-cocoa) cocoa=3D"disabled" ;; - --enable-cocoa) - cocoa=3D"enabled" ; - audio_drv_list=3D"coreaudio $(echo $audio_drv_list | sed s,coreaudio= ,,g)" + --enable-cocoa) cocoa=3D"enabled" ;; --disable-system) softmmu=3D"no" ;; --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610474564; cv=none; d=zohomail.com; s=zohoarc; b=S4lmGMFosLu4QRDWQM45+teOdjKfo/n8SqmT0XXwvHQLzkOQALP3fip8kwgpSapsWAdAT1uxF5Xlk7CTS5rbDTmbCu7v+WBDANrR2nO5lHYRTVMLc1e+RfrHlF9s3S6zQgat4Halg9qbrSY+xXM6cS6zBRMQyMT7HBGqWmI8mK4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610474564; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vng/gx8rorkYn09/0oPlMUpi1vFh/6zPInpLmXGfoHA=; b=JqcN0S2Cq30YNT3+5ijP1azxRTGBSsbo4fWq4oSb+xW7HeavAC4dRBDUCQzIeVewrOWVxTNUcfORFkoXe6GSyECTvnVltCx3I6J0Nok75IMBANF0wM4IpDVtasst+z9ZEyD7O0nmRIHPUXsIhfpVHVh/Fg8GMXdNpraL0sxts5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610474564958375.2782491671617; Tue, 12 Jan 2021 10:02:44 -0800 (PST) Received: from localhost ([::1]:47632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzO0B-0004P8-Ij for importer@patchew.org; Tue, 12 Jan 2021 13:02:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNG9-0003i5-Cb for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:09 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:34009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG6-0004v1-Ns for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:09 -0500 Received: by mail-ej1-x62e.google.com with SMTP id g20so4628507ejb.1 for ; Tue, 12 Jan 2021 09:15:06 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vng/gx8rorkYn09/0oPlMUpi1vFh/6zPInpLmXGfoHA=; b=kxoLtdFun8+jSvzUA9h+TXqKf3u3oWxlCD0f8QurYXNDMykGeVKyl1NMT677D4mcCb wrrjKPcqWBc9+Mgn50Y2ATNayhqc3BvBHwOvjeuPF6coPM1SBOCriiZ0bCuu+84U6bqh F+h2A+4F4PLxI8KwEkkk2J93YVWGw5dj3/e3U6KCtdSDMpIOd8/ghAZrNYK2b1KicdtM 0nIACEkGMCt+k6ttdDw3x675I0rmq4V4+wgL3dvBGIQ22Uf7pVfdETuK27fkE80p6MDs PznBO/95k0urfuTbD/qL8QDkPbXWkH9wi3FnDpkTHZWitGK4aT3GmDEb+7u53Wsrj1gw 0UKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vng/gx8rorkYn09/0oPlMUpi1vFh/6zPInpLmXGfoHA=; b=noKlV9xK0ZOYoHczeMqXFV63VGtGFC4A6Dz8P2A8WPeq+fcMQxYX3r1iM7Z+udYyhL adW+u1UoHqPvBs2McUCQ2jAN7Zw/OQyHkrFiArPoDOVlglSJMHjgzsTSgxPPxMa5nwaY B30ZjQ/iwT6DTCiJWMT1WSP7DzY1sUV26xri4vahz3Sw9y/OiceU1o5bIHnsTd2jBJAb v6MBzPumsIEQddU5LTWbc31AzrHtsuvMMeKhchaqxNQS0cWS5wpNxNv15z98qQbfpdpg CN17q8XrjPxknxG7CL5LSzIt5r+N6kHF9eW+bG+jrxJ7sGVnauDUu7IkSed7R6ACFKXz lOSA== X-Gm-Message-State: AOAM532Ev8fAWLaGlrURwDI+WWub5Bl1ooQCU9etpsG/3kT08DKoMH+8 52McAb8jepy9X1g1NUK3qg4rCjAmHyOCcA== X-Google-Smtp-Source: ABdhPJwLm8ye7/pWW5xxBav/vIPI9vMXG+7Wnz1V7qIyfIXZuWyWJM7LHrw1aTLA8Jc+3FL3Exqrvw== X-Received: by 2002:a17:906:2087:: with SMTP id 7mr2555431ejq.232.1610471705547; Tue, 12 Jan 2021 09:15:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/20] gtk: remove CONFIG_GTK_GL Date: Tue, 12 Jan 2021 18:14:45 +0100 Message-Id: <20210112171450.791427-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" CONFIG_GTK_GL is defined if OpenGL is present and GTK+ is 3.16 or newer. Since GTK+ 3.22 is the minimum supported version, just use CONFIG_OPENGL instead. Signed-off-by: Paolo Bonzini --- configure | 7 ------- meson.build | 1 - ui/gtk.c | 16 ++++++++-------- ui/meson.build | 3 +-- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 10f43d59fe..f3877c2efd 100755 --- a/configure +++ b/configure @@ -415,7 +415,6 @@ cfi_debug=3D"false" seccomp=3D"auto" glusterfs=3D"auto" gtk=3D"$default_feature" -gtk_gl=3D"no" tls_priority=3D"NORMAL" gnutls=3D"$default_feature" nettle=3D"$default_feature" @@ -3626,9 +3625,6 @@ if test "$opengl" !=3D "no" ; then opengl_cflags=3D"$($pkg_config --cflags $opengl_pkgs)" opengl_libs=3D"$($pkg_config --libs $opengl_pkgs)" opengl=3Dyes - if test "$gtk" =3D "yes" && $pkg_config --exists "$gtkpackage >=3D 3.1= 6"; then - gtk_gl=3D"yes" - fi else if test "$opengl" =3D "yes" ; then feature_not_found "opengl" "Please install opengl (mesa) devel pkgs:= $opengl_pkgs" @@ -5781,9 +5777,6 @@ if test "$gtk" =3D "yes" ; then echo "CONFIG_GTK=3Dy" >> $config_host_mak echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_host_mak echo "GTK_LIBS=3D$gtk_libs" >> $config_host_mak - if test "$gtk_gl" =3D "yes" ; then - echo "CONFIG_GTK_GL=3Dy" >> $config_host_mak - fi fi if test "$gio" =3D "yes" ; then echo "CONFIG_GIO=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index 5e95dd6c93..98930bca38 100644 --- a/meson.build +++ b/meson.build @@ -2338,7 +2338,6 @@ summary_info +=3D {'SDL support': sdl.found()} summary_info +=3D {'SDL image support': sdl_image.found()} # TODO: add back version summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} -summary_info +=3D {'GTK GL support': config_host.has_key('CONFIG_GTK_GL= ')} summary_info +=3D {'pixman': pixman.found()} # TODO: add back version summary_info +=3D {'VTE support': config_host.has_key('CONFIG_VTE')} diff --git a/ui/gtk.c b/ui/gtk.c index a752aa22be..e8474456df 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -396,7 +396,7 @@ static void gd_update_full_redraw(VirtualConsole *vc) int ww, wh; ww =3D gdk_window_get_width(gtk_widget_get_window(area)); wh =3D gdk_window_get_height(gtk_widget_get_window(area)); -#if defined(CONFIG_GTK_GL) +#if defined(CONFIG_OPENGL) if (vc->gfx.gls && gtk_use_gl_area) { gtk_gl_area_queue_render(GTK_GL_AREA(vc->gfx.drawing_area)); return; @@ -625,7 +625,7 @@ static const DisplayChangeListenerOps dcl_ops =3D { =20 /** DisplayState Callbacks (opengl version) **/ =20 -#if defined(CONFIG_GTK_GL) +#if defined(CONFIG_OPENGL) =20 static const DisplayChangeListenerOps dcl_gl_area_ops =3D { .dpy_name =3D "gtk-egl", @@ -644,7 +644,7 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = =3D { .dpy_gl_update =3D gd_gl_area_scanout_flush, }; =20 -#endif /* CONFIG_GTK_GL */ +#endif /* CONFIG_OPENGL */ =20 static const DisplayChangeListenerOps dcl_egl_ops =3D { .dpy_name =3D "gtk-egl", @@ -725,7 +725,7 @@ static void gd_set_ui_info(VirtualConsole *vc, gint wid= th, gint height) dpy_set_ui_info(vc->gfx.dcl.con, &info); } =20 -#if defined(CONFIG_GTK_GL) +#if defined(CONFIG_OPENGL) =20 static gboolean gd_render_event(GtkGLArea *area, GdkGLContext *context, void *opaque) @@ -1865,7 +1865,7 @@ static void gd_connect_vc_gfx_signals(VirtualConsole = *vc) { g_signal_connect(vc->gfx.drawing_area, "draw", G_CALLBACK(gd_draw_event), vc); -#if defined(CONFIG_GTK_GL) +#if defined(CONFIG_OPENGL) if (gtk_use_gl_area) { /* wire up GtkGlArea events */ g_signal_connect(vc->gfx.drawing_area, "render", @@ -1992,12 +1992,12 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, V= irtualConsole *vc, =20 #if defined(CONFIG_OPENGL) if (display_opengl) { -#if defined(CONFIG_GTK_GL) +#if defined(CONFIG_OPENGL) if (gtk_use_gl_area) { vc->gfx.drawing_area =3D gtk_gl_area_new(); vc->gfx.dcl.ops =3D &dcl_gl_area_ops; } else -#endif /* CONFIG_GTK_GL */ +#endif /* CONFIG_OPENGL */ { vc->gfx.drawing_area =3D gtk_drawing_area_new(); /* @@ -2314,7 +2314,7 @@ static void early_gtk_display_init(DisplayOptions *op= ts) assert(opts->type =3D=3D DISPLAY_TYPE_GTK); if (opts->has_gl && opts->gl !=3D DISPLAYGL_MODE_OFF) { #if defined(CONFIG_OPENGL) -#if defined(CONFIG_GTK_GL) && defined(GDK_WINDOWING_WAYLAND) +#if defined(GDK_WINDOWING_WAYLAND) if (GDK_IS_WAYLAND_DISPLAY(gdk_display_get_default())) { gtk_use_gl_area =3D true; gtk_gl_area_init(); diff --git a/ui/meson.build b/ui/meson.build index e6655c94a6..bd2b920504 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -63,8 +63,7 @@ if config_host.has_key('CONFIG_GTK') gtk_ss =3D ss.source_set() gtk_ss.add(gtk, vte, pixman, files('gtk.c')) gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) - gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c')) - gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.= c')) + gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c', = 'gtk-gl-area.c')) ui_modules +=3D {'gtk' : gtk_ss} endif =20 --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473136; cv=none; d=zohomail.com; s=zohoarc; b=ipBdjrba79atkBPFKIhZGj4Nrdkz06B/5YL7jnh4lxOGtOE59eU6ddSkVyIjHEeX47WRGoxwvgJ6Tgs2sOZnoYKtezhGjiRkNE6y4FOjTuQ1q48lHeDO5yStbtImxdkqBAD/sruQe37N3K6bUI+fau8hx6nFVvSa+0r10xKnmWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473136; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cfL8i8chFGXTWzbKyWbwzxPKvNWbZFSzYIWXHnLcdJY=; b=VKw9tQjPpj8ACsHKBIoBUVIxCrEIz9PyMi75HT0RjG68XxX9iXjD+bnVPYAd6IvqjBKf+VD8CRYNgoTYhqaz8sb6uvH0xJ3HsvBAJfM6nuZnEfqNlt2RX4fw0cOmiRh1kChZXBxnJ25saWiBq7Z9DJF2l4OH1TSWZC2wITNoBNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473136778337.0676714986091; Tue, 12 Jan 2021 09:38:56 -0800 (PST) Received: from localhost ([::1]:48568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNd8-0005Ih-Gk for importer@patchew.org; Tue, 12 Jan 2021 12:38:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNGA-0003jm-Bc for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:10 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:40671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG7-0004w8-LK for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:10 -0500 Received: by mail-ed1-x52f.google.com with SMTP id h16so3156108edt.7 for ; Tue, 12 Jan 2021 09:15:07 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cfL8i8chFGXTWzbKyWbwzxPKvNWbZFSzYIWXHnLcdJY=; b=sOiSDPbHgsi1Ke9Xs6kfFf0qGIwxgYg9iQ+4H+Ku/yDCqdFcmD//y2wsKcAJ76go1B bZGJxlalxF0gA9ulqbXllEjJlT/24vEZ8wp1mwcd730tLw7tUUJ0h8cto+UXz8WYeWMQ gP5PQ8jxYj/gykmibtZhMHBN76XwIhbF+WXm2wnVxFXL1EL+JWntZwc5Tw+s/9PJIDyW J21PP6UJtp7Kn6307I8TEOJNyo0fBUsYpJBDP+JDOnEtt7l199a6cfhhhykbFC5nhjJl 7ePIKpDHEOJLb9KGCZdXilHeUVYugF6fIX1UUqiOluJrchyTMEtQanyWZi8eKfsOe1pT v7wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cfL8i8chFGXTWzbKyWbwzxPKvNWbZFSzYIWXHnLcdJY=; b=UAevTcRjZDc7AfxsjsXyszG7n4siirLGNOfd7AIwCcQSfzNpKCBh+8Sq4srsFZBW+q q+RKST2bEuZJNs1f2XskSLwJIETvmvPJoyfRd/FBb7UJH5/NVdcdc7xlMTKfnWoYEO0w 6OidFKIccVElgAOLXdiSLMuAQuTGEKufJQTLQl71DxezC3YUQhZ15/HApvPVoDD6cw9F rTYbtckTWQs7lkY3KLC8aPibt8uy64ldktn2b94A4LIMOyqTIO0JUk8NRKKV1K1coUNw Gx/RnAQkYr9/3DSm8Hvvo2ycAeIFZOpkcXfz8JfhGe32cNTVCs5caN2LX6OJlm/H6W4x usug== X-Gm-Message-State: AOAM532z0lisFFWvb+IJcRWZjSIkGnbDMByaJJ0vGJ832QIp8AQPLmAZ gJFxI54iFTOKKliPnGlgiSF+nySBKcm7sQ== X-Google-Smtp-Source: ABdhPJxTuNI75k3I0V9jqpADJ8oEQDPdg9mi5uusKkloVVs/wlK/N7Si/ThNIbtlJVNlzzt78Vgj8Q== X-Received: by 2002:a05:6402:310f:: with SMTP id dc15mr110287edb.225.1610471706353; Tue, 12 Jan 2021 09:15:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/20] configure: move X11 detection to Meson Date: Tue, 12 Jan 2021 18:14:46 +0100 Message-Id: <20210112171450.791427-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" For now move the logic verbatim. GTK+ actually has a hard requirement on X11 if gtk+x11 is present, but we will sort that out later. Signed-off-by: Paolo Bonzini --- configure | 14 ++------------ meson.build | 9 +++++---- ui/meson.build | 4 ++-- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/configure b/configure index f3877c2efd..ec0639387d 100755 --- a/configure +++ b/configure @@ -2759,14 +2759,6 @@ EOF fi fi =20 -########################################## -# X11 probe -if $pkg_config --exists "x11"; then - have_x11=3Dyes - x11_cflags=3D$($pkg_config --cflags x11) - x11_libs=3D$($pkg_config --libs x11) -fi - ########################################## # GTK probe =20 @@ -5681,10 +5673,8 @@ fi if test "$module_upgrades" =3D "yes"; then echo "CONFIG_MODULE_UPGRADES=3Dy" >> $config_host_mak fi -if test "$have_x11" =3D "yes" && test "$need_x11" =3D "yes"; then - echo "CONFIG_X11=3Dy" >> $config_host_mak - echo "X11_CFLAGS=3D$x11_cflags" >> $config_host_mak - echo "X11_LIBS=3D$x11_libs" >> $config_host_mak +if test "$need_x11" =3D "yes"; then + echo "CONFIG_NEED_X11=3Dy" >> $config_host_mak fi if test "$pipe2" =3D "yes" ; then echo "CONFIG_PIPE2=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index 98930bca38..e673c1578a 100644 --- a/meson.build +++ b/meson.build @@ -787,9 +787,9 @@ if 'CONFIG_VTE' in config_host link_args: config_host['VTE_LIBS'].split()) endif x11 =3D not_found -if 'CONFIG_X11' in config_host - x11 =3D declare_dependency(compile_args: config_host['X11_CFLAGS'].split= (), - link_args: config_host['X11_LIBS'].split()) +if config_host.has_key('CONFIG_NEED_X11') + x11 =3D dependency('x11', method: 'pkg-config', required: false, + static: enable_static) endif vnc =3D not_found png =3D not_found @@ -1085,6 +1085,7 @@ config_host_data.set('CONFIG_STATX', has_statx) config_host_data.set('CONFIG_ZSTD', zstd.found()) config_host_data.set('CONFIG_FUSE', fuse.found()) config_host_data.set('CONFIG_FUSE_LSEEK', fuse_lseek.found()) +config_host_data.set('CONFIG_X11', x11.found()) config_host_data.set('CONFIG_CFI', get_option('cfi')) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) @@ -1171,7 +1172,7 @@ host_kconfig =3D \ ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=3Dy'] : []) + \ ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=3Dy'] : []) + \ - ('CONFIG_X11' in config_host ? ['CONFIG_X11=3Dy'] : []) + \ + (x11.found() ? ['CONFIG_X11=3Dy'] : []) + \ ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=3Dy'] : []) + \ ('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=3Dy'] : []) + \ ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=3Dy'] : []= ) + \ diff --git a/ui/meson.build b/ui/meson.build index bd2b920504..cc764e1bd1 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -62,7 +62,7 @@ if config_host.has_key('CONFIG_GTK') =20 gtk_ss =3D ss.source_set() gtk_ss.add(gtk, vte, pixman, files('gtk.c')) - gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + gtk_ss.add(when: x11, if_true: files('x_keymap.c')) gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c', = 'gtk-gl-area.c')) ui_modules +=3D {'gtk' : gtk_ss} endif @@ -77,7 +77,7 @@ if sdl.found() 'sdl2.c', )) sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c')) - sdl_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) + sdl_ss.add(when: x11, if_true: files('x_keymap.c')) ui_modules +=3D {'sdl' : sdl_ss} endif =20 --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473878; cv=none; d=zohomail.com; s=zohoarc; b=fiLN8PWOOhnLNiRQTIVeVgqsZrJNcQ6Oj5dkrpwHbpJZmVv2Y5scMUkcjV0057sJKkDoZ3J7REyCq7Sgvfmv0oAW3z1vdLvZrnZAQbHW8XKYn19Ud989sV1aXBtqxPpkr79mdvYRTPOFDKQp4Y4Z6PuJBlZ0t2EUsSb3WdJmCaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473878; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cJU4WwljxqwCgLmkc8zTONOLaKiVm4YNhLqB26UAGWk=; b=Eh4DQfTKlZP3lsF8RE7/XHSvm/jNcPGW1WEfgZGIbrO+JddwyZrt3FeBRWLDhCHV5APHGhXmctmv32EcTntdMlEoHNNVdE5KVVbqba27+wAJZRurLY0p4giP489rQPQ91WiEoA7ZLwyYlIO8ZAJRvPkEpUKD5kLrhmI9s5cV6LA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473878572449.2867657227288; Tue, 12 Jan 2021 09:51:18 -0800 (PST) Received: from localhost ([::1]:52918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNp7-0002fX-B0 for importer@patchew.org; Tue, 12 Jan 2021 12:51:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNGA-0003kf-PN for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:10 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:41323) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG8-0004wR-Kp for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:10 -0500 Received: by mail-ej1-x629.google.com with SMTP id g12so2413856ejf.8 for ; Tue, 12 Jan 2021 09:15:08 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cJU4WwljxqwCgLmkc8zTONOLaKiVm4YNhLqB26UAGWk=; b=eB11M9vdduODb+X5OS3t4WRCeuDuOpSrlVgDYhSVLMVFlrnUrEknoMOJ6f/8SkaJ24 FarHQTfrY7jnppltjnRnmPZhqwPoh6Z+XBAN26RviZr+KHTjPFHvQOOQ+AtSSj3Cikus mfWOTZI/Kg4xts+stxhPYibcN0p1TylMqRgeM+HeSdm51DSQmybf16NDJjHU2T/KLZrW bAHsR8I4+9rH8gUH2SWf54aVvxhM440YvfSHkrNeISxI57y1nyi/3lBYE/qz+aGvM+2q NrjMoNf82k2xXtkj+lKP/6mYqE2W7PRGdhPcNNIhGgREM/qbvwssXRxpvXzWSTnDZYWJ ix5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cJU4WwljxqwCgLmkc8zTONOLaKiVm4YNhLqB26UAGWk=; b=H/U2inBMo1/b3N+ZE3K0dp8tCuqBk3Iem32Vj0AN0JrlNCGTbEIHARhwG4wZpP6xcg J9fg2ZrpTmm+OlqxaTOnVyxZMIB7Ixjwp5XxPTNZhTlVhoCT6rizCDWmTqpJyxgu4aqu Tv5k6k1ieGlDEyXbNq5MByEPMiNQ0kOXHqk4zNBVethu9A+nu4nCMIW2HJAP1daGVTGt T6EotCnx3h3374jjkfvTh2xfyuBGP0FG9aaSohNAq3yr9FOhnx54ZApngtXUAYD0EjZL WYAuAA3p31vZ3D7eRfB1YVcwJDTn2VvdeRUF7XNhyh9lAxCyUCmyZlAGuST9UJyrIOK+ xO7A== X-Gm-Message-State: AOAM530srxWlYJ2e2aH8Blh3fEAzxgmNH4MJf5b+WIE915Rgc1cmHunD 8nwXkOF3Lude1wnAe5g04JK+omCPacvv1A== X-Google-Smtp-Source: ABdhPJzVfo3u91cFN6ErbK7DVwN9S1tbrebAxW08pKwFyfBG3/bRWfysdYhhiZZcvDqqZTIJgyxKsw== X-Received: by 2002:a17:906:3fc1:: with SMTP id k1mr4092016ejj.58.1610471707223; Tue, 12 Jan 2021 09:15:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/20] configure: move GTK+ detection to Meson Date: Tue, 12 Jan 2021 18:14:47 +0100 Message-Id: <20210112171450.791427-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This also allows removing CONFIG_NEED_X11, all the ingredients can be computed easily in meson.build. Signed-off-by: Paolo Bonzini --- configure | 55 ++++++----------------------------------------- meson.build | 29 ++++++++++++++++++------- meson_options.txt | 2 ++ ui/meson.build | 2 +- 4 files changed, 30 insertions(+), 58 deletions(-) diff --git a/configure b/configure index ec0639387d..d70448f495 100755 --- a/configure +++ b/configure @@ -414,7 +414,7 @@ cfi=3D"false" cfi_debug=3D"false" seccomp=3D"auto" glusterfs=3D"auto" -gtk=3D"$default_feature" +gtk=3D"auto" tls_priority=3D"NORMAL" gnutls=3D"$default_feature" nettle=3D"$default_feature" @@ -1377,9 +1377,9 @@ for opt do --enable-uuid|--disable-uuid) echo "$0: $opt is obsolete, UUID support is always built" >&2 ;; - --disable-gtk) gtk=3D"no" + --disable-gtk) gtk=3D"disabled" ;; - --enable-gtk) gtk=3D"yes" + --enable-gtk) gtk=3D"enabled" ;; --tls-priority=3D*) tls_priority=3D"$optarg" ;; @@ -2329,10 +2329,10 @@ if test "$cocoa" =3D "enabled"; then if test "$sdl" =3D "enabled"; then error_exit "Cocoa and SDL UIs cannot both be enabled at once" fi - if test "$gtk" =3D "yes"; then + if test "$gtk" =3D "enabled"; then error_exit "Cocoa and GTK UIs cannot both be enabled at once" fi - gtk=3Dno + gtk=3Ddisabled sdl=3Ddisabled fi =20 @@ -2759,31 +2759,6 @@ EOF fi fi =20 -########################################## -# GTK probe - -if test "$gtk" !=3D "no"; then - gtkpackage=3D"gtk+-3.0" - gtkx11package=3D"gtk+-x11-3.0" - gtkversion=3D"3.22.0" - if $pkg_config --exists "$gtkpackage >=3D $gtkversion"; then - gtk_cflags=3D$($pkg_config --cflags $gtkpackage) - gtk_libs=3D$($pkg_config --libs $gtkpackage) - gtk_version=3D$($pkg_config --modversion $gtkpackage) - if $pkg_config --exists "$gtkx11package >=3D $gtkversion"; then - need_x11=3Dyes - gtk_cflags=3D"$gtk_cflags $x11_cflags" - gtk_libs=3D"$gtk_libs $x11_libs" - fi - gtk=3D"yes" - elif test "$gtk" =3D "yes"; then - feature_not_found "gtk" "Install gtk3-devel" - else - gtk=3D"no" - fi -fi - - ########################################## # GNUTLS probe =20 @@ -3640,16 +3615,6 @@ EOF fi fi =20 -if test "$opengl" =3D "yes" && test "$have_x11" =3D "yes"; then - for target in $target_list; do - case $target in - lm32-softmmu) # milkymist-tmu2 requires X11 and OpenGL - need_x11=3Dyes - ;; - esac - done -fi - ########################################## # libxml2 probe if test "$libxml2" !=3D "no" ; then @@ -5673,9 +5638,6 @@ fi if test "$module_upgrades" =3D "yes"; then echo "CONFIG_MODULE_UPGRADES=3Dy" >> $config_host_mak fi -if test "$need_x11" =3D "yes"; then - echo "CONFIG_NEED_X11=3Dy" >> $config_host_mak -fi if test "$pipe2" =3D "yes" ; then echo "CONFIG_PIPE2=3Dy" >> $config_host_mak fi @@ -5763,11 +5725,6 @@ fi if test "$bswap_h" =3D "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_host_mak fi -if test "$gtk" =3D "yes" ; then - echo "CONFIG_GTK=3Dy" >> $config_host_mak - echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_host_mak - echo "GTK_LIBS=3D$gtk_libs" >> $config_host_mak -fi if test "$gio" =3D "yes" ; then echo "CONFIG_GIO=3Dy" >> $config_host_mak echo "GIO_CFLAGS=3D$gio_cflags" >> $config_host_mak @@ -6501,7 +6458,7 @@ NINJA=3D$ninja $meson setup \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim -Dsparse=3D$sparse= \ -Dkvm=3D$kvm -Dhax=3D$hax -Dwhpx=3D$whpx -Dhvf=3D$hvf \ -Dxen=3D$xen -Dxen_pci_passthrough=3D$xen_pci_passthrough -Dtcg=3D= $tcg \ - -Dcocoa=3D$cocoa -Dmpath=3D$mpath -Dsdl=3D$sdl -Dsdl_image=3D$sdl_= image \ + -Dcocoa=3D$cocoa -Dgtk=3D$gtk -Dmpath=3D$mpath -Dsdl=3D$sdl -Dsdl_= image=3D$sdl_image \ -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg -Dvnc_p= ng=3D$vnc_png \ -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f -Dvirti= ofsd=3D$virtiofsd \ -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt -Dbrlapi=3D$b= rlapi \ diff --git a/meson.build b/meson.build index e673c1578a..73d3cc5385 100644 --- a/meson.build +++ b/meson.build @@ -776,19 +776,31 @@ if 'CONFIG_OPENGL' in config_host opengl =3D declare_dependency(compile_args: config_host['OPENGL_CFLAGS']= .split(), link_args: config_host['OPENGL_LIBS'].split(= )) endif + gtk =3D not_found -if 'CONFIG_GTK' in config_host - gtk =3D declare_dependency(compile_args: config_host['GTK_CFLAGS'].split= (), - link_args: config_host['GTK_LIBS'].split()) +gtkx11 =3D not_found +if not get_option('gtk').auto() or have_system + gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', + method: 'pkg-config', + required: get_option('gtk'), + static: enable_static) + if gtk.found() + gtkx11 =3D dependency('gtk+-x11-3.0', version: '>=3D3.22.0', + method: 'pkg-config', + required: false, + static: enable_static) + gtk =3D declare_dependency(dependencies: [gtk, gtkx11]) + endif endif + vte =3D not_found if 'CONFIG_VTE' in config_host vte =3D declare_dependency(compile_args: config_host['VTE_CFLAGS'].split= (), link_args: config_host['VTE_LIBS'].split()) endif x11 =3D not_found -if config_host.has_key('CONFIG_NEED_X11') - x11 =3D dependency('x11', method: 'pkg-config', required: false, +if gtkx11.found() or 'lm32-softmmu' in target_dirs + x11 =3D dependency('x11', method: 'pkg-config', required: gtkx11.found(), static: enable_static) endif vnc =3D not_found @@ -1062,6 +1074,7 @@ if glusterfs.found() config_host_data.set('CONFIG_GLUSTERFS_FTRUNCATE_HAS_STAT', glusterfs_ft= runcate_has_stat) config_host_data.set('CONFIG_GLUSTERFS_IOCB_HAS_STAT', glusterfs_iocb_ha= s_stat) endif +config_host_data.set('CONFIG_GTK', gtk.found()) config_host_data.set('CONFIG_LIBATTR', have_old_libattr) config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found()) config_host_data.set('CONFIG_LIBISCSI', libiscsi.found()) @@ -2230,7 +2243,7 @@ subdir('tools') subdir('pc-bios') subdir('docs') subdir('tests') -if 'CONFIG_GTK' in config_host +if gtk.found() subdir('po') endif =20 @@ -2247,7 +2260,7 @@ if host_machine.system() =3D=3D 'windows' if build_docs nsis_cmd +=3D '-DCONFIG_DOCUMENTATION=3Dy' endif - if 'CONFIG_GTK' in config_host + if gtk.found() nsis_cmd +=3D '-DCONFIG_GTK=3Dy' endif =20 @@ -2338,7 +2351,7 @@ endif summary_info +=3D {'SDL support': sdl.found()} summary_info +=3D {'SDL image support': sdl_image.found()} # TODO: add back version -summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} +summary_info +=3D {'GTK support': gtk.found()} summary_info +=3D {'pixman': pixman.found()} # TODO: add back version summary_info +=3D {'VTE support': config_host.has_key('CONFIG_VTE')} diff --git a/meson_options.txt b/meson_options.txt index 7948a8255c..72a3ca22d6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -74,6 +74,8 @@ option('lzo', type : 'feature', value : 'auto', description: 'lzo compression support') option('rbd', type : 'feature', value : 'auto', description: 'Ceph block device driver') +option('gtk', type : 'feature', value : 'auto', + description: 'GTK+ user interface') option('sdl', type : 'feature', value : 'auto', description: 'SDL user interface') option('sdl_image', type : 'feature', value : 'auto', diff --git a/ui/meson.build b/ui/meson.build index cc764e1bd1..634fabab0d 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -57,7 +57,7 @@ if config_host.has_key('CONFIG_OPENGL_DMABUF') ui_modules +=3D {'egl-headless' : egl_headless_ss} endif =20 -if config_host.has_key('CONFIG_GTK') +if gtk.found() softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) =20 gtk_ss =3D ss.source_set() --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610474734; cv=none; d=zohomail.com; s=zohoarc; b=McWDw5At5VD7K/MYFRjkJw7sPAvuyh9omwu/dKbRkdVPmgEG+wvbRN9qpFXRYSreurcTFq6Q9iRZ0CLVMGIdhm8JcaQrQ/nuav1HFpDOgVRZw0yPc+2BF6WIsaAxdXcuVrkRWmLPCsYz4EnSS6EDjT6t39mvwRFXeVTJvHF8Deg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610474734; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eZaTIQlxze6jxuscVM9IFMWchHxN6YoRJgbnAqKImvc=; b=bbiF9pjfMntND6iKQpmISXzeEJgplzEt9wKVNEVNwsEPIrvi6BmuQjv3aSf09sG5ngL/ehHL32ybwbDUWrwQzZ1+aarjAklduKjjR45OPvGa7X03SCsIHlAHKx2tPsvPPmw8KvBuh2TbjEDWAqdDM43vF6dWHN9A+CYiz6SaOQo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610474734724153.88635700708687; Tue, 12 Jan 2021 10:05:34 -0800 (PST) Received: from localhost ([::1]:50824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzO2v-0005xV-6r for importer@patchew.org; Tue, 12 Jan 2021 13:05:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNGB-0003lB-Of for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:12 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:45884) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNG9-0004wd-E2 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:11 -0500 Received: by mail-ej1-x62b.google.com with SMTP id e18so3129982ejt.12 for ; Tue, 12 Jan 2021 09:15:08 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eZaTIQlxze6jxuscVM9IFMWchHxN6YoRJgbnAqKImvc=; b=mSyeEFWc0KZhIDDK5j71ebjTKl1MPiun6suydOHLLrBfYpcxCgTBbeFm5AV+7AcYQS z3yLQi93SRGNaa3rg8mmp+kRSc0wsDiQ6S/5/hrZRXRCB/1yrkAiYlx/iu5iHKTNbdgk IR6mBk4/fonIg8AJlsMlDQUUuTJRJzPY7YT8WoyMyEdjfXinblPzxRpd/cnICxYowCgP L1JxjC93x8eSsrhFa/SML/2qpM9Hi4bQLB3vfqHEzeWjviVhhFdLJ9bR0wC83npK5Pcr eHSDuKj0VRlv54lJabMdsvjutVasl2QmAuLNdwEaACEHCV9r1sovlHoxdG0HkWksTYl7 APwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eZaTIQlxze6jxuscVM9IFMWchHxN6YoRJgbnAqKImvc=; b=cyw/hlmAbdfgWezN530XowujFIzB+RiNZ+wLBJz/Xysmx5iSfhZDmMbrMQQVV+Z3WO 4gqorUUU3eF7MYnl5ijDIivoHLAxxYXRhtXn80511EfWdcSha4mdTyizpPpmAyrnzG+/ uUxoq4VPKKVi4tybB/IVTFZUZH5d2eY93qFxIQpgCFHeyktg2XtoS7sjk6P8rWzpE1jm IbT+B67WaBNB137yi3d9Ej1ylw/j4dNTDSG3JU5ceoZ4pOG6H/PMu4ntnUEMIdFJdKEX M1BOLpiY2I0DwkEhNknGH3O03sg7QxbZ59IrL//J69yckLVryiwQHXSphF40NTTZemtt f5lQ== X-Gm-Message-State: AOAM532CH5EJ8JPUagXlSW/7aTHv6Jb1UMszRD7MbJA1pI66K42VMaRv qsSqdwo7S3L/khm5nqlnFTp97jFwIz1wBA== X-Google-Smtp-Source: ABdhPJz0y+8SgsutItxZUEIqaJblTSOpCzq2IGvnQ1nb28KoOrbOsS2CgE/Yj60+JrmhsGaaw+LXXQ== X-Received: by 2002:a17:906:6a92:: with SMTP id p18mr3755050ejr.308.1610471708145; Tue, 12 Jan 2021 09:15:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/20] configure: move Cocoa incompatibility checks to Meson Date: Tue, 12 Jan 2021 18:14:48 +0100 Message-Id: <20210112171450.791427-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The cocoa UI code currently assumes it is always the active UI and does not interact well with other UI frontend code. Move the relevant checks to Meson now that all other frontends have become Meson options. This way, SDL/GTK+/Cocoa can be parsed entirely by scripts/configure-parse-buildoptions.pl. Signed-off-by: Paolo Bonzini --- configure | 15 --------------- meson.build | 17 ++++++++++------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/configure b/configure index d70448f495..17aa595343 100755 --- a/configure +++ b/configure @@ -772,7 +772,6 @@ Darwin) QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" fi - cocoa=3D"enabled" audio_drv_list=3D"coreaudio try-sdl" audio_possible_drivers=3D"coreaudio sdl" QEMU_LDFLAGS=3D"-framework CoreFoundation -framework IOKit $QEMU_LDFLAGS" @@ -2322,20 +2321,6 @@ if test -z "$want_tools"; then fi =20 ########################################## -# cocoa implies not SDL or GTK -# (the cocoa UI code currently assumes it is always the active UI -# and doesn't interact well with other UI frontend code) -if test "$cocoa" =3D "enabled"; then - if test "$sdl" =3D "enabled"; then - error_exit "Cocoa and SDL UIs cannot both be enabled at once" - fi - if test "$gtk" =3D "enabled"; then - error_exit "Cocoa and GTK UIs cannot both be enabled at once" - fi - gtk=3Ddisabled - sdl=3Ddisabled -fi - # Some versions of Mac OS X incorrectly define SIZE_MAX cat > $TMPC << EOF #include diff --git a/meson.build b/meson.build index 73d3cc5385..1f12c43765 100644 --- a/meson.build +++ b/meson.build @@ -169,7 +169,6 @@ version_res =3D [] coref =3D [] iokit =3D [] emulator_link_args =3D [] -cocoa =3D not_found hvf =3D not_found if targetos =3D=3D 'windows' socket =3D cc.find_library('ws2_32') @@ -182,7 +181,6 @@ if targetos =3D=3D 'windows' elif targetos =3D=3D 'darwin' coref =3D dependency('appleframeworks', modules: 'CoreFoundation') iokit =3D dependency('appleframeworks', modules: 'IOKit') - cocoa =3D dependency('appleframeworks', modules: 'Cocoa', required: get_= option('cocoa')) elif targetos =3D=3D 'sunos' socket =3D [cc.find_library('socket'), cc.find_library('nsl'), @@ -256,9 +254,6 @@ if not have_xen_pci_passthrough and get_option('xen_pci= _passthrough').enabled() error('Xen PCI passthrough requested but Xen not enabled') endif endif -if not cocoa.found() and get_option('cocoa').enabled() - error('Cocoa not available on this platform') -endif =20 ################ # Dependencies # @@ -362,6 +357,14 @@ if not get_option('attr').disabled() endif endif =20 +cocoa =3D dependency('appleframeworks', modules: 'Cocoa', required: get_op= tion('cocoa')) +if cocoa.found() and get_option('sdl').enabled() + error('Cocoa and SDL cannot be enabled at the same time') +endif +if cocoa.found() and get_option('gtk').enabled() + error('Cocoa and GTK+ cannot be enabled at the same time') +endif + seccomp =3D not_found if not get_option('seccomp').auto() or have_system or have_tools seccomp =3D dependency('libseccomp', version: '>=3D2.3.0', @@ -647,7 +650,7 @@ if not get_option('brlapi').auto() or have_system endif =20 sdl =3D not_found -if have_system +if not get_option('sdl').auto() or (have_system and not cocoa.found()) sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_s= tatic) sdl_image =3D not_found endif @@ -779,7 +782,7 @@ endif =20 gtk =3D not_found gtkx11 =3D not_found -if not get_option('gtk').auto() or have_system +if not get_option('gtk').auto() or (have_system and not cocoa.found()) gtk =3D dependency('gtk+-3.0', version: '>=3D3.22.0', method: 'pkg-config', required: get_option('gtk'), --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610473290; cv=none; d=zohomail.com; s=zohoarc; b=idPv+hyN0a1YldfHMD7GwmtDyOB/vd3rVgP4RhpCwtm5FMOgga0WfAKmeDwvBWdlVXJDOtFCbuTjxah8hNxa8GN/k/uxJoJK1cz1BlD0vaCnWchGlxljhYgxZkuoeKH8f6+zgwYca1ph2ZKcjuPDmZRGGxuEj77VbzOxPKqomBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610473290; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qzI+YT1N4z/CWdZkjoYjj2Jud//oxEZLpdvDoB26JbM=; b=YF7qOEPFdBFw3zsqDw5tvRcgT2iWxFEccKrg1d8n+NcuNpIHDfTMw/CFrE7DWEB1ZXN9sQqg0IXVhdvIT0c3GwtULbfJs7s3cO+WjDR3hrQDlvclf6Wi52hYSfi74bhF35udfZo8LKIPINfefZpoDKN3o++BebmNxc2E/d85xX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610473290614692.1300492278597; Tue, 12 Jan 2021 09:41:30 -0800 (PST) Received: from localhost ([::1]:57306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNfZ-0000eF-Eh for importer@patchew.org; Tue, 12 Jan 2021 12:41:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNGB-0003lC-Ty for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:12 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:37440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNGA-0004ww-FE for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:11 -0500 Received: by mail-ej1-x62d.google.com with SMTP id ga15so4607055ejb.4 for ; Tue, 12 Jan 2021 09:15:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qzI+YT1N4z/CWdZkjoYjj2Jud//oxEZLpdvDoB26JbM=; b=j6JwPF5L21TX3AJee8EbpqqB1yJG6gTXc/HpcZteSpP65uf2P2pya/PKqgsUTCq1W/ fvSAbuy5SsHIoWYiI3cMFn4Oti20B1U4Au7sXzUMnTTBB0i4Q7L8BDwonDJ4T4QO29S8 7LbZ+rrsVTxI0xdK0zKhWPNzeBQb8a6ZG+NDqe+dm+K651KCgNFqlP9TchwQtSHsKX8F N905PaeHXFRaiyOg1VXOXxN7iXqfwByyee2GVRCDCiBXHJYwfr2ivxkeU0zVstNUDtov AYqlXNHR24TENWx3vwacyAZY+doys1CepnRbJiPIGO7xypYDVdbl+LkgeZ95h8uMpm4U Aqew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=qzI+YT1N4z/CWdZkjoYjj2Jud//oxEZLpdvDoB26JbM=; b=EqhVeXy51vmcC+gD5vmfQnslNR/Kdlup8ITf0mWpX6zf3mTsATVr9isAX6zeNWMiQq RtmqZwW9Sc1Cm3Rnk2HR9hdx56OcqywFSzPxeb+02xS22EXGQBZ35xDHaMBqznC/e96I qfciYXKlbHc03vohVrKFs5bcfKqyEm2YzSPw3E/N171sNXibE8AjxUO6NXmbx0fd06lc cZPNBzslzkyVV6fZJCsZfNbOfKljw9XJBlOM3KSMxpKx8moRQ3hHMWkuZQQyTkemkJxP 4jGEA23tEUMfG4G5nj4dPNaTpFXXKRsRjmy1ZyEG48Jw6A2terXNPt8JO7PgwDlTCOiW 4gGg== X-Gm-Message-State: AOAM531PYbXzOssoXYzHPRH7jzoOQ9WgnGitm1xfleLSI/CA0a3shazh +a4UTXVmcJx4UTwIaTqHJMK/a4VmuXqUPw== X-Google-Smtp-Source: ABdhPJxQ+V79iMo4xxED9N4N/STp7iKCe6xJpuudCyxGPUAFlmmzqpz4TRmzvn00vbvTFVshVcEK7g== X-Received: by 2002:a17:906:9452:: with SMTP id z18mr3961608ejx.389.1610471709197; Tue, 12 Jan 2021 09:15:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/20] configure: quote command line arguments in config.status Date: Tue, 12 Jan 2021 18:14:49 +0100 Message-Id: <20210112171450.791427-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Make config.status generation a bit more robust. (The quote_sh function will also be reused to parse configure's command line arguments in an external script driven by Meson build option introspection). Signed-off-by: Paolo Bonzini --- configure | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 17aa595343..155dda124c 100755 --- a/configure +++ b/configure @@ -89,6 +89,10 @@ printf " '%s'" "$0" "$@" >> config.log echo >> config.log echo "#" >> config.log =20 +quote_sh() { + printf "%s" "$1" | sed "s,','\\\\'',g; s,.*,'&'," +} + print_error() { (echo echo "ERROR: $1" @@ -6519,7 +6523,7 @@ preserve_env WINDRES =20 printf "exec" >>config.status for i in "$0" "$@"; do - test "$i" =3D --skip-meson || printf " '%s'" "$i" >>config.status + test "$i" =3D --skip-meson || printf " %s" "$(quote_sh "$i")" >>config.s= tatus done echo ' "$@"' >>config.status chmod +x config.status --=20 2.29.2 From nobody Fri Apr 19 21:59:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610472957; cv=none; d=zohomail.com; s=zohoarc; b=I7yInJYKK5NcrQUp45WUymVQ12gWnKWIA65Wznvd4iwCIS7pCfXfC/2IY/IjMKnRy0XYlDamnpTvEYGjsRaa02QEMRbHMbqyT7XE/Vm36tbN9yTRgpeyuAMTZh9jjjbO3oYDZUo9waiqnRxZ8kTWyQWqi+j+PX9QBNQKrK7ZoHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610472957; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QwA+TACbQ/QW8O88P6jb/sTv8Tyep9/B+Ty5k9RTfxI=; b=Kfv1Bn0H6RftXhkvDalBtnEUGvp6Ouk3DvGrso0no7C69MHc/+rBKLa4jvDLVm0lmFEWIaG8YGuLYAYqYg0WLaS5+HPt1SBOP8lskaeFqosYXgPqeu7avj8Fj58NdK7kWMfwRV8HHY9HLOx1T+QkXJcP6s670hK2r7BrCoK8N1U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610472957051293.65977763442834; Tue, 12 Jan 2021 09:35:57 -0800 (PST) Received: from localhost ([::1]:39896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzNaF-0001Sz-MW for importer@patchew.org; Tue, 12 Jan 2021 12:35:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzNGD-0003lY-17 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:13 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:39247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzNGB-0004xv-C3 for qemu-devel@nongnu.org; Tue, 12 Jan 2021 12:15:12 -0500 Received: by mail-ed1-x532.google.com with SMTP id c7so3166764edv.6 for ; Tue, 12 Jan 2021 09:15:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k22sm397302edv.33.2021.01.12.09.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jan 2021 09:15:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QwA+TACbQ/QW8O88P6jb/sTv8Tyep9/B+Ty5k9RTfxI=; b=iM/dZt2DsdKTdnGQ+Px1g4VjcTHTtmNF1+qZTCDpKIbjHlV0bFBHd+NUwt2ruY00I6 Pp/QEA5OVEqojuAuZEBF1pHaAuWVhaBd4+YJ4RP6Mq22jMns9bSCnB9lo8agM9h4Pntq +qPtcjIr+kd0ixZUOIgudxPTffCCRe2NvwiUrPprM6pxAHuIMNkuVnGZeb3rjMCwQFOj H0Uc2c8BaP1UF4Om7wvsJqTLyOI697KBWPtz20BbWukWFYN8ffv80E54ojXy53ibcsMG V0gPdIkp1L6CrwdIhQ7rSZH4AOWyQh1e9UI7oBCbUb8Crrb3zy+UdgEP0n401Tg0FP9g zniw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QwA+TACbQ/QW8O88P6jb/sTv8Tyep9/B+Ty5k9RTfxI=; b=BdNYOaz5NxurrljDQKYNJCIMiYBGCJVNWmlxfe5mkAxWvhVSck+sR+ubKnPdGkacEe kwVEgllCzn/Pd3grHqv7vC4qLpdwFAZ945bLjo98koSM1+7yqM6bbfrjh1wbv8tZCRWl f6nz3PczIsWOlAC2+TPaZ7T0x9BfrZ07y0fR81yAIU8FUXfMgA/swxcoO+IiqvsXR9q5 Tj9l1yH4qb0rsZMXwIZHoYhl+hjOuuZa6PATQVQGVHPLy/JBFtOoyw2eYjtpbaI3ieVi +TVLAuV6600hAOXYiem1UtGNpblsBO2IONIh2kYEPLU3P9zSkXATIhJr+2qtcATAMl/U MuCQ== X-Gm-Message-State: AOAM531RY7Pwgr+CWJAAnsxalneDRHxm8n5TeMGSRyKbXXo5k0lDe7ME VpoFhSH5ptD5Ri3tiInUYLDA9h26UoPe8w== X-Google-Smtp-Source: ABdhPJyvvGg0Nzri5CDF95PoNFZO8hIFOUV/5HiPIAV5+INiMBli/tp9vVqXdT+rLAH2rsbZsI8VEg== X-Received: by 2002:aa7:c403:: with SMTP id j3mr109671edq.217.1610471710154; Tue, 12 Jan 2021 09:15:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/20] target/i386: Use X86Seg enum for segment registers Date: Tue, 12 Jan 2021 18:14:50 +0100 Message-Id: <20210112171450.791427-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210112171450.791427-1-pbonzini@redhat.com> References: <20210112171450.791427-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Use the dedicated X86Seg enum type for segment registers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210109233427.749748-1-f4bug@amsat.org> Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 4 ++-- target/i386/gdbstub.c | 2 +- target/i386/tcg/seg_helper.c | 8 ++++---- target/i386/tcg/translate.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index af130512e2..d23a5b340a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1807,7 +1807,7 @@ void cpu_sync_bndcs_hflags(CPUX86State *env); /* this function must always be used to load data in the segment cache: it synchronizes the hflags with the segment cache values */ static inline void cpu_x86_load_seg_cache(CPUX86State *env, - int seg_reg, unsigned int select= or, + X86Seg seg_reg, unsigned int sel= ector, target_ulong base, unsigned int limit, unsigned int flags) @@ -1896,7 +1896,7 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigne= d int selector, /* cpu-exec.c */ /* the following helpers are only usable in user mode simulation as they can trigger unexpected exceptions */ -void cpu_x86_load_seg(CPUX86State *s, int seg_reg, int selector); +void cpu_x86_load_seg(CPUX86State *s, X86Seg seg_reg, int selector); void cpu_x86_fsave(CPUX86State *s, target_ulong ptr, int data32); void cpu_x86_frstor(CPUX86State *s, target_ulong ptr, int data32); void cpu_x86_fxsave(CPUX86State *s, target_ulong ptr); diff --git a/target/i386/gdbstub.c b/target/i386/gdbstub.c index 4a3de5f69d..41e265fc67 100644 --- a/target/i386/gdbstub.c +++ b/target/i386/gdbstub.c @@ -232,7 +232,7 @@ int x86_cpu_gdb_read_register(CPUState *cs, GByteArray = *mem_buf, int n) return 0; } =20 -static int x86_cpu_gdb_load_seg(X86CPU *cpu, int sreg, uint8_t *mem_buf) +static int x86_cpu_gdb_load_seg(X86CPU *cpu, X86Seg sreg, uint8_t *mem_buf) { CPUX86State *env =3D &cpu->env; uint16_t selector =3D ldl_p(mem_buf); diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 5f2ee6aa7e..180d47f0e9 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -176,8 +176,8 @@ static inline void get_ss_esp_from_tss(CPUX86State *env= , uint32_t *ss_ptr, } } =20 -static void tss_load_seg(CPUX86State *env, int seg_reg, int selector, int = cpl, - uintptr_t retaddr) +static void tss_load_seg(CPUX86State *env, X86Seg seg_reg, int selector, + int cpl, uintptr_t retaddr) { uint32_t e1, e2; int rpl, dpl; @@ -2098,7 +2098,7 @@ void helper_iret_real(CPUX86State *env, int shift) env->hflags2 &=3D ~HF2_NMI_MASK; } =20 -static inline void validate_seg(CPUX86State *env, int seg_reg, int cpl) +static inline void validate_seg(CPUX86State *env, X86Seg seg_reg, int cpl) { int dpl; uint32_t e2; @@ -2623,7 +2623,7 @@ void helper_verw(CPUX86State *env, target_ulong selec= tor1) } =20 #if defined(CONFIG_USER_ONLY) -void cpu_x86_load_seg(CPUX86State *env, int seg_reg, int selector) +void cpu_x86_load_seg(CPUX86State *env, X86Seg seg_reg, int selector) { if (!(env->cr[0] & CR0_PE_MASK) || (env->eflags & VM_MASK)) { int dpl =3D (env->eflags & VM_MASK) ? 3 : 0; diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 11db2f3c8d..6a4c31f933 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2287,13 +2287,13 @@ static void gen_cmovcc1(CPUX86State *env, DisasCont= ext *s, MemOp ot, int b, } } =20 -static inline void gen_op_movl_T0_seg(DisasContext *s, int seg_reg) +static inline void gen_op_movl_T0_seg(DisasContext *s, X86Seg seg_reg) { tcg_gen_ld32u_tl(s->T0, cpu_env, offsetof(CPUX86State,segs[seg_reg].selector)); } =20 -static inline void gen_op_movl_seg_T0_vm(DisasContext *s, int seg_reg) +static inline void gen_op_movl_seg_T0_vm(DisasContext *s, X86Seg seg_reg) { tcg_gen_ext16u_tl(s->T0, s->T0); tcg_gen_st32_tl(s->T0, cpu_env, @@ -2303,7 +2303,7 @@ static inline void gen_op_movl_seg_T0_vm(DisasContext= *s, int seg_reg) =20 /* move T0 to seg_reg and compute if the CPU state may change. Never call this function with seg_reg =3D=3D R_CS */ -static void gen_movl_seg_T0(DisasContext *s, int seg_reg) +static void gen_movl_seg_T0(DisasContext *s, X86Seg seg_reg) { if (s->pe && !s->vm86) { tcg_gen_trunc_tl_i32(s->tmp2_i32, s->T0); --=20 2.29.2