From bc54171ea4f0820a0f55e4590d4c774d6e2a4add Mon Sep 17 00:00:00 2001 From: Brian McGillion Date: Tue, 31 Dec 2024 14:10:28 +0400 Subject: [PATCH] Fix gcc-14 build errors Signed-off-by: Brian McGillion --- .../qemu/0001-ivshmem-flat-memory-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlays/custom-packages/qemu/0001-ivshmem-flat-memory-support.patch b/overlays/custom-packages/qemu/0001-ivshmem-flat-memory-support.patch index 690f15352..c8292d9a0 100644 --- a/overlays/custom-packages/qemu/0001-ivshmem-flat-memory-support.patch +++ b/overlays/custom-packages/qemu/0001-ivshmem-flat-memory-support.patch @@ -158,7 +158,7 @@ index de49d1b..b1761b3 100644 error_setg(&s->migration_blocker, "Migration is disabled when using feature 'peer mode' in device 'ivshmem'"); - if (migrate_add_blocker(&s->migration_blocker, errp) < 0) { -+ if (migrate_add_blocker(s->migration_blocker, errp) < 0) { ++ if (migrate_add_blocker(&s->migration_blocker, errp) < 0) { + error_free(s->migration_blocker); return; } @@ -169,7 +169,7 @@ index de49d1b..b1761b3 100644 - migrate_del_blocker(&s->migration_blocker); + if (s->migration_blocker) { -+ migrate_del_blocker(s->migration_blocker); ++ migrate_del_blocker(&s->migration_blocker); + error_free(s->migration_blocker); + }