From nobody Sat May 18 10:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1598636013; cv=none; d=zohomail.com; s=zohoarc; b=YZfRi1HuY1ySCdUnYaODleA7YUNgyc7Td7s7JUf1KhNs3cWZs68yo+tOZKfvhchWM7vTiPTfPavJ9OlH6LS190s1BEoMmRosT1978eMLLRJ07JQUQEDP9guT1cSxCz8X33rjGpP2YAxZ7xW4o7gyulBUw0+kjiNSG+Fin7nALCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598636013; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=UAV2VxiPeh/k1imQq8wDb2V7tbs05yxU2LPT+Ks9Xbc=; b=WBvm/SKAv+dI0yonL9rYo39hY07+48XX6s9Qg75tQYxiK29zv1YafZBH/bohWZpYEwJCuy88koQd4J4OkgTbKAhOeDJHKaeRiUM05OfLPUioj7XBJy/e54IejHsDTJ67FFMZk1b0BKwBw+3aP7iVr2gj4ufkHDiRi6YSG8LZDyI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1598636013522493.39750577347115; Fri, 28 Aug 2020 10:33:33 -0700 (PDT) Received: from localhost ([::1]:50052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBiFo-0007oj-6J for importer@patchew.org; Fri, 28 Aug 2020 13:33:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBiF4-0007KB-8R; Fri, 28 Aug 2020 13:32:46 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:37420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBiF2-0006T2-Jo; Fri, 28 Aug 2020 13:32:45 -0400 Received: by mail-ej1-x641.google.com with SMTP id e23so192596ejb.4; Fri, 28 Aug 2020 10:32:43 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:287e:2203:f280:c08]) by smtp.gmail.com with ESMTPSA id do6sm1590865ejc.35.2020.08.28.10.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 10:32:40 -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:mime-version :content-transfer-encoding; bh=UAV2VxiPeh/k1imQq8wDb2V7tbs05yxU2LPT+Ks9Xbc=; b=kzXe3gn404XKyNMCE5fChTdiWYauCsZkbrlAhrU+dikQVUR8Qm0ujAZ5ccGVURgIGg yO0tPCb3Ke2gOkUzUEf79JxneT1r5+rJS8sj+HFYP5oL+7DozuDnL+qNUjcvISF6/a05 Ofkf9MpGO8/F/Gp2Spy/FVGeiHHnhhsjJuFmMswzx+8o6GMHFE+BVZ90ESTR7CRBFnvC dRn2ysXdB6AFMslzDn4IyvvYF2dBBqopnbBeZT6XaJNtg5lbv832DLKfS6K5vrPe6dFO E2LoX0bvCQRcYuaDTrYwYAiP0XqRy6kbQCzZqK+fR6rWN5yLTVZOi0xJAOmrbhdoBagl Nqbw== 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 :mime-version:content-transfer-encoding; bh=UAV2VxiPeh/k1imQq8wDb2V7tbs05yxU2LPT+Ks9Xbc=; b=kdk8ZY6tWKoSwkPnrzuIXy05RZ/d2xNLVEQ4InoLEv7s4pY+DdvimgZMaBCcXmUtIB 9hp79HbRswzhF9wkHZQdaf9sUiiw2LD1Q+RgRdwbC4yeqDMWWENsdU0H9Vr9u5fANs6L HeMzRH4Lwx4h9isY+AHiN3gRjvBxvEgsEH5ryqtYcEH/9mXf7wyMiYqxeUoSz9IwB1RG bP45oGuf1gUiObnqSOfof2WhwlSGBb3k5ej8HQvIW8XS0dcAvKhUy0n16oiqqsvOgkKs k3ZA+sW9QAdXZFUv96p22ua1fUgfTTbEH7jvAxFavbzPErMwnB43+ln5m2JKbq9bDGjS mMVA== X-Gm-Message-State: AOAM531YhUvGILJtgfE6e0wrnWC+4vULifkwQrkw/RHE0NeAOhONPoH+ SicZwt3Gn3/n9nENyhggF+rSp/o4JDg= X-Google-Smtp-Source: ABdhPJx/UAnH+mKAvSRKOZjCCpLvUBsqpkRP764bqp1m+paCXbs2h0L985lfIA/YR855qE2pD7+pFA== X-Received: by 2002:a17:906:6c8b:: with SMTP id s11mr2959036ejr.310.1598635961728; Fri, 28 Aug 2020 10:32:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] block: always link with zlib Date: Fri, 28 Aug 2020 19:32:48 +0200 Message-Id: <20200828173248.24556-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: Thomas Huth , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The qcow2 driver needs the zlib dependency. While emulators provided it through the migration code, this is not true of the tools. Move the dependency from the qcow1 rule directly into block_ss so that it is included unconditionally. Fixes build with --disable-qcow1. Reported-by: Thomas Huth Cc: qemu-block@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- block/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/meson.build b/block/meson.build index 4dbbfe60b4..a3e56b7cd1 100644 --- a/block/meson.build +++ b/block/meson.build @@ -40,9 +40,9 @@ block_ss.add(files( 'vmdk.c', 'vpc.c', 'write-threshold.c', -), zstd) +), zstd, zlib) =20 -block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c')) +block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c')) block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c')) block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c')) block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c')) --=20 2.26.2