From nobody Mon Feb 9 19:30:35 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598951653; cv=none; d=zohomail.com; s=zohoarc; b=R9FnqL++9bXYe7SebL3VlEbzpUMyWZW+OB+RtXcQJkxrtffcx4SgZvV2ejtKNHBDtNZohVUX2dYXPWoRdoPeJyHrqw0Z25fSvGRil2n7CSkcNTGCp1AXduceZZCteLSR0au7GIPmBYG8R4YB+Xs9Wj8y+CXhCnDQBHisHxnCrqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951653; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x7MJbvEh1OB7aVH3KPkQw4pq5I4JgItwiVYVmNd7OOM=; b=SOuHI3ZOkXQaRvkmUYLT25+JMbBULxDq1sRksXE+jDps5ps4g4RBU6fHf9rB8uKKf1GudZP3haWwLc1tU86m+gzCsMUARGtQEZQITGNZCokuVXcDAIsIRTqidPoH388t6UCeNXLwcsAlnA6tjPSy26hRcJlboi/tHk6zbR8JSNY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 159895165392529.937775551352843; Tue, 1 Sep 2020 02:14:13 -0700 (PDT) Received: from localhost ([::1]:58976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Mn-00082c-2C for importer@patchew.org; Tue, 01 Sep 2020 05:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KI-0003B9-Ig for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KH-0006og-2U for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -0400 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-416-w4kpHd5ePAuOkhFl2VwL1g-1; Tue, 01 Sep 2020 05:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC54B10082E8; Tue, 1 Sep 2020 09:11:33 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A30560C04; Tue, 1 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951496; 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=x7MJbvEh1OB7aVH3KPkQw4pq5I4JgItwiVYVmNd7OOM=; b=EgBsUCDcFdszWFVB+PC+aRLlOZn23ER25WL5NOEqiV7+kgbRwYar07ikE3r0Z1pPegBhrt 80uXY0JLuRr8vnrctJEDs0IBDdeQZ/0ktf7/acPP3V/qXShL6MplnkcPnitzaJmNwkYWx8 8KRcbz8RQmTJNmgfDbYdgreX7SKtk0M= X-MC-Unique: w4kpHd5ePAuOkhFl2VwL1g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/24] block: always link with zlib Date: Tue, 1 Sep 2020 05:11:10 -0400 Message-Id: <20200901091132.29601-3-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Thomas Huth , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Reviewed-by: Thomas Huth Cc: qemu-block@nongnu.org Signed-off-by: Paolo Bonzini --- 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