From nobody Mon Nov 10 19:14:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1558654941; cv=none; d=zoho.com; s=zohoarc; b=fFQb7VjnxPp6eLbVNVgw50qSnG8lr6GQUgvRabnquNEdKVjQjhrZvd25yX5kxqDDz3bQ76+Kwoc6C9X71xYamITfI4GBb9c7FAPZK7+jNYMJY3JPlT5rLKD2c+Utqx0T7hyXJoytfBIdnLDrlLa5HHoFByS7uT9I8Na9QTELiu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558654941; 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:ARC-Authentication-Results; bh=e0s5g4wfiSK+KPIJznMOG29oU7+ZKzqsKLK5USR1zAQ=; b=HodcDPSuDOtmEUcXfLKKVAncbCjS4VHNt5I2o0+AxiaCXZBLiM8d71yy7OaZAneznjoknR0E97/CfzR9/DWEQAdq7Sggd8TP4ZP/k2lzJ4duclFxVcu9nTmGJH+0nioJXloSCQvDSJw/8ujmEdwiQ72EfLJ1NqM9xiXUjydDIU0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 15586549413301013.0082380166366; Thu, 23 May 2019 16:42:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:44676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxLf-0007vQ-6k for importer@patchew.org; Thu, 23 May 2019 19:42:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxK4-00075u-CI for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTxK3-00033e-3a for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTxK2-000302-RP for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DDCA437EEB; Thu, 23 May 2019 23:40:24 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F1AF60BF3; Thu, 23 May 2019 23:40:24 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 01:40:08 +0200 Message-Id: <20190523234011.583-2-marcandre.lureau@redhat.com> In-Reply-To: <20190523234011.583-1-marcandre.lureau@redhat.com> References: <20190523234011.583-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 23 May 2019 23:40:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] docker.py: add podman support 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: Fam Zheng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , =?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" Content-Type: text/plain; charset="utf-8" Add a --engine option to select either docker, podman or auto. Among other advantages, podman allows to run rootless & daemonless containers, fortunately sharing compatible CLI with docker. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/docker/docker.py | 43 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 53a8c9c801..1f59a78b10 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -20,6 +20,7 @@ import hashlib import atexit import uuid import argparse +import enum import tempfile import re import signal @@ -38,6 +39,26 @@ FILTERED_ENV_NAMES =3D ['ftp_proxy', 'http_proxy', 'http= s_proxy'] =20 DEVNULL =3D open(os.devnull, 'wb') =20 +class EngineEnum(enum.IntEnum): + AUTO =3D 1 + DOCKER =3D 2 + PODMAN =3D 3 + + def __str__(self): + return self.name.lower() + + def __repr__(self): + return str(self) + + @staticmethod + def argparse(s): + try: + return EngineEnum[s.upper()] + except KeyError: + return s + + +USE_ENGINE =3D EngineEnum.AUTO =20 def _text_checksum(text): """Calculate a digest string unique to the text content""" @@ -48,9 +69,14 @@ def _file_checksum(filename): return _text_checksum(open(filename, 'rb').read()) =20 =20 -def _guess_docker_command(): - """ Guess a working docker command or raise exception if not found""" - commands =3D [["docker"], ["sudo", "-n", "docker"]] +def _guess_engine_command(): + """ Guess a working engine command or raise exception if not found""" + commands =3D [] + + if USE_ENGINE in [EngineEnum.AUTO, EngineEnum.PODMAN]: + commands +=3D [["podman"]] + if USE_ENGINE in [EngineEnum.AUTO, EngineEnum.DOCKER]: + commands +=3D [["docker"], ["sudo", "-n", "docker"]] for cmd in commands: try: # docker version will return the client details in stdout @@ -61,7 +87,7 @@ def _guess_docker_command(): except OSError: pass commands_txt =3D "\n".join([" " + " ".join(x) for x in commands]) - raise Exception("Cannot find working docker command. Tried:\n%s" % + raise Exception("Cannot find working engine command. Tried:\n%s" % commands_txt) =20 =20 @@ -190,7 +216,7 @@ def _dockerfile_preprocess(df): class Docker(object): """ Running Docker commands """ def __init__(self): - self._command =3D _guess_docker_command() + self._command =3D _guess_engine_command() self._instances =3D [] atexit.register(self._kill_instances) signal.signal(signal.SIGTERM, self._kill_instances) @@ -502,6 +528,8 @@ class ProbeCommand(SubCommand): print("yes") elif docker._command[0] =3D=3D "sudo": print("sudo") + elif docker._command[0] =3D=3D "podman": + print("podman") except Exception: print("no") =20 @@ -597,9 +625,13 @@ class CheckCommand(SubCommand): =20 =20 def main(): + global USE_ENGINE + parser =3D argparse.ArgumentParser(description=3D"A Docker helper", usage=3D"%s ..." % os.path.basename(sys.argv[0])) + parser.add_argument("--engine", type=3DEngineEnum.argparse, choices=3D= list(EngineEnum), + help=3D"specify which container engine to use") subparsers =3D parser.add_subparsers(title=3D"subcommands", help=3DNon= e) for cls in SubCommand.__subclasses__(): cmd =3D cls() @@ -608,6 +640,7 @@ def main(): cmd.args(subp) subp.set_defaults(cmdobj=3Dcmd) args, argv =3D parser.parse_known_args() + USE_ENGINE =3D args.engine return args.cmdobj.run(args, argv) =20 =20 --=20 2.22.0.rc1.1.g079e7d2849.dirty From nobody Mon Nov 10 19:14:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1558655099; cv=none; d=zoho.com; s=zohoarc; b=TM36Ds+Dub4LXOlW/43Mn7YYcP+Il6ngkN5nOQ3yeAM9PaLPLIx/uKTCmD1V4q0eY9h838ajg1UDht/xgAI8oSnz5WxMKzYDXdWqIaCvjrlax8r1vvg94r4hopDPFlpPZgyxQvUt9xTH6dBVfxsJdF64/aSqMpAvbe0mfILLrpE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558655099; 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:ARC-Authentication-Results; bh=qbiJJSTbjvaHaf3KYNt4YqnH8x7uPZXN/U42TUI1vjY=; b=AyD8gW/3IWvQjDKnSxL0ieMTjxFbfcPHUQlr50udsT7nYB732JXdScdf1HbnlDECc7dLzuXSK98CxxyHGBthvo2JowlEXsgWHL35u+NbeRxkTzWF196ognx8k97r87kfOJBrIv6JgJtkiuRW6q1k4SvbvTme9YrlrQ6jKep85xM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558655099032273.62272168809886; Thu, 23 May 2019 16:44:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:44690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxNf-0000w5-63 for importer@patchew.org; Thu, 23 May 2019 19:44:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxKJ-0007J7-TD for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTxKH-0003M5-TW for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTxKF-0003JO-Tx for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8172E811DE; Thu, 23 May 2019 23:40:30 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7BB360BF3; Thu, 23 May 2019 23:40:26 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 01:40:09 +0200 Message-Id: <20190523234011.583-3-marcandre.lureau@redhat.com> In-Reply-To: <20190523234011.583-1-marcandre.lureau@redhat.com> References: <20190523234011.583-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 23 May 2019 23:40:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] tests/docker: add podman support 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: Fam Zheng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Debarshi Ray , =?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" Content-Type: text/plain; charset="utf-8" Allow to specify the container engine to run with ENGINE variable. By default, ENGINE=3Dauto and will select either podman or docker. With current podman, we have to use a uidmap trick in order to be able to rw-share the ccache directory with the container user. With a user 1000, the default mapping is: 1000 (host) -> 0 (container). So write access to /var/tmp/ccache ends will end with permission denied error. With "--uidmap 1000:0:1 --uidmap 0:1:1000", the mapping is: 1000 (host) -> 0 (container, 1st namespace) -> 1000 (container, 2nd namespa= ce). (the rest is mumbo jumbo to avoid holes in the range of UIDs) A future podman version may have an option such as --userns-keep-uid. Thanks to Debarshi Ray for the help! Cc: Debarshi Ray Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 2 +- tests/docker/Makefile.include | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e02b88bcb1..e3a150ac4c 100644 --- a/Makefile +++ b/Makefile @@ -1118,7 +1118,7 @@ endif @echo '' @echo 'Test targets:' @echo ' check - Run all tests (check-help for details)' - @echo ' docker - Help about targets running tests inside Docke= r containers' + @echo ' docker - Help about targets running tests inside conta= iners' @echo ' vm-test - Help about targets running tests inside VM' @echo '' @echo 'Documentation targets:' diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c0e1bf57a3..2bf679767e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -17,7 +17,9 @@ DOCKER_TESTS :=3D $(notdir $(shell \ =20 DOCKER_TOOLS :=3D travis =20 -DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py +ENGINE :=3D auto + +DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) =20 TESTS ?=3D % IMAGES ?=3D % @@ -145,7 +147,7 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOC= KER_IMAGES) $(DOCKER_DEPR ) =20 docker: - @echo 'Build QEMU and run tests inside Docker containers' + @echo 'Build QEMU and run tests inside Docker or Podman containers' @echo @echo 'Available targets:' @echo @@ -192,6 +194,14 @@ endif @echo ' EXECUTABLE=3D Include executable in image.' @echo ' EXTRA_FILES=3D" [... ]"' @echo ' Include extra files in image.' + @echo ' ENGINE=3Dauto/docker/podman' + @echo ' Specify which container engine to run.' + +UID=3D$(shell id -u) +UID1=3D$(shell expr $(UID) + 1) +ifeq ($(shell $(DOCKER_SCRIPT) probe),podman) +PODMAN=3D1 +endif =20 # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make @@ -211,7 +221,8 @@ docker-run: docker-qemu-src " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ $(DOCKER_SCRIPT) run \ - $(if $(NOUSER),,-u $(shell id -u)) \ + $(if $(NOUSER),,-u $(UID) \ + $(if $(PODMAN),--uidmap $(UID):0:1 --uidmap 0:1:$(UID) --uidmap $(UID1= ):$(UID1):64536)) \ --security-opt seccomp=3Dunconfined \ $(if $V,,--rm) \ $(if $(DEBUG),-ti,) \ --=20 2.22.0.rc1.1.g079e7d2849.dirty From nobody Mon Nov 10 19:14:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1558654959; cv=none; d=zoho.com; s=zohoarc; b=I4zZbUz+WihROHMwUwv1RSORIanMxmyjIuWHhzcDZwm4tymoRHGWH3GYS3pv9ZuevMJxauIqgI9BxEAPCefluZ2U9JeY+ddhZ03gLX1n13xTnBjSFnqCIWF0JzACL2EoFyT/8OPDuipsTkmREMP7Qn3mXloxgGb4QtGZ82n9//c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558654959; 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:ARC-Authentication-Results; bh=L7Cm4pjxoIScifFPjn3Tz/R9dJvpsfoeG6OAJEhj0R4=; b=TyPu6QW+NxmvkLGzW6rKSDS/fVfdOnDyLGIzkgXEulBdzARvgXvAht5pZ4P5Cyaer/V8+J7h0tMVjka7rmpUmol4eTXW/Y54kWRGVjboTMJoEicK3SUHbMtUBDxBUANKe50lLWWRfAPCFkF0gRVq/Po4DdlCBcY07sIE6UGMbv8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 15586549599911018.7703399850759; Thu, 23 May 2019 16:42:39 -0700 (PDT) Received: from localhost ([127.0.0.1]:44678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxM4-0008G4-Te for importer@patchew.org; Thu, 23 May 2019 19:42:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxKO-0007Ja-6Q for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTxKM-0003Qq-AE for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58826) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTxKM-0003Oj-5D for qemu-devel@nongnu.org; Thu, 23 May 2019 19:40:50 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B67E85946F; Thu, 23 May 2019 23:40:38 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28E3C5C239; Thu, 23 May 2019 23:40:31 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 01:40:10 +0200 Message-Id: <20190523234011.583-4-marcandre.lureau@redhat.com> In-Reply-To: <20190523234011.583-1-marcandre.lureau@redhat.com> References: <20190523234011.583-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 23 May 2019 23:40:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] docker: update fedora to f30 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: Fam Zheng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , =?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" Content-Type: text/plain; charset="utf-8" Released last month. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/docker/dockerfiles/fedora.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 69d4a7f5d7..1496b68ba1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM fedora:30 ENV PACKAGES \ bc \ bison \ --=20 2.22.0.rc1.1.g079e7d2849.dirty From nobody Mon Nov 10 19:14:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1558655085; cv=none; d=zoho.com; s=zohoarc; b=BEfoB120ZknRNihhKUwaJVlhdNgT4sVvlasQDe6weIdzIO6F++H95mwLrkZUSdgepnxZZOB9WfsyFBuyxGTYd/PBLe0VjloZi+iSoFnj5PbjxtVrCP8R/Eqm4VtFcUm39LHrSIiziYoEIik/hiuNi/BrrhzvEzrCJO7TAmjVXx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558655085; 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:ARC-Authentication-Results; bh=+yRMG14kymp07otZeRfaRzWUHNfF7rdx1eXBmcTWdXw=; b=IBvW1vB9ELrNbHDBvOq8RsFXK5VWbkcq1CMXRhadoCIW7N1qytREJC31IRzgevz9FjRqZllPDz5qMZQ2hSurgPTg4wx+kTufPSl2NyuWUnmfWBy2tKw7PEDwXBE1MYu8UlUTfhpz/HTGn9+3lWL6S0MNR/uKnxFXzKLl6E/mGTE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558655085569978.6007610406333; Thu, 23 May 2019 16:44:45 -0700 (PDT) Received: from localhost ([127.0.0.1]:44692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxNy-0001A6-87 for importer@patchew.org; Thu, 23 May 2019 19:44:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTxKZ-0007TG-7a for qemu-devel@nongnu.org; Thu, 23 May 2019 19:41:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTxKY-0003e5-67 for qemu-devel@nongnu.org; Thu, 23 May 2019 19:41:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33328) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTxKY-0003dQ-16 for qemu-devel@nongnu.org; Thu, 23 May 2019 19:41:02 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 46184772DD; Thu, 23 May 2019 23:40:48 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53A2E600C4; Thu, 23 May 2019 23:40:40 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Fri, 24 May 2019 01:40:11 +0200 Message-Id: <20190523234011.583-5-marcandre.lureau@redhat.com> In-Reply-To: <20190523234011.583-1-marcandre.lureau@redhat.com> References: <20190523234011.583-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 23 May 2019 23:40:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] qemu-sockets: do not require configured ipv4/ipv6 address 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: Fam Zheng , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , =?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" Content-Type: text/plain; charset="utf-8" podman containers without network don't have ipv4/ipv6 addresses other than loopback address. However, some of our tests require getaddrinfo("127.0.0.1") to succeed. Alternatively, we may want to treat 127.0.0.1 as a special case, to keep the AI_ADDRCONFIG convenience. Signed-off-by: Marc-Andr=C3=A9 Lureau --- util/qemu-sockets.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8850a280a8..f9c1392a05 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -31,10 +31,6 @@ #include "qapi/qobject-output-visitor.h" #include "qemu/cutils.h" =20 -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif - #ifndef AI_V4MAPPED # define AI_V4MAPPED 0 #endif @@ -385,7 +381,7 @@ static struct addrinfo *inet_parse_connect_saddr(InetSo= cketAddress *saddr, =20 memset(&ai, 0, sizeof(ai)); =20 - ai.ai_flags =3D AI_CANONNAME | AI_ADDRCONFIG; + ai.ai_flags =3D AI_CANONNAME; if (atomic_read(&useV4Mapped)) { ai.ai_flags |=3D AI_V4MAPPED; } @@ -472,7 +468,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, =20 /* lookup peer addr */ memset(&ai,0, sizeof(ai)); - ai.ai_flags =3D AI_CANONNAME | AI_V4MAPPED | AI_ADDRCONFIG; + ai.ai_flags =3D AI_CANONNAME | AI_V4MAPPED; ai.ai_family =3D inet_ai_family_from_address(sraddr, &err); ai.ai_socktype =3D SOCK_DGRAM; =20 --=20 2.22.0.rc1.1.g079e7d2849.dirty