* [PATCH] block: always link with zlib
@ 2020-08-28 17:32 Paolo Bonzini
2020-08-31 8:31 ` Thomas Huth
2020-08-31 15:47 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2020-08-28 17:32 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, qemu-block
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 <thuth@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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)
-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'))
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] block: always link with zlib
2020-08-28 17:32 [PATCH] block: always link with zlib Paolo Bonzini
@ 2020-08-31 8:31 ` Thomas Huth
2020-08-31 15:47 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2020-08-31 8:31 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: qemu-block
On 28/08/2020 19.32, Paolo Bonzini wrote:
> 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 <thuth@redhat.com>
> Cc: qemu-block@nongnu.org
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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)
>
> -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'))
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block: always link with zlib
2020-08-28 17:32 [PATCH] block: always link with zlib Paolo Bonzini
2020-08-31 8:31 ` Thomas Huth
@ 2020-08-31 15:47 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-31 15:47 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Thomas Huth, qemu-devel@nongnu.org Developers, qemu-block
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
Le ven. 28 août 2020 19:33, Paolo Bonzini <pbonzini@redhat.com> a écrit :
> 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 <thuth@redhat.com>
> Cc: qemu-block@nongnu.org
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
> 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)
>
> -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'))
> --
> 2.26.2
>
>
>
[-- Attachment #2: Type: text/html, Size: 2551 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-31 15:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-28 17:32 [PATCH] block: always link with zlib Paolo Bonzini
2020-08-31 8:31 ` Thomas Huth
2020-08-31 15:47 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).