From nobody Thu May 2 16:38:54 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508746092469397.96671130980803; Mon, 23 Oct 2017 01:08:12 -0700 (PDT) Received: from localhost ([::1]:37344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6Xm8-0001zR-N9 for importer@patchew.org; Mon, 23 Oct 2017 04:07:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6XhH-00076p-Ri for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6XhH-0006Wb-2F for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11751) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e6XhG-0006W5-S7 for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:54 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D074B61D0E; Mon, 23 Oct 2017 08:02:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-195.ams2.redhat.com [10.36.117.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A2B87C013; Mon, 23 Oct 2017 08:02:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C0ED7278; Mon, 23 Oct 2017 10:02:45 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D074B61D0E Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 23 Oct 2017 10:02:43 +0200 Message-Id: <20171023080245.31300-2-kraxel@redhat.com> In-Reply-To: <20171023080245.31300-1-kraxel@redhat.com> References: <20171023080245.31300-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 23 Oct 2017 08:02:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] configure: disable qemu-keymap for linux-user qemu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Laurent Vivier We don't need qemu-keymap when we build only linux-user qemu. When we compile in static mode, the libxkbcommon is detected by configure if the shared one is available, but cannot be linked if the static version is not available. As we don't need it for qemu-linux-user, and we generally need a static link to use it in a chroot, disable qemu-keymap in this case. Signed-off-by: Laurent Vivier Message-id: 20171019191606.14129-1-laurent@vivier.eu Signed-off-by: Gerd Hoffmann --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6f21aaf989..03547cea6a 100755 --- a/configure +++ b/configure @@ -5136,9 +5136,9 @@ if test "$softmmu" =3D yes ; then fi mpath=3Dno fi -fi -if test "$xkbcommon" =3D "yes"; then - tools=3D"qemu-keymap\$(EXESUF) $tools" + if test "$xkbcommon" =3D "yes"; then + tools=3D"qemu-keymap\$(EXESUF) $tools" + fi fi =20 # Probe for guest agent support/options --=20 2.9.3 From nobody Thu May 2 16:38:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508745900382736.8930660407854; Mon, 23 Oct 2017 01:05:00 -0700 (PDT) Received: from localhost ([::1]:37324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6XjC-0008A4-LS for importer@patchew.org; Mon, 23 Oct 2017 04:04:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6XhI-00076q-21 for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6XhE-0006Uj-DP for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23068) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e6XhE-0006U8-7P for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:02:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 405563680A for ; Mon, 23 Oct 2017 08:02:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-195.ams2.redhat.com [10.36.117.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 720365DA67; Mon, 23 Oct 2017 08:02:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C88CE4FD7C; Mon, 23 Oct 2017 10:02:45 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 405563680A Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 23 Oct 2017 10:02:44 +0200 Message-Id: <20171023080245.31300-3-kraxel@redhat.com> In-Reply-To: <20171023080245.31300-1-kraxel@redhat.com> References: <20171023080245.31300-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 23 Oct 2017 08:02:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] ui: add qemu-keymap and shader to .gitignore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Blake Message-id: 20171020070914.7785-1-kraxel@redhat.com --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 620eec6b47..588769b250 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /trace/generated-tcg-tracers.h /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h +/ui/shader/texture-blit-flip-vert.h /ui/input-keymap-*.c *-timestamp /*-softmmu @@ -45,6 +46,7 @@ /qemu-io /qemu-ga /qemu-bridge-helper +/qemu-keymap /qemu-monitor.texi /qemu-monitor-info.texi /qemu-version.h --=20 2.9.3 From nobody Thu May 2 16:38:54 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508746025707812.4482956256247; Mon, 23 Oct 2017 01:07:05 -0700 (PDT) Received: from localhost ([::1]:37337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6Xky-0000vB-Ub for importer@patchew.org; Mon, 23 Oct 2017 04:06:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6XhT-0007GM-AE for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6XhP-0006bn-Di for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:03:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47038) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e6XhP-0006b6-8Z for qemu-devel@nongnu.org; Mon, 23 Oct 2017 04:03:03 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 519B42D0FB3 for ; Mon, 23 Oct 2017 08:03:02 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-117-195.ams2.redhat.com [10.36.117.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A33653C34; Mon, 23 Oct 2017 08:02:53 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CFB4A4FD7D; Mon, 23 Oct 2017 10:02:45 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 519B42D0FB3 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 23 Oct 2017 10:02:45 +0200 Message-Id: <20171023080245.31300-4-kraxel@redhat.com> In-Reply-To: <20171023080245.31300-1-kraxel@redhat.com> References: <20171023080245.31300-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 23 Oct 2017 08:03:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] scripts: don't throw away stderr when checking out git submodules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Daniel P. Berrange" The stderr from git is important if git fails to checkout modules due to network problems, or other unexpected errors. Signed-off-by: Daniel P. Berrange Reviewed-by: Peter Maydell Message-id: 20171020130748.22983-1-berrange@redhat.com Signed-off-by: Gerd Hoffmann --- scripts/git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index d8fbc7e47e..08932a35f0 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -32,7 +32,7 @@ status) exit $? ;; update) - git submodule update --init $modules 1>/dev/null 2>&1 + git submodule update --init $modules 1>/dev/null git submodule status $modules > "${substat}" ;; esac --=20 2.9.3