dddaf7aa9e
- vdpa-dev: Fix initialisation order to restore VDUSE compatibility - tcg: Allow top bit of SIMD_DATA_BITS to be set in simd_desc() - migration: fix-possible-int-overflow - target/m68k: Map FPU exceptions to FPSR register - qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo - hvf: arm: Fix encodings for ID_AA64PFR1_EL1 and debug System registers - hw/intc/arm_gic: Fix handling of NS view of GICC_APR<n> - qio: Inherit follow_coroutine_ctx across TLS - target/riscv: Fix the element agnostic function problem - accel/tcg: Fix typo causing tb->page_addr[1] to not be recorded - tcg/loongarch64: Fix tcg_out_movi vs some pcrel pointers - migration: Fix file migration with fdset - ui/vnc: don't return an empty SASL mechlist to the client - target/arm: Fix FJCVTZS vs flush-to-zero - hw/ppc/e500: Prefer QOM cast - sphinx/qapidoc: Fix to generate doc for explicit, unboxed arguments - hw/ppc/e500: Remove unused "irqs" parameter - hw/ppc/e500: Add missing device tree properties to i2c controller node - hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb() - hw/arm/mps2-tz.c: fix RX/TX interrupts order - target/i386: csv: Add support to migrate the incoming context for CSV3 guest - target/i386: csv: Add support to migrate the outgoing context for CSV3 guest - target/i386: csv: Add support to migrate the incoming page for CSV3 guest - target/i386: csv: Add support to migrate the outgoing page for CSV3 guest - linux-headers: update kernel headers to include CSV3 migration cmds - vfio: Only map shared region for CSV3 virtual machine - vga: Force full update for CSV3 guest - target/i386: csv: Load initial image to private memory for CSV3 guest - target/i386: csv: Do not register/unregister guest secure memory for CSV3 guest - target/i386: cpu: Populate CPUID 0x8000_001F when CSV3 is active - target/i386: csv: Add command to load vmcb to CSV3 guest memory - target/i386: csv: Add command to load data to CSV3 guest memory - target/i386: csv: Add command to initialize CSV3 context - target/i386: csv: Add CSV3 context - next-kbd: convert to use qemu_input_handler_register() - qemu/bswap: Undefine CPU_CONVERT() once done - exec/memop: Remove unused memop_big_endian() helper - hw/nvme: fix handling of over-committed queues - 9pfs: fix crash on 'Treaddir' request - hw/misc/psp: Pin the hugepage memory specified by mem2 during use for psp - hw/misc: support tkm use mem2 memory - hw/i386: add mem2 option for qemu - kvm: add support for guest physical bits - target/i386: add guest-phys-bits cpu property Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit f45f35e88509a4ffa9f62332ee9601e9fe1f8d09)
66 lines
2.5 KiB
Diff
66 lines
2.5 KiB
Diff
From 6c76354fdfbebca55e080fea5ae6bfc8a3db2d91 Mon Sep 17 00:00:00 2001
|
|
From: Fabiano Rosas <farosas@suse.de>
|
|
Date: Mon, 17 Jun 2024 15:57:17 -0300
|
|
Subject: [PATCH] migration: Fix file migration with fdset
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
When the "file:" migration support was added we missed the special
|
|
case in the qemu_open_old implementation that allows for a particular
|
|
file name format to be used to refer to a set of file descriptors that
|
|
have been previously provided to QEMU via the add-fd QMP command.
|
|
|
|
When using this fdset feature, we should not truncate the migration
|
|
file because being given an fd means that the management layer is in
|
|
control of the file and will likely already have some data written to
|
|
it. This is further indicated by the presence of the 'offset'
|
|
argument, which indicates the start of the region where QEMU is
|
|
allowed to write.
|
|
|
|
Fix the issue by replacing the O_TRUNC flag on open by an ftruncate
|
|
call, which will take the offset into consideration.
|
|
|
|
Fixes: 385f510df5 ("migration: file URI offset")
|
|
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Fabiano Rosas <farosas@suse.de>
|
|
(cherry picked from commit 6d3279655ac49b806265f08415165f471d33e032)
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
migration/file.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/migration/file.c b/migration/file.c
|
|
index 5d4975f43e..fb3f743e54 100644
|
|
--- a/migration/file.c
|
|
+++ b/migration/file.c
|
|
@@ -46,12 +46,19 @@ void file_start_outgoing_migration(MigrationState *s,
|
|
|
|
trace_migration_file_outgoing(filename);
|
|
|
|
- fioc = qio_channel_file_new_path(filename, O_CREAT | O_WRONLY | O_TRUNC,
|
|
- 0600, errp);
|
|
+ fioc = qio_channel_file_new_path(filename, O_CREAT | O_WRONLY, 0600, errp);
|
|
if (!fioc) {
|
|
return;
|
|
}
|
|
|
|
+ if (ftruncate(fioc->fd, offset)) {
|
|
+ error_setg_errno(errp, errno,
|
|
+ "failed to truncate migration file to offset %" PRIx64,
|
|
+ offset);
|
|
+ object_unref(OBJECT(fioc));
|
|
+ return;
|
|
+ }
|
|
+
|
|
ioc = QIO_CHANNEL(fioc);
|
|
if (offset && qio_channel_io_seek(ioc, offset, SEEK_SET, errp) < 0) {
|
|
return;
|
|
--
|
|
2.41.0.windows.1
|
|
|