From patchwork Wed Mar 13 21:18:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 10851849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 403A914DE for ; Wed, 13 Mar 2019 21:28:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30A6D29F62 for ; Wed, 13 Mar 2019 21:28:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2404929FD7; Wed, 13 Mar 2019 21:28:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9D95529F62 for ; Wed, 13 Mar 2019 21:28:20 +0000 (UTC) Received: from localhost ([127.0.0.1]:51177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4BQB-0005cf-Cw for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Mar 2019 17:28:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4BHC-0006do-9j for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4BHB-0003sQ-CL for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:02 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49118) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4BHB-0003rZ-5n for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:01 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 35E4ED858; Wed, 13 Mar 2019 22:19:00 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2LFvfBW5V5AT; Wed, 13 Mar 2019 22:18:59 +0100 (CET) Received: from function (105.251.129.77.rev.sfr.net [77.129.251.105]) by hera.aquilenet.fr (Postfix) with ESMTPSA id AB99FD859; Wed, 13 Mar 2019 22:18:58 +0100 (CET) Received: from samy by function with local (Exim 4.92) (envelope-from ) id 1h4BH7-0001qE-7f; Wed, 13 Mar 2019 22:18:57 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 13 Mar 2019 22:18:56 +0100 Message-Id: <20190313211857.7032-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190313211857.7032-1-samuel.thibault@ens-lyon.org> References: <20190313211857.7032-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 1/2] slirp: remove empty state.h 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Samuel Thibault , stefanha@redhat.com, jan.kiszka@siemens.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau Signed-off-by: Marc-André Lureau Message-Id: <20190313173949.2369-1-marcandre.lureau@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Samuel Thibault --- slirp/src/state.c | 1 - slirp/src/state.h | 0 2 files changed, 1 deletion(-) delete mode 100644 slirp/src/state.h diff --git a/slirp/src/state.h b/slirp/src/state.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/slirp/src/state.c b/slirp/src/state.c index f5dd80cdc8..c3e3f0b671 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -23,7 +23,6 @@ */ #include "slirp.h" #include "vmstate.h" -#include "state.h" #include "stream.h" static int slirp_tcp_post_load(void *opaque, int version) From patchwork Wed Mar 13 21:18:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 10851857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9AC32139A for ; Wed, 13 Mar 2019 21:30:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 897F729F63 for ; Wed, 13 Mar 2019 21:30:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 786A629F58; Wed, 13 Mar 2019 21:30:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2053329F58 for ; Wed, 13 Mar 2019 21:30:00 +0000 (UTC) Received: from localhost ([127.0.0.1]:51188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4BRn-0006kM-Gb for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Mar 2019 17:29:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4BHE-0006g8-S8 for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4BHD-0003ut-RX for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:04 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:49132) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4BHD-0003tH-Jc for qemu-devel@nongnu.org; Wed, 13 Mar 2019 17:19:03 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id D353AD859; Wed, 13 Mar 2019 22:19:01 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B9bulV3WuvgJ; Wed, 13 Mar 2019 22:18:59 +0100 (CET) Received: from function (105.251.129.77.rev.sfr.net [77.129.251.105]) by hera.aquilenet.fr (Postfix) with ESMTPSA id CC27AD85A; Wed, 13 Mar 2019 22:18:58 +0100 (CET) Received: from samy by function with local (Exim 4.92) (envelope-from ) id 1h4BH7-0001qG-AJ; Wed, 13 Mar 2019 22:18:57 +0100 From: Samuel Thibault To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 13 Mar 2019 22:18:57 +0100 Message-Id: <20190313211857.7032-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190313211857.7032-1-samuel.thibault@ens-lyon.org> References: <20190313211857.7032-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 185.233.100.1 Subject: [Qemu-devel] [PULL 2/2] configure: remove slirp submodule support that doesn't exist yet 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: jan.kiszka@siemens.com, Samuel Thibault , stefanha@redhat.com, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé The slirp code is not yet split off into a separate repository, so configuring QEMU to use slirp as a submodule is premature. This causes the non-existant "slirp" to be requested from git when syncing submodules. This in turn appears to be cause of non-deterministic failures some developers are seeing with QEMU's submodule sync process. Signed-off-by: Daniel P. Berrangé Message-Id: <20190313173157.30504-1-berrange@redhat.com> Reviewed-by: Marc-André Lureau Signed-off-by: Samuel Thibault --- configure | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/configure b/configure index cab830a4c9..355eebfc5d 100755 --- a/configure +++ b/configure @@ -1109,8 +1109,6 @@ for opt do ;; --disable-slirp) slirp="no" ;; - --enable-slirp=git) slirp="git" - ;; --enable-slirp=system) slirp="system" ;; --disable-vde) vde="no" @@ -5780,8 +5778,6 @@ case "$slirp" in "" | yes) if $pkg_config slirp; then slirp=system - elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then - slirp=git elif test -e "${source_path}/slirp/Makefile" ; then slirp=internal elif test -z "$slirp" ; then @@ -5799,10 +5795,7 @@ case "$slirp" in esac case "$slirp" in - git | internal) - if test "$slirp" = git; then - git_submodules="${git_submodules} slirp" - fi + internal) mkdir -p slirp slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp" @@ -6464,7 +6457,7 @@ if test "$slirp" != "no"; then echo "SLIRP_CFLAGS=$slirp_cflags" >> $config_host_mak echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak fi -if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then +if [ "$slirp" = "internal" ]; then echo "config-host.h: subdir-slirp" >> $config_host_mak fi if test "$vde" = "yes" ; then