b495b9f65b
- spec: Enable the same hypervisor drivers for openSUSE and SLE jsc#SLE-11772 - spec: Enable the same storage drivers for openSUSE and SLE jsc#SLE-11877 - qemu: Reprobe capabilities if the qemu modules directory changes 2ad009ea-qemu-check-modules-dir.patch boo#1175320 - Update to libvirt 6.7.0 - jsc#SLE-14253, jsc#SLE-15159 - CVE-2020-14339 - Many incremental improvements and bug fixes, see https://libvirt.org/news.html - Dropped patches: 2edd63a0-fix-virFileSetCOW-logic.patch, 82bb167f-dont-cache-devmapper-major.patch, feb8564a-handle-no-devmapper.patch, 53d9af1e-ignore-devmapper-open-errors.patch, support-managed-pci-xen-driver.patch, disable-multipath-pr-tests.patch OBS-URL: https://build.opensuse.org/request/show/831542 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=840
221 lines
7.7 KiB
Diff
221 lines
7.7 KiB
Diff
Index: libvirt-6.7.0/tools/virsh.c
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/tools/virsh.c
|
|
+++ libvirt-6.7.0/tools/virsh.c
|
|
@@ -547,6 +547,8 @@ virshShowVersion(vshControl *ctl G_GNUC_
|
|
vshPrint(ctl, " Interface");
|
|
# if defined(WITH_NETCF)
|
|
vshPrint(ctl, " netcf");
|
|
+# elif defined(WITH_NETCONTROL)
|
|
+ vshPrint(ctl, " netcontrol");
|
|
# elif defined(WITH_UDEV)
|
|
vshPrint(ctl, " udev");
|
|
# endif
|
|
Index: libvirt-6.7.0/src/interface/interface_backend_netcf.c
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/src/interface/interface_backend_netcf.c
|
|
+++ libvirt-6.7.0/src/interface/interface_backend_netcf.c
|
|
@@ -21,7 +21,12 @@
|
|
|
|
#include <config.h>
|
|
|
|
-#include <netcf.h>
|
|
+#ifdef WITH_NETCONTROL
|
|
+# include <netcontrol/netcf.h>
|
|
+# include <netcontrol/logger.h>
|
|
+#else
|
|
+# include <netcf.h>
|
|
+#endif
|
|
|
|
#include "virerror.h"
|
|
#include "datatypes.h"
|
|
@@ -72,6 +77,37 @@ VIR_ONCE_GLOBAL_INIT(virNetcfDriverState
|
|
|
|
static virNetcfDriverStatePtr driver;
|
|
|
|
+#ifdef WITH_NETCONTROL
|
|
+static void
|
|
+interface_nc_log_driver(const char *category ATTRIBUTE_UNUSED,
|
|
+ int priority,
|
|
+ const char *func,
|
|
+ const char *file,
|
|
+ long long line,
|
|
+ const char *msg,
|
|
+ size_t len ATTRIBUTE_UNUSED)
|
|
+{
|
|
+ int vp;
|
|
+
|
|
+ switch (priority) {
|
|
+ case NC_LOG_FATAL:
|
|
+ case NC_LOG_ERROR:
|
|
+ vp = VIR_LOG_ERROR;
|
|
+ break;
|
|
+ case NC_LOG_WARN:
|
|
+ vp = VIR_LOG_WARN;
|
|
+ break;
|
|
+ case NC_LOG_INFO:
|
|
+ vp = VIR_LOG_INFO;
|
|
+ break;
|
|
+ case NC_LOG_DEBUG:
|
|
+ default:
|
|
+ vp = VIR_LOG_DEBUG;
|
|
+ break;
|
|
+ }
|
|
+ virLogMessage(&virLogSelf, vp, file, line, func, 0, "%s", msg);
|
|
+}
|
|
+#endif
|
|
|
|
static void
|
|
virNetcfDriverStateDispose(void *obj)
|
|
@@ -127,6 +163,10 @@ netcfStateInitialize(bool privileged,
|
|
virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0)
|
|
goto error;
|
|
|
|
+#ifdef WITH_NETCONTROL
|
|
+ nc_logger_redirect_to(interface_nc_log_driver);
|
|
+#endif
|
|
+
|
|
/* open netcf */
|
|
if (ncf_init(&driver->netcf, NULL) != 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
@@ -1116,6 +1156,7 @@ static int netcfInterfaceIsActive(virInt
|
|
return ret;
|
|
}
|
|
|
|
+#ifdef HAVE_NETCF_TRANSACTIONS
|
|
static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flags)
|
|
{
|
|
int ret;
|
|
@@ -1190,6 +1231,7 @@ static int netcfInterfaceChangeRollback(
|
|
virObjectUnlock(driver);
|
|
return ret;
|
|
}
|
|
+#endif /* HAVE_NETCF_TRANSACTIONS */
|
|
|
|
static virInterfaceDriver interfaceDriver = {
|
|
.name = INTERFACE_DRIVER_NAME,
|
|
@@ -1206,9 +1248,11 @@ static virInterfaceDriver interfaceDrive
|
|
.interfaceCreate = netcfInterfaceCreate, /* 0.7.0 */
|
|
.interfaceDestroy = netcfInterfaceDestroy, /* 0.7.0 */
|
|
.interfaceIsActive = netcfInterfaceIsActive, /* 0.7.3 */
|
|
+#ifdef HAVE_NETCF_TRANSACTIONS
|
|
.interfaceChangeBegin = netcfInterfaceChangeBegin, /* 0.9.2 */
|
|
.interfaceChangeCommit = netcfInterfaceChangeCommit, /* 0.9.2 */
|
|
.interfaceChangeRollback = netcfInterfaceChangeRollback, /* 0.9.2 */
|
|
+#endif /* HAVE_NETCF_TRANSACTIONS */
|
|
};
|
|
|
|
|
|
@@ -1239,6 +1283,19 @@ static virStateDriver interfaceStateDriv
|
|
|
|
int netcfIfaceRegister(void)
|
|
{
|
|
+ struct netcf *netcf;
|
|
+
|
|
+ /* Initialization of libnetcontrol will fail if NetworkManager is enabled.
|
|
+ * Skip registration if ncf_init fails.
|
|
+ * TODO: finer-grained check? E.g. is_nm_enabled()
|
|
+ */
|
|
+ if (ncf_init(&netcf, NULL) != 0) {
|
|
+ VIR_WARN("Failed to initialize libnetcontrol. Management of interface devices is disabled");
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ ncf_close(netcf);
|
|
+
|
|
if (virRegisterConnectDriver(&interfaceConnectDriver, false) < 0)
|
|
return -1;
|
|
if (virSetSharedInterfaceDriver(&interfaceDriver) < 0)
|
|
Index: libvirt-6.7.0/src/interface/interface_driver.c
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/src/interface/interface_driver.c
|
|
+++ libvirt-6.7.0/src/interface/interface_driver.c
|
|
@@ -30,8 +30,15 @@ interfaceRegister(void)
|
|
if (netcfIfaceRegister() == 0)
|
|
return 0;
|
|
#endif /* WITH_NETCF */
|
|
+#ifdef WITH_NETCONTROL
|
|
+ /* Attempt to load the netcontrol based backend, which is a slightly
|
|
+ patched netcf backend */
|
|
+ if (netcfIfaceRegister() == 0)
|
|
+ return 0;
|
|
+#endif /* WITH_NETCONTROL */
|
|
#if WITH_UDEV
|
|
- /* If there's no netcf or it failed to load, register the udev backend */
|
|
+ /* If there's no netcf or netcontrol, or it failed to load, register the
|
|
+ udev backend */
|
|
if (udevIfaceRegister() == 0)
|
|
return 0;
|
|
#endif /* WITH_UDEV */
|
|
Index: libvirt-6.7.0/meson.build
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/meson.build
|
|
+++ libvirt-6.7.0/meson.build
|
|
@@ -1201,6 +1201,12 @@ if netcf_dep.found()
|
|
conf.set('WITH_NETCF', 1)
|
|
endif
|
|
|
|
+netcontrol_version = '0.2.0'
|
|
+netcontrol_dep = dependency('netcontrol', version: '>=' + netcontrol_version, require: get_option('netcontrol'))
|
|
+if netcontrol_dep.found()
|
|
+ conf.set('WITH_NETCONTROL', 1)
|
|
+endif
|
|
+
|
|
have_gnu_gettext_tools = false
|
|
if not get_option('nls').disabled()
|
|
have_gettext = cc.has_function('gettext')
|
|
@@ -1632,10 +1638,10 @@ elif get_option('driver_hyperv').enabled
|
|
error('openwsman is required for the Hyper-V driver')
|
|
endif
|
|
|
|
-if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found())
|
|
+if not get_option('driver_interface').disabled() and conf.has('WITH_LIBVIRTD') and (udev_dep.found() or netcf_dep.found() or netcontrol_dep.found())
|
|
conf.set('WITH_INTERFACE', 1)
|
|
elif get_option('driver_interface').enabled()
|
|
- error('Requested the Interface driver without netcf or udev and libvirtd support')
|
|
+ error('Requested the Interface driver without netcf, netcontrol or udev and libvirtd support')
|
|
endif
|
|
|
|
if not get_option('driver_libxl').disabled() and conf.has('WITH_LIBVIRTD')
|
|
@@ -2442,6 +2448,7 @@ libs_summary = {
|
|
'libxml': libxml_dep.found(),
|
|
'macvtap': conf.has('WITH_MACVTAP'),
|
|
'netcf': netcf_dep.found(),
|
|
+ 'netcontrol': netcontrol_dep.found(),
|
|
'NLS': have_gnu_gettext_tools,
|
|
'nss': conf.has('WITH_NSS'),
|
|
'numactl': numactl_dep.found(),
|
|
Index: libvirt-6.7.0/src/interface/meson.build
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/src/interface/meson.build
|
|
+++ libvirt-6.7.0/src/interface/meson.build
|
|
@@ -2,7 +2,7 @@ interface_driver_sources = [
|
|
'interface_driver.c',
|
|
]
|
|
|
|
-if conf.has('WITH_NETCF')
|
|
+if conf.has('WITH_NETCF') or conf.has('WITH_NETCONTROL')
|
|
interface_driver_sources += 'interface_backend_netcf.c'
|
|
endif
|
|
|
|
@@ -23,6 +23,7 @@ if conf.has('WITH_INTERFACE')
|
|
access_dep,
|
|
libnl_dep,
|
|
netcf_dep,
|
|
+ netcontrol_dep,
|
|
udev_dep,
|
|
],
|
|
'link_args': [
|
|
Index: libvirt-6.7.0/meson_options.txt
|
|
===================================================================
|
|
--- libvirt-6.7.0.orig/meson_options.txt
|
|
+++ libvirt-6.7.0/meson_options.txt
|
|
@@ -30,6 +30,7 @@ option('libssh', type: 'feature', value:
|
|
option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support')
|
|
option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device')
|
|
option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
|
|
+option('netcontrol', type: 'feature', value: 'auto', description: 'netcontrol support')
|
|
option('nls', type: 'feature', value: 'auto', description: 'nls support')
|
|
option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
|
|
option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support')
|