commit 9c885b67a9e6c30570084f1f78218defa0278d83
Author: Lee Yarwood <email address hidden>
Date: Thu Aug 13 16:56:35 2020 +0100
libvirt: Do not reference VIR_ERR_DEVICE_MISSING when libvirt is < v4.1.0
I7eb86edc130d186a66c04b229d46347ec5c0b625 introduced
VIR_ERR_DEVICE_MISSING into the hot unplug libvirt error code list
within detach_device_with_retry. While the change correctly referenced
that the error code was introduced in v4.1.0 it made no attempt to
handle versions prior to this. With MIN_LIBVIRT_VERSION currently pinned
to v4.0.0 we need to handle libvirt < v4.1.0 to avoid referencing the
non-existent error code within the libvirt module.
NOTE(lyarwood): Conflict as Ia3f1d8e83cbc574ce5cb440032e12bbcb1e10e98
landed ahead of this change in stable/rocky while it was behind it on
stable/stein.
Conflicts: nova/virt/libvirt/driver.py
Closes-Bug: #1891547
Change-Id: I32908b77c18f8ec08211dd67be49bbf903611c34
(cherry picked from commit bc96af565937072c04dea31781d86d2073b77ed4)
(cherry picked from commit 3f3b889f4e7e204a140d32d71201c4f23dd54c24)
(cherry picked from commit c61f4c8e20d712ba84a8965cbe0cba90c7d27d0b)
(cherry picked from commit 334a479ae2f4ce3d48dcc4c1b9e14d0cb9822272)
Reviewed: https:/ /review. opendev. org/747361 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=9c885b67a9e 6c30570084f1f78 218defa0278d83
Committed: https:/
Submitter: Zuul
Branch: stable/rocky
commit 9c885b67a9e6c30 570084f1f78218d efa0278d83
Author: Lee Yarwood <email address hidden>
Date: Thu Aug 13 16:56:35 2020 +0100
libvirt: Do not reference VIR_ERR_ DEVICE_ MISSING when libvirt is < v4.1.0
I7eb86edc13 0d186a66c04b229 d46347ec5c0b625 introduced ERR_DEVICE_ MISSING into the hot unplug libvirt error code list device_ with_retry. While the change correctly referenced
VIR_
within detach_
that the error code was introduced in v4.1.0 it made no attempt to
handle versions prior to this. With MIN_LIBVIRT_VERSION currently pinned
to v4.0.0 we need to handle libvirt < v4.1.0 to avoid referencing the
non-existent error code within the libvirt module.
NOTE(lyarwood): Conflict as Ia3f1d8e83cbc57 4ce5cb440032e12 bbcb1e10e98
landed ahead of this change in stable/rocky while it was behind it on
stable/stein.
Conflicts:
nova/virt/ libvirt/ driver. py
Closes-Bug: #1891547 c08211dd67be49b bf903611c34 c04dea31781d86d 2073b77ed4) a140d32d71201c4 f23dd54c24) a84a8965cbe0cba 90c7d27d0b) d48dcc4c1b9e14d 0cb9822272)
Change-Id: I32908b77c18f8e
(cherry picked from commit bc96af565937072
(cherry picked from commit 3f3b889f4e7e204
(cherry picked from commit c61f4c8e20d712b
(cherry picked from commit 334a479ae2f4ce3