[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] migration: Fix duplicated included in meson.build
|
From: |
Juan Quintela |
|
Subject: |
[PULL 12/12] migration: Fix duplicated included in meson.build |
|
Date: |
Thu, 18 May 2023 19:13:04 +0200 |
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>
---
migration/meson.build | 1 -
1 file changed, 1 deletion(-)
diff --git a/migration/meson.build b/migration/meson.build
index b3d0c537c8..a8e01e70ae 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',
--
2.40.1
- [PULL 04/12] migration: Don't use INT64_MAX for unlimited rate, (continued)
- [PULL 04/12] migration: Don't use INT64_MAX for unlimited rate, Juan Quintela, 2023/05/18
- [PULL 05/12] qemu-file: Account for rate_limit usage on qemu_fflush(), Juan Quintela, 2023/05/18
- [PULL 06/12] migration: Move rate_limit_max and rate_limit_used to migration_stats, Juan Quintela, 2023/05/18
- [PULL 07/12] migration: Move migration_total_bytes() to migration-stats.c, Juan Quintela, 2023/05/18
- [PULL 08/12] migration: Add a trace for migration_transferred_bytes, Juan Quintela, 2023/05/18
- [PULL 09/12] migration: Use migration_transferred_bytes() to calculate rate_limit, Juan Quintela, 2023/05/18
- [PULL 11/12] migration/multifd: Compute transferred bytes correctly, Juan Quintela, 2023/05/18
- [PULL 12/12] migration: Fix duplicated included in meson.build,
Juan Quintela <=
- [PULL 10/12] migration: We don't need the field rate_limit_used anymore, Juan Quintela, 2023/05/18