From: Juan Quintela <quintela@redhat.com>
Date: Tue, 9 May 2023 17:02:17 +0000 (+0200)
Subject: migration: Fix duplicated included in meson.build
X-Git-Tag: v8.1.0-rc0~116^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba9d2cbc01b4e33f9a97edcd77247831a333eac2;p=thirdparty%2Fqemu.git

migration: Fix duplicated included in meson.build

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: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20230509170217.83246-1-quintela@redhat.com>
---

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