From patchwork Mon Jan 25 07:34:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1431107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PWYFMYg+; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPM9y6sV3z9sSs for ; Mon, 25 Jan 2021 18:36:22 +1100 (AEDT) Received: from localhost ([::1]:51696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3wQ7-0007UG-6p for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 02:36:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3wOg-0007Tb-89 for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:34:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27659) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l3wOc-0001od-VR for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:34:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611560086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XVfN3nkbNra97+W/+qJCuLWThNmjh5dZaoNAF28VZmA=; b=PWYFMYg+zLbusk03LKbyQ3O2FcfsN1Wxy0CPsib6ydjN0z97KM1H1htUSmzr7vS8TUo0We fxRy7DLCZwGYhA90ABhdx0PVi+TTR/kGHOIUNijmZ2eLnckKxSzFWmakYIGz6Xuae6DoKX kMvNbCCz/HrS2pDxDqClzE1kUoMEXg8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-443-DxcnETqOMBa9cjk-RAoBZQ-1; Mon, 25 Jan 2021 02:34:44 -0500 X-MC-Unique: DxcnETqOMBa9cjk-RAoBZQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CC838144E1; Mon, 25 Jan 2021 07:34:43 +0000 (UTC) Received: from localhost (unknown [10.36.110.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E4985D9D7; Mon, 25 Jan 2021 07:34:38 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] slirp: update to git master Date: Mon, 25 Jan 2021 11:34:26 +0400 Message-Id: <20210125073427.3970606-2-marcandre.lureau@redhat.com> In-Reply-To: <20210125073427.3970606-1-marcandre.lureau@redhat.com> References: <20210125073427.3970606-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, j@getutm.app, =?utf-8?q?Marc-Andr=C3=A9_Lu?= =?utf-8?q?reau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau git cherry-diff: Commits on bacb71f1c3ed5f40e393afd8be81bedfba13a401 branch that is not on 8f43a99191afb47ca3f3c6972f6306209f367ece branch + 1021b0dc38d39f1dc95a296fe3e05a24a087cdc6 disable_dns option + 0f94ceec752592e4ac632a24e3c64a97dd09bf4c limit vnameserver_addr to port 53 + b57bafa852ef16b133907a13678ec69e9531f177 libslirp.h: fix SlirpConfig v3 documentation + 1abf18b2b5edb462797629ed47ad4515a195686e Update CHANGELOG + ff4ecf9b6c6542b24b4ac6ea178be9d44e159f79 Release v4.3.0 + 21f1d933050a40d62612c6274c32de60b811d9ea changelog: post-release + 376187c4b14c795763d472214812826eebe7e9c2 Release v4.3.1 + 73336e08902a7e826f7d960453df037380266186 changelog: post-release + 5c1c9d43be61571608e9b14615045b67b830daf5 udp, udp6, icmp: handle TTL value + 73ed49ab71998d4288e71e954ef6214b70f23d79 icmp, icmp6: Add icmp_forward_error and icmp6_forward_error + 7a4840a57ec7dbc37cca1ab96f058a9610b26950 udp, udp6, icmp, icmp6: Enable forwarding errors on Linux + e9b2bc19ae652a2907f247e621b2e4773bdd2aab TCPIPHDR_DELTA: Fix potential negative value + 39f9a363eec082f04513413046321abd04163148 .gitlab-ci: add a Coverity stage + 1b0093b973cfa0dc041522e5d4e6f576b2df642e sosendoob: better document what urgc is used for + 5b9ad89ebbb8afa50162c9156fabd5fc56291088 Add G_GNUC_PRINTF to local function slirp_vsnprintf + 8a808aa493980e212b4d5f5465330905c8294e59 meson: remove meson-dist script + 0b669b5fbe4d3c25a682a67f1059d8633c963b3d meson: support compiling as subproject + 9f82a47b81f2864422b82c1e40e51a2ed9c6ac32 Add DNS resolving for iOS + c0eac03e8ce1b9a743231f2fe21e7cb579fc9339 Remove the QEMU-special make build-system + 1bfd4d9368f9fa2e4f0731e1266bec05bbc83a80 socket: consume empty packets + 92413be68914f8cae2f5bad4bf3ab8491dcbc5d7 Release v4.4.0 + 07e8cfac69766081871ab620d9f16a630543d302 changelog: post-release + 4c4e035813313d02b63fdeb920d56fb2fdc0a5b1 Remove some needless (void)casts + eee9db9d115d91aa82f33685c4e76d656db92976 fork_exec_child_setup: improve signal handling + 216f434a018b3af182a4f31bbe5a00daee170343 Fix unused variables Signed-off-by: Marc-André Lureau Tested-by: Joelle van Dyne --- slirp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp b/slirp index 8f43a99191..5dce846e3e 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece +Subproject commit 5dce846e3ee82d93462bc637bb0db2fd49f0fc5a From patchwork Mon Jan 25 07:34:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1431109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=h2mkPd/C; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPMCj1XKmz9sSs for ; Mon, 25 Jan 2021 18:37:53 +1100 (AEDT) Received: from localhost ([::1]:56022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3wRb-00013i-6W for incoming@patchwork.ozlabs.org; Mon, 25 Jan 2021 02:37:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3wP3-0007XS-Dk for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:35:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58787) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l3wOr-0001qz-Ch for qemu-devel@nongnu.org; Mon, 25 Jan 2021 02:35:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611560096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wboWuw3/pGvT+G+sp6KToMGli2Cop28MQotDr8HhZN8=; b=h2mkPd/COzLUNRiweYtFmnpQSepOQmTTTN8jFxNL870PyAyp3lfGLs+xAB8yXFqlCJcRGw mCxh0WsAPjJVRhMifmuxV3IY4uK9WcNa68Imd/2izzrGkJSG0LMDvRXhjXAwqI0ciImXip SLFGx0bwsVIMYly0W3WQFQDqEsHhEhw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-84-gB9wxXrUPOiBQtpQT0w6UQ-1; Mon, 25 Jan 2021 02:34:52 -0500 X-MC-Unique: gB9wxXrUPOiBQtpQT0w6UQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AC4A59; Mon, 25 Jan 2021 07:34:51 +0000 (UTC) Received: from localhost (unknown [10.36.110.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5F9D10013BD; Mon, 25 Jan 2021 07:34:47 +0000 (UTC) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] build-sys: make libslirp a meson subproject Date: Mon, 25 Jan 2021 11:34:27 +0400 Message-Id: <20210125073427.3970606-3-marcandre.lureau@redhat.com> In-Reply-To: <20210125073427.3970606-1-marcandre.lureau@redhat.com> References: <20210125073427.3970606-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: samuel.thibault@ens-lyon.org, j@getutm.app, =?utf-8?q?Marc-Andr=C3=A9_Lu?= =?utf-8?q?reau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Remove the manual build. Signed-off-by: Marc-André Lureau Tested-by: Joelle van Dyne --- configure | 2 +- meson.build | 62 +++-------------------------------- .gitmodules | 4 +-- slirp => subprojects/libslirp | 0 4 files changed, 7 insertions(+), 61 deletions(-) rename slirp => subprojects/libslirp (100%) diff --git a/configure b/configure index dcc5ea7d63..6c98552452 100755 --- a/configure +++ b/configure @@ -5206,7 +5206,7 @@ case "$slirp" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. if test -e "${source_path}/.git" && test $git_update = 'yes' ; then - git_submodules="${git_submodules} slirp" + git_submodules="${git_submodules} subprojects/libslirp" fi ;; esac diff --git a/meson.build b/meson.build index 35a9eddf5c..95ef1c8adf 100644 --- a/meson.build +++ b/meson.build @@ -1472,7 +1472,7 @@ slirp_opt = 'disabled' if have_system slirp_opt = get_option('slirp') if slirp_opt in ['enabled', 'auto', 'system'] - have_internal = fs.exists(meson.current_source_dir() / 'slirp/meson.build') + have_internal = fs.exists(meson.current_source_dir() / 'subprojects/libslirp/meson.build') slirp = dependency('slirp', static: enable_static, method: 'pkg-config', required: slirp_opt == 'system' or @@ -1486,63 +1486,9 @@ if have_system endif endif if slirp_opt == 'internal' - slirp_deps = [] - if targetos == 'windows' - slirp_deps = cc.find_library('iphlpapi') - endif - slirp_conf = configuration_data() - slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.')[0]) - slirp_conf.set('SLIRP_MINOR_VERSION', meson.project_version().split('.')[1]) - slirp_conf.set('SLIRP_MICRO_VERSION', meson.project_version().split('.')[2]) - slirp_conf.set_quoted('SLIRP_VERSION_STRING', meson.project_version()) - slirp_cargs = ['-DG_LOG_DOMAIN="Slirp"'] - slirp_files = [ - 'slirp/src/arp_table.c', - 'slirp/src/bootp.c', - 'slirp/src/cksum.c', - 'slirp/src/dhcpv6.c', - 'slirp/src/dnssearch.c', - 'slirp/src/if.c', - 'slirp/src/ip6_icmp.c', - 'slirp/src/ip6_input.c', - 'slirp/src/ip6_output.c', - 'slirp/src/ip_icmp.c', - 'slirp/src/ip_input.c', - 'slirp/src/ip_output.c', - 'slirp/src/mbuf.c', - 'slirp/src/misc.c', - 'slirp/src/ncsi.c', - 'slirp/src/ndp_table.c', - 'slirp/src/sbuf.c', - 'slirp/src/slirp.c', - 'slirp/src/socket.c', - 'slirp/src/state.c', - 'slirp/src/stream.c', - 'slirp/src/tcp_input.c', - 'slirp/src/tcp_output.c', - 'slirp/src/tcp_subr.c', - 'slirp/src/tcp_timer.c', - 'slirp/src/tftp.c', - 'slirp/src/udp.c', - 'slirp/src/udp6.c', - 'slirp/src/util.c', - 'slirp/src/version.c', - 'slirp/src/vmstate.c', - ] - - configure_file( - input : 'slirp/src/libslirp-version.h.in', - output : 'libslirp-version.h', - configuration: slirp_conf) - - slirp_inc = include_directories('slirp', 'slirp/src') - libslirp = static_library('slirp', - sources: slirp_files, - c_args: slirp_cargs, - include_directories: slirp_inc) - slirp = declare_dependency(link_with: libslirp, - dependencies: slirp_deps, - include_directories: slirp_inc) + libslirp = subproject('libslirp', + default_options: ['default_library=static']) + slirp = libslirp.get_variable('libslirp_dep') endif endif diff --git a/.gitmodules b/.gitmodules index 2bdeeacef8..0fb15efacd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,8 +49,8 @@ [submodule "roms/edk2"] path = roms/edk2 url = https://git.qemu.org/git/edk2.git -[submodule "slirp"] - path = slirp +[submodule "subprojects/libslirp"] + path = subprojects/libslirp url = https://git.qemu.org/git/libslirp.git [submodule "roms/opensbi"] path = roms/opensbi diff --git a/slirp b/subprojects/libslirp similarity index 100% rename from slirp rename to subprojects/libslirp