From patchwork Thu Dec 17 08:50:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11979291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46166C4361B for ; Thu, 17 Dec 2020 08:52:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AFCAB2388A for ; Thu, 17 Dec 2020 08:52:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFCAB2388A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpp19-0006G9-GD for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 03:52:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpozD-00047e-2Z for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:11 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:38655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpozB-0006zP-IZ for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:10 -0500 Received: by mail-ed1-x534.google.com with SMTP id cw27so27768215edb.5 for ; Thu, 17 Dec 2020 00:50:09 -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=zcxU3Rxj/pJG1xoPDfYItl/XH77RMBe4vQl+GWrFfq4=; b=ZAiRnXMPbSlHmhxw8mtC/YXnNxUVE9VkEWJVkX817JonL7RgaU1wpLpdeL2c3nOqhT dgUQfC+uiwZtmxmZXKRKAbIxj7dXcZ+hNj2+vjX2q5/0oDD0XliKKRNP+EQA8/EE7ZVR RZ3QSK97/zjahdD4RWcRg8OqsxDY7AVZKYXWIz0vVCpLIIvcO+8UUSWLFzfWjKzlhGQH 6Tm70uZp3UBjOaT+UKbL6BMskPhvnYJoXFJaKltLWCyQ9LyBkRJHinJIuvU4Y0i3KoYr U/GXTmNOVspVsahvFSvE1kVb1awQHGbZpONuIGn8IdUb1p5cslbPWIZBNlbNQOPM+CxB ib3Q== 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=zcxU3Rxj/pJG1xoPDfYItl/XH77RMBe4vQl+GWrFfq4=; b=HRCz72W7t0lN2nlDnEALljVZUKYRWSCfmNeIqjln+jSk7koWMa3MUulMcyDik2ndlR zmB09IVfbMTE3v9YHQ770VJ1RIDruGLw2hKXMYrSXODWBB72m24F1bp1pkgbc1DBAGLt hjSMKn3+iSywvfHtlY9HhsmM7iXluG/yu0AV9kuxUkWIlWyF974XR0fAnbO946PhKOxl pb2sFhQcmRR60otSx8MqPFAoIilDv7H+bmVtsC9Ho0bwWU0ryn23h5/3/QT+ANoakZbJ ylgmrhDpv4c9AU8Ng2PNwHUcpUI+3CqjzCEl+mo2uEBmvQ4Jrvt88pxS4Pexgucfybh1 w2sA== X-Gm-Message-State: AOAM5306Vstir6sf4Aw9DP8hkE5xv11WFK+2S2VeV4cFHmfLaI+glIr9 L/kJov7M3pCL0EoJIpWy4iqtE95PV8c= X-Google-Smtp-Source: ABdhPJwsEPa5Q2UpwN1vYwhe/lZpgowuXLpTX+/WXZHOE6WKMdJJG1nNr82jjhH1kwPaA4tuqeKLHw== X-Received: by 2002:aa7:db01:: with SMTP id t1mr37361085eds.185.1608195008361; Thu, 17 Dec 2020 00:50:08 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id dd12sm22949542edb.6.2020.12.17.00.50.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 00:50:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/4] configure: remove useless code to check for Xen PCI passthrough Date: Thu, 17 Dec 2020 09:50:02 +0100 Message-Id: <20201217085005.10644-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217085005.10644-1-pbonzini@redhat.com> References: <20201217085005.10644-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" meson.build is already doing the same check, so remove it from configure. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-André Lureau --- configure | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure b/configure index 708cf365f0..085a5ad7ff 100755 --- a/configure +++ b/configure @@ -2879,18 +2879,6 @@ EOF fi fi -if test "$xen_pci_passthrough" != "disabled"; then - if test "$xen" = "enabled" && test "$linux" = "yes"; then - xen_pci_passthrough=enabled - else - if test "$xen_pci_passthrough" = "enabled"; then - error_exit "User requested feature Xen PCI Passthrough" \ - " but this feature requires /sys from Linux" - fi - xen_pci_passthrough=disabled - fi -fi - ########################################## # X11 probe if $pkg_config --exists "x11"; then From patchwork Thu Dec 17 08:50:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11979289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0118C4361B for ; Thu, 17 Dec 2020 08:51:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 050332388A for ; Thu, 17 Dec 2020 08:51:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 050332388A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpp0W-0005SI-FA for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 03:51:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpozE-00048i-G0 for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:12 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:40708) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpozC-00070L-Fz for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:12 -0500 Received: by mail-ej1-x630.google.com with SMTP id x16so36709035ejj.7 for ; Thu, 17 Dec 2020 00:50:10 -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=yABgzrIgh18AAhbAFD7vLn70cv4k6N/nxvU8BfZ1dRA=; b=n9V903o9bOeRK4Rd7/u0UcH0bKCsNJTE/oxbZgwDb4uxyKEYvbVrPp5xmZFU5EBo6W K2KEfMQnBG6duAVJS04nUKkhilhb2uOSJiRPZv0P2eifaQYuSUmJM9g9yYGCcs6MphvF 13TPJ1LbK+hUknyxZbZUKNFew04JCSQCrAB/VIuvktEX0sBX2+QsCnRH/FbJUjDXgHMp beIXRvT3EJ4O5+Y4Z5H9dQcCcbU7Lk48ps93FPMhbsTiD1LcFP5R3D9qof/W85WD2hem 6xYXUa22+WQer4l+LdE2qnZf6n/GhQoRFU1fjIaSllfsopvtBA3ltDInmQW/brMS3niz DI1g== 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=yABgzrIgh18AAhbAFD7vLn70cv4k6N/nxvU8BfZ1dRA=; b=fQs5vgOeF0M0tNCflf+mH24d4UaGANFww3+AF1Y5JX/gMrXmdKevIXS50qWhusE/C8 3XnD8yBkuAeFhGjl0AZ/xYhxOO6v9riQN3GWacw/rwfz175iid01jSEXBjqSbrdhcooz y5ZuBW9X441gmRYvNQdMsxC/WRL2kyyHVTKZ5HU+kzDJk7qD1LmjTXjUd7tNvuG+Ta+k q0zK0BPtc3Cl8/tYpV69eBDhaNJfa3kcczz0NG3yfLIsXdVmLQoH4mtdAk16kBgukaVD hq0/ZoDvZPR73jTSxlit7AqmjHmz0fxkx9b/j95j+xEjgpK+K3fLc5Hgpv+HlwIFRK0Q 83ig== X-Gm-Message-State: AOAM532UdFXpHzY7hTznnAw5L9ObfeZlMEvX3vUhbxAQYxAsXFEtbQS3 T+jXks177X5rMOIywOusvk3HMlgzPtM= X-Google-Smtp-Source: ABdhPJwAyU2fDaTPHXFzRqKrytNYtkBF8iYoDoinHdD0BTcYYSjq1By6ZaX7Bxv6b4umdokm+U7VTg== X-Received: by 2002:a17:906:814a:: with SMTP id z10mr33426039ejw.96.1608195009195; Thu, 17 Dec 2020 00:50:09 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id dd12sm22949542edb.6.2020.12.17.00.50.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 00:50:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/4] configure: remove variable bogus_os Date: Thu, 17 Dec 2020 09:50:03 +0100 Message-Id: <20201217085005.10644-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217085005.10644-1-pbonzini@redhat.com> References: <20201217085005.10644-1-pbonzini@redhat.com> MIME-Version: 1.0 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The condition can be tested also from $targetos, clean up. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Reviewed-by: Marc-André Lureau --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index 085a5ad7ff..18af8207d9 100755 --- a/configure +++ b/configure @@ -467,7 +467,6 @@ gettext="auto" fuse="auto" fuse_lseek="auto" -bogus_os="no" malloc_trim="auto" # parse CC options second @@ -620,7 +619,6 @@ else # might be going to just print the --help text, or it might # be the result of a missing compiler. targetos='bogus' - bogus_os='yes' fi # Some host OSes need non-standard checks for which CPU to use. @@ -2016,7 +2014,7 @@ if test -z "$werror" ; then fi fi -if test "$bogus_os" = "yes"; then +if test "$targetos" = "bogus"; then # Now that we know that we're not printing the help and that # the compiler works (so the results of the check_defines we used # to identify the OS are reliable), if we didn't recognize the From patchwork Thu Dec 17 08:50:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11979293 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 877A7C4361B for ; Thu, 17 Dec 2020 08:53:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 175742388A for ; Thu, 17 Dec 2020 08:53:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 175742388A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpp2D-0007d6-7H for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 03:53:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpozF-00049f-MG for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:13 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:34671) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpozD-00070T-O8 for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:13 -0500 Received: by mail-ed1-x536.google.com with SMTP id dk8so27801440edb.1 for ; Thu, 17 Dec 2020 00:50:11 -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=1UWB/KbKVBfapzCvrRRtEQyA2vOZPGrms88j7Z9G7LA=; b=qnIpSxHs6n6nh0Zk24EP8Ib/NUvCEc332qV8vXq0EiBV4ZgC9K/z7im5p5LhnuEr8/ fAlrnIb9DzJuX1bP5t98RwWgJ9xHfihgglbtUiSBPx6dhOR8oxCeEdP+EgESuGXFKAoK o5OhCYej9Yox5rcZX51yNqLGhBDaiMjxLAACAd0Pqfl6nRqqSGY+emNcDP0O9+Npj1w8 TdPRD9Tiyo4p+1hd3+5IviWD1WR7bTTfFv3Iprr/pb3XeX+KyZ4x0s6ZQRfREe5m0iBd f/hywn2jXmtQog0bnQkkUp0SDd2F/+bcaDWZ6MmcEY6kS29tQ1ZdCcKryPGXqLqNYCMJ kfRA== 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=1UWB/KbKVBfapzCvrRRtEQyA2vOZPGrms88j7Z9G7LA=; b=C8K4GrO1+D4NJp7lhc+lQO8K1WxlywTHhdVD50J8k4Q+pmiVnZZoWAMSydC3CeEGo8 zl3vCha92UccMoE8slBJ0rU9gqThJPF4izIK8wMSnueugpMZ6q9FNBb7g9JlHSVMQiZv 48PDKW8v4D6x4RrhvlBMpZNzuoevkhp7o03akpWonVEMPipONbnPJQOjVGCXG5wWufyN 8VZFQd20UdG83G+RivEOA4KQczZB7NZFGWScJGVf4uGybnj0wXEq+wnw9egTCWOxdVuH X/Rf+0pCQXbDp+AWwsS2MHLgVoKmjgyKhaLuIWi8UwR0T1VWBb853IeyoO6C1Ff+/pkp QyTA== X-Gm-Message-State: AOAM53281G1A3VhP/6Lz9jyqp0gKn789aFg63s5Ww9cbT2ZVbkeSFJ/i 6kjMIDiAcT4FvNrNLX+fPFwvwFTEGCI= X-Google-Smtp-Source: ABdhPJykutOwnk6GqAzZaAFB+ADpEmZSm4uAwj6qA0xfBrsU7Uvb5Wq85FFoA35foI4PIqcYpyU2Og== X-Received: by 2002:a05:6402:352:: with SMTP id r18mr36550511edw.373.1608195010113; Thu, 17 Dec 2020 00:50:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id dd12sm22949542edb.6.2020.12.17.00.50.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 00:50:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/4] configure: accept --enable-slirp Date: Thu, 17 Dec 2020 09:50:04 +0100 Message-Id: <20201217085005.10644-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217085005.10644-1-pbonzini@redhat.com> References: <20201217085005.10644-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Meson understands -Dslirp=enabled, so there is no reason not to accept the configure option as well. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Reviewed-by: Marc-André Lureau --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 18af8207d9..568818e72d 100755 --- a/configure +++ b/configure @@ -1083,6 +1083,8 @@ for opt do ;; --disable-slirp) slirp="disabled" ;; + --enable-slirp) slirp="enabled" + ;; --enable-slirp=git) slirp="internal" ;; --enable-slirp=system) slirp="system" From patchwork Thu Dec 17 08:50:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11979287 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B768BC2BB40 for ; Thu, 17 Dec 2020 08:51:34 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1AC7323899 for ; Thu, 17 Dec 2020 08:51:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1AC7323899 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpp0W-0005Tm-UX for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 03:51:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpozF-00049x-UB for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:13 -0500 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:38653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpozE-00070e-A7 for qemu-devel@nongnu.org; Thu, 17 Dec 2020 03:50:13 -0500 Received: by mail-ed1-x531.google.com with SMTP id cw27so27768345edb.5 for ; Thu, 17 Dec 2020 00:50:11 -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=AQWAnc6Cy9wCfLr/SfdyiSneflQ+1u+pan2MYebIIjs=; b=P4flaldiYERsJakV0ICGnrcaB8i+fWH9bG3LHwG/R9/huiAO77zPAFzTMWOBlUesqj D4J3p94KhN+8Ju6SZmu/8m9c9iN7MC/fkRphTvwLENhMk3lUGwqsQhEpJMp7ZjNRVMkK hyGahAWIR1ihPiiAERnWAF3GkcKdXJ56RYSe0hOxyXLboqN9oZ+GiUpJ6gzR6FC2N9yM 7ZkjxVxLSwQzJoTOSTwEhBViWCqEzXyS4eX9Eclz26cp1ehVphCzolme8q5oi0IEST2B YQdeyZ9cPsiioQl5LnDeGDIwF8p+zhkvm6B79+X2pxpIUswji1udjA3IJPO0IxJNvV+I 0rzg== 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=AQWAnc6Cy9wCfLr/SfdyiSneflQ+1u+pan2MYebIIjs=; b=Xqh57ZVMI/OpTfpw4nlv9481SgDHgvTOjubDTpy4PobJtLoRI4JBkr5rtPWhyXu2ET /gs8QReUiPlmARkxWVp5OZ7716UoiKk0h/K25E4ea9JDO55Q1UdNwzxArLMXk96Bb1sS I5PNdBsgmphlhNgNSSi0jEBz65krPRbMwe3zn0vMdC7ndFyAwfwIR0fQfv3Fby2FM1CH 4t48Hc9R0AWWJb+MwALQFBwzzGpsD9IzzTpjldRFiTvh/7ZIlda8jE8poj/hDWyz5ADu CJTFyyI6thkTpBXGdVkmmjXoqUnlH4WUTEe30ZBJUt73l7zaBedMXgEFaQmERFT1SFSL NNUw== X-Gm-Message-State: AOAM530b+mv5RKlnazGH9h7IUPqYPjy6YyT+WU7Lpu5YkFEgd3w8Y9iM lpp/JcDX4xtVJgCHsIGVGyH89Ke6O74= X-Google-Smtp-Source: ABdhPJwLmkkSZoxeGIAPsO40f8vJaE/jCwQ3RnKGaxpoHJkASRYl9IgApOM8pQyDEeccLMqM6oKk1g== X-Received: by 2002:a05:6402:8da:: with SMTP id d26mr10070053edz.157.1608195011015; Thu, 17 Dec 2020 00:50:11 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id dd12sm22949542edb.6.2020.12.17.00.50.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 00:50:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/4] configure: remove CONFIG_FILEVERSION and CONFIG_PRODUCTVERSION Date: Thu, 17 Dec 2020 09:50:05 +0100 Message-Id: <20201217085005.10644-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217085005.10644-1-pbonzini@redhat.com> References: <20201217085005.10644-1-pbonzini@redhat.com> MIME-Version: 1.0 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" version.rc can just use existing preprocessor symbols. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-André Lureau --- configure | 9 --------- version.rc | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 568818e72d..74eebfd692 100755 --- a/configure +++ b/configure @@ -5929,15 +5929,6 @@ if test "$bigendian" = "yes" ; then fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak - rc_version=$(cat $source_path/VERSION) - version_major=${rc_version%%.*} - rc_version=${rc_version#*.} - version_minor=${rc_version%%.*} - rc_version=${rc_version#*.} - version_subminor=${rc_version%%.*} - version_micro=0 - echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak - echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak if test "$guest_agent_with_vss" = "yes" ; then echo "CONFIG_QGA_VSS=y" >> $config_host_mak echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak diff --git a/version.rc b/version.rc index d8e1569991..0daadbf981 100644 --- a/version.rc +++ b/version.rc @@ -2,8 +2,8 @@ #include "config-host.h" VS_VERSION_INFO VERSIONINFO -FILEVERSION CONFIG_FILEVERSION -PRODUCTVERSION CONFIG_PRODUCTVERSION +FILEVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0 +PRODUCTVERSION QEMU_VERSION_MAJOR,QEMU_VERSION_MINOR,QEMU_VERSION_MICRO,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP