migration: Fix duplicated included in meson.build

[PATCH] migration: Fix duplicated included in meson.build

Posted by Juan Quintela 11 months, 3 weeks ago

This is the commint with the merge error (not in the submited patch).

commit 52623f23b0d114837a0d6278180b3e3ae8947117
Author: Lukas Straub <lukasstraub2@web.de>
Date:   Thu Apr 20 11:48:35 2023 +0200

    ram-compress.c: Make target independent

    Make ram-compress.c target independent.

Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/migration/meson.build b/migration/meson.build
index b81ccaec13..6b5c5a02f5 100644
--- a/migration/meson.build
+++ b/migration/meson.build
@@ -23,7 +23,6 @@ softmmu_ss.add(files(
   'migration.c',
   'multifd.c',
   'multifd-zlib.c',
-  'multifd-zlib.c',
   'ram-compress.c',
   'options.c',
   'postcopy-ram.c',
-- 
2.40.0

Re: [PATCH] migration: Fix duplicated included in meson.build

Posted by Peter Xu 11 months, 2 weeks ago

On Tue, May 09, 2023 at 07:02:17PM +0200, Juan Quintela wrote:
> This is the commint with the merge error (not in the submited patch).
> 
> commit 52623f23b0d114837a0d6278180b3e3ae8947117
> Author: Lukas Straub <lukasstraub2@web.de>
> Date:   Thu Apr 20 11:48:35 2023 +0200
> 
>     ram-compress.c: Make target independent
> 
>     Make ram-compress.c target independent.
> 
> Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
> Signed-off-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

Re: [PATCH] migration: Fix duplicated included in meson.build

Posted by Daniel P. Berrangé 11 months, 2 weeks ago

On Tue, May 09, 2023 at 07:02:17PM +0200, Juan Quintela wrote:
> This is the commint with the merge error (not in the submited patch).
> 
> commit 52623f23b0d114837a0d6278180b3e3ae8947117
> Author: Lukas Straub <lukasstraub2@web.de>
> Date:   Thu Apr 20 11:48:35 2023 +0200
> 
>     ram-compress.c: Make target independent
> 
>     Make ram-compress.c target independent.
> 
> Fixes: 52623f23b0d114837a0d6278180b3e3ae8947117
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  migration/meson.build | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|