From 98cbf39fd3deccff0e4589cad1de41b4ee013e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 3 Apr 2019 11:05:59 +0100 Subject: [PATCH] Update to 5.2.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- ...-split-off-code-for-calling-rbd_list.patch | 149 ----------------- ...add-support-for-new-rbd_list2-method.patch | 96 ----------- ...error-report-when-firewall-chain-cre.patch | 137 ---------------- ...tup-of-ipv4-and-ipv6-top-level-chain.patch | 153 ------------------ ...ying-to-create-global-firewall-rules.patch | 50 ------ libvirt.spec | 46 +++--- sources | 2 +- 7 files changed, 19 insertions(+), 614 deletions(-) delete mode 100644 0001-storage-split-off-code-for-calling-rbd_list.patch delete mode 100644 0002-storage-add-support-for-new-rbd_list2-method.patch delete mode 100644 0003-network-improve-error-report-when-firewall-chain-cre.patch delete mode 100644 0004-network-split-setup-of-ipv4-and-ipv6-top-level-chain.patch delete mode 100644 0005-network-avoid-trying-to-create-global-firewall-rules.patch diff --git a/0001-storage-split-off-code-for-calling-rbd_list.patch b/0001-storage-split-off-code-for-calling-rbd_list.patch deleted file mode 100644 index 1689aa7..0000000 --- a/0001-storage-split-off-code-for-calling-rbd_list.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 092320f10b47bd6aca1f29278fcdc6b0efaf636a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 18 Mar 2019 10:58:48 +0000 -Subject: [PATCH 1/5] storage: split off code for calling rbd_list -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The rbd_list method has a quite unpleasant signature returning an -array of strings in a single buffer instead of an array. It is -being deprecated in favour of rbd_list2. To maintain clarity of -code when supporting both APIs in parallel, split the rbd_list -code out into a separate method. - -In splitting this we now honour the rbd_list failures. - -Reviewed-by: Ján Tomko -Signed-off-by: Daniel P. Berrangé -(cherry picked from commit 28c8403ed07896d6d7e06d7726ed904027206719) ---- - src/storage/storage_backend_rbd.c | 83 +++++++++++++++++++++---------- - 1 file changed, 58 insertions(+), 25 deletions(-) - -diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c -index 2b7af1db23..0865163756 100644 ---- a/src/storage/storage_backend_rbd.c -+++ b/src/storage/storage_backend_rbd.c -@@ -565,19 +565,68 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, - return ret; - } - -+ -+static char ** -+virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) -+{ -+ char **names = NULL; -+ size_t nnames = 0; -+ int rc; -+ size_t max_size = 1024; -+ VIR_AUTOFREE(char *) namebuf = NULL; -+ const char *name; -+ -+ while (true) { -+ if (VIR_ALLOC_N(namebuf, max_size) < 0) -+ goto error; -+ -+ rc = rbd_list(ptr->ioctx, namebuf, &max_size); -+ if (rc >= 0) -+ break; -+ if (rc != -ERANGE) { -+ virReportSystemError(-rc, "%s", _("Unable to list RBD images")); -+ goto error; -+ } -+ VIR_FREE(namebuf); -+ } -+ -+ for (name = namebuf; name < namebuf + max_size;) { -+ VIR_AUTOFREE(char *) namedup = NULL; -+ -+ if (STREQ(name, "")) -+ break; -+ -+ if (VIR_STRDUP(namedup, name) < 0) -+ goto error; -+ -+ if (VIR_APPEND_ELEMENT(names, nnames, namedup) < 0) -+ goto error; -+ -+ name += strlen(name) + 1; -+ } -+ -+ if (VIR_EXPAND_N(names, nnames, 1) < 0) -+ goto error; -+ -+ return names; -+ -+ error: -+ virStringListFreeCount(names, nnames); -+ return NULL; -+} -+ -+ - static int - virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) - { -- size_t max_size = 1024; - int ret = -1; -- int len = -1; - int r = 0; -- char *name; - virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); - virStorageBackendRBDStatePtr ptr = NULL; - struct rados_cluster_stat_t clusterstat; - struct rados_pool_stat_t poolstat; -- VIR_AUTOFREE(char *) names = NULL; -+ char **names = NULL; -+ size_t i; - - if (!(ptr = virStorageBackendRBDNewState(pool))) - goto cleanup; -@@ -602,33 +651,16 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) - def->source.name, clusterstat.kb, clusterstat.kb_avail, - poolstat.num_bytes); - -- while (true) { -- if (VIR_ALLOC_N(names, max_size) < 0) -- goto cleanup; -- -- len = rbd_list(ptr->ioctx, names, &max_size); -- if (len >= 0) -- break; -- if (len != -ERANGE) { -- VIR_WARN("%s", "A problem occurred while listing RBD images"); -- goto cleanup; -- } -- VIR_FREE(names); -- } -+ if (!(names = virStorageBackendRBDGetVolNames(ptr))) -+ goto cleanup; - -- for (name = names; name < names + max_size;) { -+ for (i = 0; names[i] != NULL; i++) { - VIR_AUTOPTR(virStorageVolDef) vol = NULL; - -- if (STREQ(name, "")) -- break; -- - if (VIR_ALLOC(vol) < 0) - goto cleanup; - -- if (VIR_STRDUP(vol->name, name) < 0) -- goto cleanup; -- -- name += strlen(name) + 1; -+ VIR_STEAL_PTR(vol->name, names[i]); - - r = volStorageBackendRBDRefreshVolInfo(vol, pool, ptr); - -@@ -661,6 +693,7 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) - ret = 0; - - cleanup: -+ virStringListFree(names); - virStorageBackendRBDFreeState(&ptr); - return ret; - } --- -2.20.1 - diff --git a/0002-storage-add-support-for-new-rbd_list2-method.patch b/0002-storage-add-support-for-new-rbd_list2-method.patch deleted file mode 100644 index b03dbee..0000000 --- a/0002-storage-add-support-for-new-rbd_list2-method.patch +++ /dev/null @@ -1,96 +0,0 @@ -From e8ec2592202387cca8e45cf15bd55ed5a952f3e3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 18 Mar 2019 11:11:38 +0000 -Subject: [PATCH 2/5] storage: add support for new rbd_list2 method -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The rbd_list method has been deprecated in Ceph >= 14.0.0 -in favour of the new rbd_list2 method which populates an -array of structs. - -Reviewed-by: Ján Tomko -Signed-off-by: Daniel P. Berrangé -(cherry picked from commit 3aa190f2a43a632b542a6ba751a6c3ab4d51f1dd) ---- - m4/virt-storage-rbd.m4 | 1 + - src/storage/storage_backend_rbd.c | 43 +++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - -diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4 -index 17e2115309..f3d9d04908 100644 ---- a/m4/virt-storage-rbd.m4 -+++ b/m4/virt-storage-rbd.m4 -@@ -33,6 +33,7 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [ - old_LIBS="$LIBS" - LIBS="$LIBS $LIBRBD_LIBS" - AC_CHECK_FUNCS([rbd_get_features],[],[LIBRBD_FOUND=no]) -+ AC_CHECK_FUNCS([rbd_list2]) - LIBS="$old_LIBS" - fi - -diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c -index 0865163756..bfc3419f9c 100644 ---- a/src/storage/storage_backend_rbd.c -+++ b/src/storage/storage_backend_rbd.c -@@ -566,6 +566,48 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, - } - - -+#ifdef HAVE_RBD_LIST2 -+static char ** -+virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) -+{ -+ char **names = NULL; -+ size_t nnames = 0; -+ int rc; -+ rbd_image_spec_t *images = NULL; -+ size_t nimages = 16; -+ size_t i; -+ -+ while (true) { -+ if (VIR_ALLOC_N(images, nimages) < 0) -+ goto error; -+ -+ rc = rbd_list2(ptr->ioctx, images, &nimages); -+ if (rc >= 0) -+ break; -+ if (rc != -ERANGE) { -+ virReportSystemError(-rc, "%s", _("Unable to list RBD images")); -+ goto error; -+ } -+ } -+ -+ if (VIR_ALLOC_N(names, nimages + 1) < 0) -+ goto error; -+ nnames = nimages; -+ -+ for (i = 0; i < nimages; i++) -+ VIR_STEAL_PTR(names[i], images->name); -+ -+ return names; -+ -+ error: -+ virStringListFreeCount(names, nnames); -+ rbd_image_spec_list_cleanup(images, nimages); -+ VIR_FREE(images); -+ return NULL; -+} -+ -+#else /* ! HAVE_RBD_LIST2 */ -+ - static char ** - virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) - { -@@ -614,6 +656,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr) - virStringListFreeCount(names, nnames); - return NULL; - } -+#endif /* ! HAVE_RBD_LIST2 */ - - - static int --- -2.20.1 - diff --git a/0003-network-improve-error-report-when-firewall-chain-cre.patch b/0003-network-improve-error-report-when-firewall-chain-cre.patch deleted file mode 100644 index 2e99a73..0000000 --- a/0003-network-improve-error-report-when-firewall-chain-cre.patch +++ /dev/null @@ -1,137 +0,0 @@ -From b990740b12117eaaf2797141a53a30b41f07c791 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 18 Mar 2019 17:31:21 +0000 -Subject: [PATCH 3/5] network: improve error report when firewall chain - creation fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -During startup we create some top level chains in which all -virtual network firewall rules will be placed. The upfront -creation is done to avoid slowing down creation of individual -virtual networks by checking for chain existance every time. - -There are some factors which can cause this upfront creation -to fail and while a message will get into the libvirtd log -this won't be seen by users who later try to start a virtual -network. Instead they'll just get a message saying that the -libvirt top level chain does not exist. This message is -accurate, but unhelpful for solving the root cause. - -This patch thus saves any error during daemon startup and -reports it when trying to create a virtual network later. - -Reviewed-by: Andrea Bolognani -Signed-off-by: Daniel P. Berrangé -(cherry picked from commit 9f4e35dc73ec9e940aa61bc7c140c2b800218ef3) ---- - src/network/bridge_driver.c | 3 +-- - src/network/bridge_driver_linux.c | 31 +++++++++++++++++++++------- - src/network/bridge_driver_nop.c | 3 +-- - src/network/bridge_driver_platform.h | 2 +- - 4 files changed, 27 insertions(+), 12 deletions(-) - -diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c -index b3ca5b8a15..1da60f0a21 100644 ---- a/src/network/bridge_driver.c -+++ b/src/network/bridge_driver.c -@@ -2108,8 +2108,7 @@ static void - networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup) - { - VIR_INFO("Reloading iptables rules"); -- if (networkPreReloadFirewallRules(startup) < 0) -- return; -+ networkPreReloadFirewallRules(startup); - virNetworkObjListForEach(driver->networks, - networkReloadFirewallRulesHelper, - NULL); -diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c -index b10d0a6c4d..c899f4b6d0 100644 ---- a/src/network/bridge_driver_linux.c -+++ b/src/network/bridge_driver_linux.c -@@ -35,11 +35,25 @@ VIR_LOG_INIT("network.bridge_driver_linux"); - - #define PROC_NET_ROUTE "/proc/net/route" - --int networkPreReloadFirewallRules(bool startup) -+static virErrorPtr errInit; -+ -+void networkPreReloadFirewallRules(bool startup) - { -- int ret = iptablesSetupPrivateChains(); -- if (ret < 0) -- return -1; -+ int rc; -+ -+ /* We create global rules upfront as we don't want -+ * the perf hit of conditionally figuring out whether -+ * to create them each time a network is started. -+ * -+ * Any errors here are saved to be reported at time -+ * of starting the network though as that makes them -+ * more likely to be seen by a human -+ */ -+ rc = iptablesSetupPrivateChains(); -+ if (rc < 0) { -+ errInit = virSaveLastError(); -+ virResetLastError(); -+ } - - /* - * If this is initial startup, and we just created the -@@ -54,10 +68,8 @@ int networkPreReloadFirewallRules(bool startup) - * rules will be present. Thus we can safely just tell it - * to always delete from the builin chain - */ -- if (startup && ret == 1) -+ if (startup && rc == 1) - iptablesSetDeletePrivate(false); -- -- return 0; - } - - -@@ -671,6 +683,11 @@ int networkAddFirewallRules(virNetworkDefPtr def) - virFirewallPtr fw = NULL; - int ret = -1; - -+ if (errInit) { -+ virSetError(errInit); -+ return -1; -+ } -+ - if (def->bridgeZone) { - - /* if a firewalld zone has been specified, fail/log an error -diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_nop.c -index a0e57012f9..ea9db338cb 100644 ---- a/src/network/bridge_driver_nop.c -+++ b/src/network/bridge_driver_nop.c -@@ -19,9 +19,8 @@ - - #include - --int networkPreReloadFirewallRules(bool startup ATTRIBUTE_UNUSED) -+void networkPreReloadFirewallRules(bool startup ATTRIBUTE_UNUSED) - { -- return 0; - } - - -diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h -index baeb22bc3e..95fd64bdc7 100644 ---- a/src/network/bridge_driver_platform.h -+++ b/src/network/bridge_driver_platform.h -@@ -58,7 +58,7 @@ struct _virNetworkDriverState { - typedef struct _virNetworkDriverState virNetworkDriverState; - typedef virNetworkDriverState *virNetworkDriverStatePtr; - --int networkPreReloadFirewallRules(bool startup); -+void networkPreReloadFirewallRules(bool startup); - void networkPostReloadFirewallRules(bool startup); - - int networkCheckRouteCollision(virNetworkDefPtr def); --- -2.20.1 - diff --git a/0004-network-split-setup-of-ipv4-and-ipv6-top-level-chain.patch b/0004-network-split-setup-of-ipv4-and-ipv6-top-level-chain.patch deleted file mode 100644 index b7832a6..0000000 --- a/0004-network-split-setup-of-ipv4-and-ipv6-top-level-chain.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 095c45036615a84c7150ea801d6932bdde1d5b49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 18 Mar 2019 16:49:32 +0000 -Subject: [PATCH 4/5] network: split setup of ipv4 and ipv6 top level chains -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -During startup libvirtd creates top level chains for both ipv4 -and ipv6 protocols. If this fails for any reason then startup -of virtual networks is blocked. - -The default virtual network, however, only requires use of ipv4 -and some servers have ipv6 disabled so it is expected that ipv6 -chain creation will fail. There could equally be servers with -no ipv4, only ipv6. - -This patch thus makes error reporting a little more fine grained -so that it works more sensibly when either ipv4 or ipv6 is -disabled on the server. Only the protocols that are actually -used by the virtual network have errors reported. - -Reviewed-by: Andrea Bolognani -Signed-off-by: Daniel P. Berrangé -(cherry picked from commit 686803a1a2e1e0641916b1c9e2c7e3910fe598d4) ---- - src/network/bridge_driver_linux.c | 34 +++++++++++++++++++++++++------ - src/util/viriptables.c | 14 ++++--------- - src/util/viriptables.h | 2 +- - 3 files changed, 33 insertions(+), 17 deletions(-) - -diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c -index c899f4b6d0..50fc197134 100644 ---- a/src/network/bridge_driver_linux.c -+++ b/src/network/bridge_driver_linux.c -@@ -35,10 +35,12 @@ VIR_LOG_INIT("network.bridge_driver_linux"); - - #define PROC_NET_ROUTE "/proc/net/route" - --static virErrorPtr errInit; -+static virErrorPtr errInitV4; -+static virErrorPtr errInitV6; - - void networkPreReloadFirewallRules(bool startup) - { -+ bool created = false; - int rc; - - /* We create global rules upfront as we don't want -@@ -49,11 +51,21 @@ void networkPreReloadFirewallRules(bool startup) - * of starting the network though as that makes them - * more likely to be seen by a human - */ -- rc = iptablesSetupPrivateChains(); -+ rc = iptablesSetupPrivateChains(VIR_FIREWALL_LAYER_IPV4); - if (rc < 0) { -- errInit = virSaveLastError(); -+ errInitV4 = virSaveLastError(); - virResetLastError(); - } -+ if (rc) -+ created = true; -+ -+ rc = iptablesSetupPrivateChains(VIR_FIREWALL_LAYER_IPV6); -+ if (rc < 0) { -+ errInitV6 = virSaveLastError(); -+ virResetLastError(); -+ } -+ if (rc) -+ created = true; - - /* - * If this is initial startup, and we just created the -@@ -68,7 +80,7 @@ void networkPreReloadFirewallRules(bool startup) - * rules will be present. Thus we can safely just tell it - * to always delete from the builin chain - */ -- if (startup && rc == 1) -+ if (startup && created) - iptablesSetDeletePrivate(false); - } - -@@ -683,8 +695,18 @@ int networkAddFirewallRules(virNetworkDefPtr def) - virFirewallPtr fw = NULL; - int ret = -1; - -- if (errInit) { -- virSetError(errInit); -+ if (errInitV4 && -+ (virNetworkDefGetIPByIndex(def, AF_INET, 0) || -+ virNetworkDefGetRouteByIndex(def, AF_INET, 0))) { -+ virSetError(errInitV4); -+ return -1; -+ } -+ -+ if (errInitV6 && -+ (virNetworkDefGetIPByIndex(def, AF_INET6, 0) || -+ virNetworkDefGetRouteByIndex(def, AF_INET6, 0) || -+ def->ipv6nogw)) { -+ virSetError(errInitV6); - return -1; - } - -diff --git a/src/util/viriptables.c b/src/util/viriptables.c -index d67b640a3b..0e3c0ad73a 100644 ---- a/src/util/viriptables.c -+++ b/src/util/viriptables.c -@@ -127,7 +127,7 @@ iptablesPrivateChainCreate(virFirewallPtr fw, - - - int --iptablesSetupPrivateChains(void) -+iptablesSetupPrivateChains(virFirewallLayer layer) - { - virFirewallPtr fw = NULL; - int ret = -1; -@@ -143,17 +143,11 @@ iptablesSetupPrivateChains(void) - }; - bool changed = false; - iptablesGlobalChainData data[] = { -- { VIR_FIREWALL_LAYER_IPV4, "filter", -+ { layer, "filter", - filter_chains, ARRAY_CARDINALITY(filter_chains), &changed }, -- { VIR_FIREWALL_LAYER_IPV4, "nat", -+ { layer, "nat", - natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed }, -- { VIR_FIREWALL_LAYER_IPV4, "mangle", -- natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed }, -- { VIR_FIREWALL_LAYER_IPV6, "filter", -- filter_chains, ARRAY_CARDINALITY(filter_chains), &changed }, -- { VIR_FIREWALL_LAYER_IPV6, "nat", -- natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed }, -- { VIR_FIREWALL_LAYER_IPV6, "mangle", -+ { layer, "mangle", - natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed }, - }; - size_t i; -diff --git a/src/util/viriptables.h b/src/util/viriptables.h -index 903f390f89..e680407ec8 100644 ---- a/src/util/viriptables.h -+++ b/src/util/viriptables.h -@@ -24,7 +24,7 @@ - # include "virsocketaddr.h" - # include "virfirewall.h" - --int iptablesSetupPrivateChains (void); -+int iptablesSetupPrivateChains (virFirewallLayer layer); - - void iptablesSetDeletePrivate (bool pvt); - --- -2.20.1 - diff --git a/0005-network-avoid-trying-to-create-global-firewall-rules.patch b/0005-network-avoid-trying-to-create-global-firewall-rules.patch deleted file mode 100644 index 047d75f..0000000 --- a/0005-network-avoid-trying-to-create-global-firewall-rules.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3e02ee9b5da7fc7197aaa6d57563349a7670b8a1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Wed, 13 Mar 2019 16:21:15 +0000 -Subject: [PATCH 5/5] network: avoid trying to create global firewall rules if - unprivileged -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The unprivileged libvirtd does not have permission to create firewall -rules, or bridge devices, or do anything to the host network in -general. Historically we still activate the network driver though and -let the network start API call fail. - -The startup code path which reloads firewall rules on active networks -would thus effectively be a no-op when unprivileged as it is impossible -for there to be any active networks - -With the change to use a global set of firewall chains, however, we now -have code that is run unconditionally. - -Ideally we would not register the network driver at all when -unprivileged, but the entanglement with the virt drivers currently makes -that impractical. As a temporary hack, we just make the firewall reload -into a no-op. - -Signed-off-by: Daniel P. Berrangé -(cherry picked from commit 5d010c3df6152cf5fb00f1f67d22151241f4a8a2) ---- - src/network/bridge_driver.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c -index 1da60f0a21..0e1d5efd8e 100644 ---- a/src/network/bridge_driver.c -+++ b/src/network/bridge_driver.c -@@ -2108,6 +2108,10 @@ static void - networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup) - { - VIR_INFO("Reloading iptables rules"); -+ /* Ideally we'd not even register the driver when unprivilegd -+ * but until we untangle the virt driver that's not viable */ -+ if (!driver->privileged) -+ return; - networkPreReloadFirewallRules(startup); - virNetworkObjListForEach(driver->networks, - networkReloadFirewallRulesHelper, --- -2.20.1 - diff --git a/libvirt.spec b/libvirt.spec index 147b2e2..2b62c77 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -15,7 +15,7 @@ # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -%{!?enable_autotools:%global enable_autotools 1} +%{!?enable_autotools:%global enable_autotools 0} # The hypervisor drivers that run in libvirtd %define with_qemu 0%{!?_without_qemu:1} @@ -215,8 +215,8 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 5.1.0 -Release: 3%{?dist} +Version: 5.2.0 +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ @@ -224,12 +224,6 @@ URL: https://libvirt.org/ %define mainturl stable_updates/ %endif Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz -Patch1: 0001-storage-split-off-code-for-calling-rbd_list.patch -Patch2: 0002-storage-add-support-for-new-rbd_list2-method.patch -Patch3: 0003-network-improve-error-report-when-firewall-chain-cre.patch -Patch4: 0004-network-split-setup-of-ipv4-and-ipv6-top-level-chain.patch -Patch5: 0005-network-avoid-trying-to-create-global-firewall-rules.patch - Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -1334,6 +1328,16 @@ then exit 1 fi +%post libs +%if 0%{?rhel} == 7 +/sbin/ldconfig +%endif + +%postun libs +%if 0%{?rhel} == 7 +/sbin/ldconfig +%endif + %pre daemon # 'libvirt' group is just to allow password-less polkit access to # libvirtd. The uid number is irrelevant, so we use dynamic allocation @@ -1453,16 +1457,6 @@ fi rm -rf %{_localstatedir}/lib/rpm-state/libvirt || : -%triggerun -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirtd.service >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del libvirtd >/dev/null 2>&1 || : -/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : - %if %{with_qemu} %pre daemon-driver-qemu # We want soft static allocation of well-known ids, as disk images @@ -1481,6 +1475,7 @@ exit 0 %endif %preun client + %systemd_preun libvirt-guests.service %post client @@ -1489,15 +1484,6 @@ exit 0 %postun client %systemd_postun libvirt-guests.service -%triggerun client -- libvirt < 0.9.4 -%{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||: - -# If the package is allowed to autostart: -/bin/systemctl --no-reload enable libvirt-guests.service >/dev/null 2>&1 ||: - -# Run this because the SysV package being removed won't do them -/sbin/chkconfig --del libvirt-guests >/dev/null 2>&1 || : - %if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then @@ -1828,6 +1814,7 @@ exit 0 %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storagecommon.rng %{_datadir}/libvirt/schemas/storagepool.rng +%{_datadir}/libvirt/schemas/storagepoolcaps.rng %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map/*.xml @@ -1900,6 +1887,9 @@ exit 0 %changelog +* Wed Apr 3 2019 Daniel P. Berrangé - 5.2.0-1 +- Update to 5.2.0 release + * Wed Mar 20 2019 Daniel P. Berrangé - 5.1.0-3 - Fix upgrades for rbd on i686 (rhbz #1688121) - Add missing xfsprogs-devel dep diff --git a/sources b/sources index 6fe063c..fd550c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-5.1.0.tar.xz) = ca64d7be683614bdeb20a8865655fe80f911cf13c00aed2334db3a2e4131e1dd6fe5e9663a24e6f82161ad5aa53f1a2637cd21730eed46e4764b7eebced94f3f +SHA512 (libvirt-5.2.0.tar.xz) = 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04