From fa8b1908cc59b6019f85cbf8a23b5ba2973b5241 Mon Sep 17 00:00:00 2001 From: AlexChen Date: Tue, 22 Sep 2020 23:06:28 +0800 Subject: [PATCH] libvirt: add the cherry-pick info Signed-off-by: AlexChen --- libxl-fix-crash-when-initializing-driver.patch | 1 + qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch | 1 + qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch | 1 + qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch | 1 + qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch | 1 + util-fix-iteration-in-virSocketAddrResolveService.patch | 1 + virNetDevGetFamilyId-Change-signature.patch | 1 + virNetDevSwitchdevFeature-Make-failure-to-get-family.patch | 1 + 8 files changed, 8 insertions(+) diff --git a/libxl-fix-crash-when-initializing-driver.patch b/libxl-fix-crash-when-initializing-driver.patch index 52fe32b..4d295c0 100644 --- a/libxl-fix-crash-when-initializing-driver.patch +++ b/libxl-fix-crash-when-initializing-driver.patch @@ -15,6 +15,7 @@ crash. Signed-off-by: Jim Fehlig Reviewed-by: Erik Skultety Reviewed-by: Ján Tomko +(cherry-picked from commit 88011ed2) Signed-off-by: AlexChen --- src/libxl/libxl_driver.c | 6 +++--- diff --git a/qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch b/qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch index fbe60e4..2fadfad 100644 --- a/qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch +++ b/qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch @@ -15,6 +15,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1822538 Signed-off-by: Michal Privoznik Reviewed-by: Pavel Mores +(cherry-picked from commit 67e19fc9) Signed-off-by: AlexChen --- src/qemu/qemu_driver.c | 21 +++++++++++++-------- diff --git a/qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch b/qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch index 1ba5cb6..5905cf7 100644 --- a/qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch +++ b/qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch @@ -25,6 +25,7 @@ virsh migrate --live --p2p --compressed \ Signed-off-by: Lin Ma Message-Id: <20200416044451.21134-1-lma@suse.com> Reviewed-by: Jiri Denemark +(cherry-picked from commit 93b15ba0) Signed-off-by: AlexChen --- src/qemu/qemu_migration_params.c | 1 - diff --git a/qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch b/qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch index 0af3152..9a94a86 100644 --- a/qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch +++ b/qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch @@ -17,6 +17,7 @@ Fixes: 4a4132b4625 Signed-off-by: Michal Privoznik Reviewed-by: Pavel Mores +(cherry-picked from commit 67b973b5) Signed-off-by: AlexChen --- src/qemu/qemu_domain.c | 8 ++++++++ diff --git a/qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch b/qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch index 1b1c2f3..bb6fc80 100644 --- a/qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch +++ b/qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch @@ -9,6 +9,7 @@ qemuhotplugtest wasting 15 seconds waiting for timeouts. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik +(cherry-picked from commit 2ab8dba5) Signed-off-by: AlexChen --- src/qemu/qemu_hotplug.c | 2 +- diff --git a/util-fix-iteration-in-virSocketAddrResolveService.patch b/util-fix-iteration-in-virSocketAddrResolveService.patch index d4a986b..f60a905 100644 --- a/util-fix-iteration-in-virSocketAddrResolveService.patch +++ b/util-fix-iteration-in-virSocketAddrResolveService.patch @@ -7,6 +7,7 @@ getaddrinfo returns linked list. Fix iteration accordingly. Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Daniel Henrique Barboza +(cherry-picked from commit a13ac587) Signed-off-by: AlexChen --- src/util/virsocketaddr.c | 2 +- diff --git a/virNetDevGetFamilyId-Change-signature.patch b/virNetDevGetFamilyId-Change-signature.patch index 2e490e9..2a0330c 100644 --- a/virNetDevGetFamilyId-Change-signature.patch +++ b/virNetDevGetFamilyId-Change-signature.patch @@ -17,6 +17,7 @@ on successful translation. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko +(cherry-picked from commit ca616274) Signed-off-by: AlexChen --- src/util/virnetdev.c | 23 +++++++++++++++-------- diff --git a/virNetDevSwitchdevFeature-Make-failure-to-get-family.patch b/virNetDevSwitchdevFeature-Make-failure-to-get-family.patch index 282f374..2934d73 100644 --- a/virNetDevSwitchdevFeature-Make-failure-to-get-family.patch +++ b/virNetDevSwitchdevFeature-Make-failure-to-get-family.patch @@ -22,6 +22,7 @@ where it's needed. Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko +(cherry-picked from commit 423664a6) Signed-off-by: AlexChen --- src/util/virnetdev.c | 7 ++++---