From d2a735cd61ad4e684737d08fce10e07b6034eeb1 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 18 Aug 2022 15:21:12 +0200 Subject: [PATCH] libvirt-python-8.5.0-2.el9 - Add VIR_DOMAIN_IOTHREAD_THREAD_POOL_{MIN,MAX} macros (rhbz#2117475) Resolves: rhbz#2117475 --- ...IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch | 42 +++++++++++++++++++ libvirt-python.spec | 9 +++- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 libvirt-python-Add-VIR_DOMAIN_IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch diff --git a/libvirt-python-Add-VIR_DOMAIN_IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch b/libvirt-python-Add-VIR_DOMAIN_IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch new file mode 100644 index 0000000..7eee91c --- /dev/null +++ b/libvirt-python-Add-VIR_DOMAIN_IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch @@ -0,0 +1,42 @@ +From 75d1f57e95c4447a607b8007da54af5bbec34850 Mon Sep 17 00:00:00 2001 +Message-Id: <75d1f57e95c4447a607b8007da54af5bbec34850@dist-git> +From: Michal Privoznik +Date: Thu, 7 Jul 2022 16:04:10 +0200 +Subject: [PATCH] Add VIR_DOMAIN_IOTHREAD_THREAD_POOL_{MIN,MAX} macros + +The python version of virDomainSetIOThreadParams +(setIOThreadParams()), expects two arguments on input: the thread +ID and a dictionary which is then translated into our typed +parameters. During this translation we use a helper array which +holds type for each typed parameter supported +(virPyDomainSetIOThreadParams[]). Otherwise we guess what the +correct type is. Now, when introducing +VIR_DOMAIN_IOTHREAD_THREAD_POOL_{MIN,MAX} typed params into +libvirt I forgot to update the array. Do that now. + +Signed-off-by: Michal Privoznik +(cherry picked from commit b943a5bd18b4cc765719c0dbc628a077c3db4d52) +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2117475 +Signed-off-by: Michal Privoznik +--- + libvirt-override.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libvirt-override.c b/libvirt-override.c +index cba67d9..2a2a7dd 100644 +--- a/libvirt-override.c ++++ b/libvirt-override.c +@@ -1695,6 +1695,10 @@ static virPyTypedParamsHint virPyDomainSetIOThreadParams[] = { + { VIR_DOMAIN_IOTHREAD_POLL_MAX_NS, VIR_TYPED_PARAM_ULLONG }, + { VIR_DOMAIN_IOTHREAD_POLL_GROW, VIR_TYPED_PARAM_UINT }, + { VIR_DOMAIN_IOTHREAD_POLL_SHRINK, VIR_TYPED_PARAM_UINT }, ++# if LIBVIR_CHECK_VERSION(8, 5, 0) ++ { VIR_DOMAIN_IOTHREAD_THREAD_POOL_MIN, VIR_TYPED_PARAM_INT }, ++ { VIR_DOMAIN_IOTHREAD_THREAD_POOL_MAX, VIR_TYPED_PARAM_INT }, ++# endif /* LIBVIR_CHECK_VERSION(8, 5, 0) */ + }; + + static PyObject * +-- +2.35.1 + diff --git a/libvirt-python.spec b/libvirt-python.spec index 710e973..2eb6121 100644 --- a/libvirt-python.spec +++ b/libvirt-python.spec @@ -15,12 +15,14 @@ Summary: The libvirt virtualization API python3 binding Name: libvirt-python Version: 8.5.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Source0: https://libvirt.org/sources/python/%{name}-%{version}.tar.gz +Patch1: libvirt-python-Add-VIR_DOMAIN_IOTHREAD_THREAD_POOL_-MIN-MAX-macros.patch + Url: https://libvirt.org License: LGPLv2+ BuildRequires: git -BuildRequires: libvirt-devel >= 8.5.0-1 +BuildRequires: libvirt-devel >= 8.5.0-5 BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-lxml @@ -91,6 +93,9 @@ exit 1 %{python3_sitearch}/*egg-info %changelog +* Thu Aug 18 2022 Jiri Denemark - 8.5.0-2 +- Add VIR_DOMAIN_IOTHREAD_THREAD_POOL_{MIN,MAX} macros (rhbz#2117475) + * Wed Jul 13 2022 Jiri Denemark - 8.5.0-1 - Rebased to libvirt-python-8.5.0 (rhbz#2060316) - The rebase also fixes the following bugs: