From mboxrd@z Thu Jan 1 00:00:00 1970 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,URIBL_BLOCKED,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 99C8CC433B4 for ; Thu, 1 Apr 2021 11:24:42 +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 E444D61057 for ; Thu, 1 Apr 2021 11:24:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E444D61057 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]:35294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRvRI-0002Q0-UM for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 07:24:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRvPE-0000jU-3q for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:32 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:45795) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRvP8-0006f7-Pi for qemu-devel@nongnu.org; Thu, 01 Apr 2021 07:22:28 -0400 Received: by mail-ej1-x62f.google.com with SMTP id kt15so2290969ejb.12 for ; Thu, 01 Apr 2021 04:22:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1IcJHZyWpO/pWzAWPdVNwmrH82JES7JifZR+yxZDkO4=; b=Mx7pugEdrtG+Vwkxd754jIWT9HUuoeR/Beh4jwjzcPuIRtBLyaf2Rfzin9vD8HgBeB pOE3dYjj5bs3Tw5ICyyKu1kGmmUcnucdGfTIzP15BAaEQc/i3ML09HeZHOq8dbkBxmbd VT7rDENcD0YJrfxIp3v60en4fozV++Lr1wlkBaZ6HWKqEpD6gaMwlb8SXgTIWV9siGwa rtoU6NlkbPsAXLfbzmaZwlj/X+sfHoslwRn+pNkO1kFZaEkT+6f116Vdg0aI5zq3OxJE s5toSj7wThsjQUX2bAhUim2/RYO2fowQY+4qhy5Q9wcUQhTT07Ld2zqRLAHqtubrJsc3 tFjg== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1IcJHZyWpO/pWzAWPdVNwmrH82JES7JifZR+yxZDkO4=; b=d9OW0dPQwJTE9z/nC6XsSWv7XWHZaVCvhXKpilimznnlTKn4VzYjGZdivSbXShHF7p QqapDZDDWa/cACKpzg9hMM+l115IH+ol+dTsSbND9ohtBrCg/WWn8WdUBiLdNHIxk2iI AGAyHT0Z9p9TzKpl5a89ksq9mAvxaaDPgpKCW/P4WNOQx7TLS5LEj+gsZzOrjGh/k7vV hHbLSLPglTRBurtr1Qk1l0uunnHGQgzljgQ9Nszlsjd/Veg5xNfDS1674afa3oVkfmHe vOFi6EWXGAt7UDYsYjXQXlGhfey/mW1qBTxx0/iPcipJlX/DtO3qOUxd6sWyGaami5ZW P/ng== X-Gm-Message-State: AOAM531CvBLHaawaw5WBUfqDsYph6Q64rlbuZrfOO9b0HlrOGYpP8pIH hPQvLh1gT17/gHE+YYWkaqArTAHCQFU= X-Google-Smtp-Source: ABdhPJx86jexRrzV6LPGagGURyZ6V+ipLYVAc4qR5Psnck/LP1cS+UmTADfxQA/H/4942Vg8aUFoVg== X-Received: by 2002:a17:906:4705:: with SMTP id y5mr8645653ejq.119.1617276145690; Thu, 01 Apr 2021 04:22:25 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d15sm3383516edx.62.2021.04.01.04.22.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Apr 2021 04:22:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/12] meson: Propagate gnutls dependency to migration Date: Thu, 1 Apr 2021 13:22:12 +0200 Message-Id: <20210401112223.55711-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210401112223.55711-1-pbonzini@redhat.com> References: <20210401112223.55711-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62f.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: , Cc: Jessica Clarke , Juan Quintela Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jessica Clarke Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this for softmmu configs, which pull in migration's use of gnutls. This fixes the following compilation failure on Arm-based Macs: In file included from migration/multifd.c:23: In file included from migration/tls.h:25: In file included from include/io/channel-tls.h:26: In file included from include/crypto/tlssession.h:24: include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not found #include ^~~~~~~~~~~~~~~~~ 1 error generated. (as well as for channel.c and tls.c) Signed-off-by: Jessica Clarke Reviewed-by: Juan Quintela Message-Id: <20210320171221.37437-1-jrtc27@jrtc27.com> Signed-off-by: Paolo Bonzini --- migration/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/meson.build b/migration/meson.build index 9645f44005..6fa2f8745d 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -24,7 +24,7 @@ softmmu_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', -)) +), gnutls) softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) softmmu_ss.add(when: 'CONFIG_LIVE_BLOCK_MIGRATION', if_true: files('block.c')) -- 2.30.1