- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Be consistent with vir*Obj*Remove* APIs
by John Ferlan 23 Mar '18

23 Mar '18

Using comments from recent changes/reviews w/ libxl and usage of the virDomainObjListRemove which note that it's "a problem" that the Remove API expects a locked @obj on input, but then returns the @obj unlocked. Although adjusting domainobjlist is a "future" task, we can at least modify the other drivers/vir*obj modules to be consistent at least with respect to expecting and returning a locked (and reffed) object. Thus, modify interface, secret, nodedev, and storage pool. The network is already done this way and nwfilter appears to be a lost cause as we cannot come to a concensus over how to use hash objects and thus the code still uses forward linked list object manipulation. Changes for virdomainobjlist require a number of other changes to happen first with respect to consistent usage of Find and Add API's to return locked and ref counted objects, then being able to have the virDomainObjListRemove be consistent as well. John Ferlan (4): secret: Return with locked obj from virSecretObjListRemove interface: Return with locked obj from virInterfaceObjListRemove nodedev: Return with locked obj from virNodeDeviceObjListRemove storagepool: Return with locked obj from virStoragePoolObjRemove src/conf/virinterfaceobj.c | 13 ++++++++++++- src/conf/virnodedeviceobj.c | 13 ++++++++++++- src/conf/virsecretobj.c | 15 ++++++++------- src/conf/virstorageobj.c | 17 ++++++++++++++--- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_udev.c | 2 +- src/secret/secret_driver.c | 4 ---- src/storage/storage_driver.c | 12 +----------- src/test/test_driver.c | 20 +++++--------------- 9 files changed, 55 insertions(+), 45 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH] lxc: report error message raised by the failing function
by Prafull 23 Mar '18

23 Mar '18

The code that calls VIR_WARN after a function fails, doesn't report the error message raised by the failing function. Such error messages are now reported in lxc/lxc_driver.c Signed-off-by: Prafullkumar T <talep158(a)gmail.com> --- src/lxc/lxc_driver.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f6b93b..4f600f3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3915,8 +3915,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), perms) < 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4011,8 +4011,8 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, goto cleanup; } else { VIR_WARN("setting bandwidth on interfaces of " - "type '%s' is not implemented yet", - virDomainNetTypeToString(actualType)); + "type '%s' is not implemented yet: %s", + virDomainNetTypeToString(actualType), virGetLastErrorMessage()); } } @@ -4116,8 +4116,8 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver, if (virUSBDeviceFileIterate(usb, virLXCTeardownHostUSBDeviceCgroup, priv->cgroup) < 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4190,8 +4190,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4262,8 +4262,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4434,8 +4434,8 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, src, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(def); @@ -4567,8 +4567,8 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, if (virUSBDeviceFileIterate(usb, virLXCTeardownHostUSBDeviceCgroup, priv->cgroup) < 0) - VIR_WARN("cannot deny device %s for domain %s", - dst, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + dst, vm->def->name, virGetLastErrorMessage()); virObjectLock(hostdev_mgr->activeUSBHostdevs); virUSBDeviceListDel(hostdev_mgr->activeUSBHostdevs, usb); @@ -4623,8 +4623,8 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, def->source.caps.u.storage.block, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); @@ -4673,8 +4673,8 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, def->source.caps.u.misc.chardev, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.misc.chardev, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.misc.chardev, vm->def->name, virGetLastErrorMessage()); virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); -- 2.1.4

3 2

[libvirt] [PATCH] remote: remove some __sun conditionals
by Daniel P. Berrangé 23 Mar '18

23 Mar '18

The libvirtd daemon has some arbitrary logic to drop privileges, but only on Solaris platforms. This was added during Xen days, when Xen was the only driver running in libvirtd. There's no expectation or testing that this works with the new libxl stack, nor whether dropping privileges breaks any of the secondary drivers. Finally, we'll be splitting drivers out into their own independant daemons, so this won't be applicable to libvirtd in future anyway. The remote driver client meanwhile arbitrarily disables daemon auto-spawn when connecting as non-root, breaking a key feature of libvirt unprivileged connections. Since we've not had any contributions for Solaris since circa 2012 and we don't do any CI testing we should consider this platform unmaintained and thus reasonable to remove this cruft. If someone steps forward to maintain Solaris again, this code would need re-evaluating to come up with something more targetted. There's various __sun conditionals in the Xen driver code, but those are not touched. This is all for the legacy Xen driver, which will be entirely removed at some point in future, so not benefit to hacking out just the Solaris parts. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon.c | 33 --------------------------------- src/remote/remote_driver.c | 2 -- 2 files changed, 35 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 2f9dfad443..31c6ce1b61 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -675,30 +675,6 @@ daemonVersion(const char *argv0) printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); } -#ifdef __sun -static int -daemonSetupPrivs(void) -{ - chown("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID); - - if (__init_daemon_priv(PU_RESETGROUPS | PU_CLEARLIMITSET, - SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { - VIR_ERROR(_("additional privileges are required")); - return -1; - } - - if (priv_set(PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, - PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { - VIR_ERROR(_("failed to set reduced privileges")); - return -1; - } - - return 0; -} -#else -# define daemonSetupPrivs() 0 -#endif - static void daemonShutdownHandler(virNetDaemonPtr dmn, siginfo_t *sig ATTRIBUTE_UNUSED, @@ -1336,15 +1312,6 @@ int main(int argc, char **argv) { goto cleanup; } - /* Beyond this point, nothing should rely on using - * getuid/geteuid() == 0, for privilege level checks. - */ - VIR_DEBUG("Dropping privileges (if required)"); - if (daemonSetupPrivs() < 0) { - ret = VIR_DAEMON_ERR_PRIVS; - goto cleanup; - } - daemonInitialize(); remoteProcs[REMOTE_PROC_AUTH_LIST].needAuth = false; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f765c09416..34e5ced0a9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1350,7 +1350,6 @@ remoteConnectOpen(virConnectPtr conn, */ if (!conn->uri) { VIR_DEBUG("Auto-probe remote URI"); -#ifndef __sun if (geteuid() > 0) { VIR_DEBUG("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; @@ -1359,7 +1358,6 @@ remoteConnectOpen(virConnectPtr conn, STRNEQ(autostart, "0"))) rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; } -#endif } ret = doRemoteOpen(conn, priv, auth, conf, rflags); -- 2.14.3

2 1

[libvirt] [dbus PATCH v2] Convert testsuite from unittest to pytest
by Katerina Koukiou 23 Mar '18

23 Mar '18

Move to pytest to take advantage of: * tests parametrization * pdb support * more compact tests - not forcing large test classes Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- HACKING.md | 2 +- test/Makefile.am | 7 ++++--- test/conftest.py | 15 +++++++++++++++ test/libvirttest.py | 49 +++++++++++++++++++++++++++++-------------------- test/test_connect.py | 33 +++++++++++++++++---------------- test/test_domain.py | 37 +++++++++++++++++++------------------ test/travis-run | 2 +- 7 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 test/conftest.py diff --git a/HACKING.md b/HACKING.md index 75aa6d0..bb22fd6 100644 --- a/HACKING.md +++ b/HACKING.md @@ -35,7 +35,7 @@ Running from git repository make check ``` - The test tool requires python3 and python3-dbus. + The test tool requires python3, python3-pytest and python3-dbus. * To run libvirt-dbus directly from the build dir without installing it diff --git a/test/Makefile.am b/test/Makefile.am index d3997f3..acb2d33 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,17 +1,18 @@ test_helpers = \ - libvirttest.py + libvirttest.py \ + conftest.py test_programs = \ test_connect.py \ test_domain.py -TESTS = $(test_programs) - EXTRA_DIST = \ $(test_helpers) \ $(test_programs) \ travis-run +TESTS = $(test_programs) + TESTS_ENVIRONMENT = \ abs_top_builddir=$(abs_top_builddir) \ VIRT_DBUS_INTERFACES_DIR=$(abs_top_srcdir)/data diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 0000000..3bce7b7 --- /dev/null +++ b/test/conftest.py @@ -0,0 +1,15 @@ +import os +import pytest +import subprocess + + +(a)pytest.fixture(scope="session", autouse=True) +def dbus_daemon_session(): + """Fixture to start D-Bus message bus session daemon for use in the whole test suite. + """ + dbus_daemon = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], + stdout=subprocess.PIPE, universal_newlines=True) + os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_daemon.stdout.readline().strip() + yield + dbus_daemon.terminate() + dbus_daemon.wait(timeout=10) diff --git a/test/libvirttest.py b/test/libvirttest.py index 6a00aea..23fe536 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -1,34 +1,37 @@ -#!/usr/bin/python3 - from dbus.mainloop.glib import DBusGMainLoop from gi.repository import GLib import dbus import os +import pytest import subprocess +import sys import time -import unittest + root = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) exe = os.path.join(root, 'src', 'libvirt-dbus') DBusGMainLoop(set_as_default=True) -class TestCase(unittest.TestCase): - @classmethod - def setUpClass(cls): - cls.bus = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], - stdout=subprocess.PIPE, universal_newlines=True) - os.environ['DBUS_SESSION_BUS_ADDRESS'] = cls.bus.stdout.readline().strip() - @classmethod - def tearDownClass(cls): - cls.bus.terminate() - cls.bus.wait(timeout=10) +def run(): + exit(pytest.main(sys.argv)) - def setUp(self): - os.environ['LIBVIRT_DEBUG'] = '3' - self.daemon = subprocess.Popen([exe]) +class BaseTestClass(): + """ Base test class for whole test suite + """ + connect = None + bus = None + libvirt_dbus = None + loop = False + + @pytest.fixture(autouse=True) + def libvirt_dbus_setup(self, request): + """Start libvirt-dbus for each test function + """ + os.environ['LIBVIRT_DEBUG'] = '3' + self.libvirt_dbus = subprocess.Popen([exe]) self.bus = dbus.SessionBus() for i in range(10): @@ -41,12 +44,18 @@ class TestCase(unittest.TestCase): obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') - def tearDown(self): - self.daemon.terminate() - self.daemon.wait(timeout=10) + @pytest.fixture(autouse=True) + def libvirt_dbus_teardown(self): + """Terminate libvirt-dbus at the teardown of each test + """ + yield + self.libvirt_dbus.terminate() + self.libvirt_dbus.wait(timeout=10) def main_loop(self): - self.assertFalse(getattr(self, 'loop', False)) + """Initializes the mainloop + """ + assert getattr(self, 'loop', False) is False def timeout(): self.loop.quit() diff --git a/test/test_connect.py b/test/test_connect.py index 4ec3fe0..a52140c 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -2,9 +2,10 @@ import dbus import libvirttest -import unittest -minimal_xml = ''' + +class TestConnect(libvirttest.BaseTestClass): + minimal_xml = ''' <domain type="test"> <name>foo</name> <memory>1024</memory> @@ -12,16 +13,15 @@ minimal_xml = ''' <type>hvm</type> </os> </domain> -''' + ''' -class TestConnect(libvirttest.TestCase): def test_list_domains(self): domains = self.connect.ListDomains(0) - self.assertEqual(type(domains), dbus.Array) - self.assertEqual(len(domains), 1) + assert isinstance(domains, dbus.Array) + assert len(domains) == 1 for path in domains: - self.assertEqual(type(path), dbus.ObjectPath) + assert isinstance(path, dbus.ObjectPath) domain = self.bus.get_object('org.libvirt', path) # ensure the path exists by calling Introspect on it @@ -29,29 +29,30 @@ class TestConnect(libvirttest.TestCase): def test_create(self): def domain_started(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStarted', domain_started) - path = self.connect.CreateXML(minimal_xml, 0) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.CreateXML(self.minimal_xml, 0) + assert isinstance(path, dbus.ObjectPath) self.main_loop() def test_define(self): def domain_defined(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainDefined', domain_defined) - path = self.connect.DefineXML(minimal_xml) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.DefineXML(self.minimal_xml) + assert isinstance(path, dbus.ObjectPath) self.main_loop() + if __name__ == '__main__': - unittest.main(verbosity=2) + libvirttest.run() diff --git a/test/test_domain.py b/test/test_domain.py index b1ab7a5..1bf9c1b 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -2,9 +2,9 @@ import dbus import libvirttest -import unittest -class TestDomain(libvirttest.TestCase): + +class TestDomain(libvirttest.BaseTestClass): def domain(self): path = self.connect.ListDomains(0)[0] obj = self.bus.get_object('org.libvirt', path) @@ -14,21 +14,21 @@ class TestDomain(libvirttest.TestCase): obj, domain = self.domain() props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(type(props['Name']), dbus.String) - self.assertEqual(type(props['UUID']), dbus.String) - self.assertEqual(type(props['Id']), dbus.UInt32) - self.assertEqual(type(props['Vcpus']), dbus.UInt32) - self.assertEqual(type(props['OSType']), dbus.String) - self.assertEqual(type(props['Active']), dbus.Boolean) - self.assertEqual(type(props['Persistent']), dbus.Boolean) - self.assertEqual(type(props['State']), dbus.String) - self.assertEqual(type(props['Autostart']), dbus.Boolean) + assert isinstance(props['Name'], dbus.String) + assert isinstance(props['UUID'], dbus.String) + assert isinstance(props['Id'], dbus.UInt32) + assert isinstance(props['Vcpus'], dbus.UInt32) + assert isinstance(props['OSType'], dbus.String) + assert isinstance(props['Active'], dbus.Boolean) + assert isinstance(props['Persistent'], dbus.Boolean) + assert isinstance(props['State'], dbus.String) + assert isinstance(props['Autostart'], dbus.Boolean) # Call all methods except Reset and GetStats, because the test backend # doesn't support those xml = domain.GetXMLDesc(0) - self.assertEqual(type(xml), dbus.String) + assert isinstance(xml, dbus.String) domain.Reboot(0) domain.Shutdown() @@ -38,8 +38,8 @@ class TestDomain(libvirttest.TestCase): def test_shutdown(self): def domain_stopped(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStopped', domain_stopped) @@ -48,14 +48,14 @@ class TestDomain(libvirttest.TestCase): domain.Shutdown() state = obj.Get('org.libvirt.Domain', 'State', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(state, 'shutoff') + assert state == 'shutoff' self.main_loop() def test_undefine(self): def domain_undefined(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainUndefined', domain_undefined) @@ -66,5 +66,6 @@ class TestDomain(libvirttest.TestCase): self.main_loop() + if __name__ == '__main__': - unittest.main(verbosity=2) + libvirttest.run() diff --git a/test/travis-run b/test/travis-run index 7577253..80b6dec 100755 --- a/test/travis-run +++ b/test/travis-run @@ -22,7 +22,7 @@ sudo chroot "$CHROOT" << EOF set -ex # install build deps apt-get update -apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus +apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus python3-pytest dbus # run build and tests as user chown -R buildd:buildd /build -- 2.15.0

3 2

[libvirt] [PATCH v2 0/2] introduce libvirt-dbus binding
by Pavel Hrdina 23 Mar '18

23 Mar '18

Pavel Hrdina (2): docs: fix a typo in docs.html page docs: introduce libvirt-dbus binding docs/bindings.html.in | 13 ++++++- docs/dbus.html.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 8 ++-- docs/downloads.html.in | 15 ++++++++ 4 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 docs/dbus.html.in -- 2.14.3

2 4

[libvirt] [PATCH RFC] storage: Remove 'cow' disk format
by Peter Krempa 23 Mar '18

23 Mar '18

There's no tests for this format and nothing seems to specifically care about this format. QEMU does not even recognize it. Remove it completely. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/schemas/storagecommon.rng | 1 - src/util/virstoragefile.c | 31 +------------------------------ src/util/virstoragefile.h | 3 +-- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index edee1b0845..310ed758ff 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -78,7 +78,6 @@ we know how to follow backing chains, and all others --> <define name='storageFormatBacking'> <choice> - <value>cow</value> <value>qcow</value> <value>qcow2</value> <value>qed</value> diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 67b9ec71ac..dd07f09d2c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -67,7 +67,7 @@ VIR_ENUM_IMPL(virStorageFileFormat, /* Not direct file formats, but used for various drivers */ "fat", "vhd", "ploop", /* Formats with backing file below here */ - "cow", "qcow", "qcow2", "qed", "vmdk") + "qcow", "qcow2", "qed", "vmdk") VIR_ENUM_IMPL(virStorageFileFeature, VIR_STORAGE_FILE_FEATURE_LAST, @@ -170,8 +170,6 @@ struct FileTypeInfo { }; -static int cowGetBackingStore(char **, int *, - const char *, size_t); static int qcow1GetBackingStore(char **, int *, const char *, size_t); static int qcow2GetBackingStore(char **, int *, @@ -348,11 +346,6 @@ static struct FileTypeInfo const fileTypeInfo[] = { PLOOP_SIZE_MULTIPLIER, NULL, NULL, NULL }, /* All formats with a backing store probe below here */ - [VIR_STORAGE_FILE_COW] = { - 0, "OOOM", NULL, - LV_BIG_ENDIAN, 4, 4, {2}, - 4+4+1024+4, 8, 1, NULL, cowGetBackingStore, NULL - }, [VIR_STORAGE_FILE_QCOW] = { 0, "QFI", NULL, LV_BIG_ENDIAN, 4, 4, {1}, @@ -397,28 +390,6 @@ static const int qcow2CompatibleFeatureArray[] = { verify(ARRAY_CARDINALITY(qcow2CompatibleFeatureArray) == QCOW2_COMPATIBLE_FEATURE_LAST); -static int -cowGetBackingStore(char **res, - int *format, - const char *buf, - size_t buf_size) -{ -#define COW_FILENAME_MAXLEN 1024 - *res = NULL; - *format = VIR_STORAGE_FILE_AUTO; - - if (buf_size < 4+4+ COW_FILENAME_MAXLEN) - return BACKING_STORE_INVALID; - if (buf[4+4] == '\0') { /* cow_header_v2.backing_file[0] */ - *format = VIR_STORAGE_FILE_NONE; - return BACKING_STORE_OK; - } - - if (VIR_STRNDUP(*res, (const char*)buf + 4 + 4, COW_FILENAME_MAXLEN) < 0) - return BACKING_STORE_ERROR; - return BACKING_STORE_OK; -} - static int qcow2GetBackingStoreFormat(int *format, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 596746ccb7..c84e013f46 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -82,8 +82,7 @@ typedef enum { * libvirt support for following a backing chain */ VIR_STORAGE_FILE_BACKING, - VIR_STORAGE_FILE_COW = VIR_STORAGE_FILE_BACKING, - VIR_STORAGE_FILE_QCOW, + VIR_STORAGE_FILE_QCOW = VIR_STORAGE_FILE_BACKING, VIR_STORAGE_FILE_QCOW2, VIR_STORAGE_FILE_QED, VIR_STORAGE_FILE_VMDK, -- 2.16.2

2 2

[libvirt] [PATCH] docs: introduce libvirt-dbus binding
by Pavel Hrdina 23 Mar '18

23 Mar '18

libvirt-dbus is a new binding that wraps libvirt API into D-Bus calls. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/bindings.html.in | 4 ++ docs/dbus.html.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 1 + docs/downloads.html.in | 15 ++++++++ 4 files changed, 122 insertions(+) create mode 100644 docs/dbus.html.in diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 733c89bc20..236bdcf2ae 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -18,6 +18,10 @@ <strong>Go</strong>: Daniel Berrange develops <a href="https://godoc.org/github.com/libvirt/libvirt-go">Go bindings</a>. </li> + <li> + <strong>D-Bus</strong>: Pavel Hrdina develops + <a href="dbus.html">D-Bus bindings</a>. + </li> <li> <strong>Java</strong>: Daniel Veillard develops <a href="java.html">Java bindings</a>. diff --git a/docs/dbus.html.in b/docs/dbus.html.in new file mode 100644 index 0000000000..0da8096122 --- /dev/null +++ b/docs/dbus.html.in @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>D-Bus API bindings</h1> + + <ul id="toc"></ul> + + <h2><a name="description">Description</a></h2> + + <p> + libvirt-dbus wraps libvirt API to provide a high-level object-oriented + API better suited for dbus-based applications. + </p> + + <h2><a name="git">GIT source repository</a></h2> + <p> + The D-Bus bindings source code is maintained in a + <a href="https://git-scm.com/">git</a> repository available on + <a href="https://libvirt.org/git/">libvirt.org</a>: + </p> + +<pre> +git clone https://libvirt.org/git/libvirt-dbus.git +</pre> + + <p> + They can also be browsed online: + </p> + +<pre> +<a href="https://libvirt.org/git/?p=libvirt-dbus.git">https://libvirt.org/git/?p=libvirt-dbus.git</a> +</pre> + + <h2><a name="usage">Usage</a></h2> + + <p> + libvirt-dbus exports libvirt API using D-Bus objects with methods and + properties described by interfaces. Currently only local connection + to libvirt is exported and the list of supported drivers depends + on the type of the bus connection (session or system). + </p> + + <p> + The name of the libvirt-dbus service is <code>org.libvirt</code>. + libvirt-dbus distributes an interface XML descriptions which can be + usually found at <code>/usr/share/dbus-1/interfaces/</code>. + </p> + + <p> + By default unprivileged user has access only to the session D-Bus + connection. In order to allow specific user "foo" to access the system + D-Bus connection you need to create a file + <code>/etc/dbus-1/system.d/org.libvirt.conf</code> that contains: + </p> + +<pre> +<?xml version="1.0"?> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + +<busconfig> + + <policy user="foo"> + <allow send_destination="org.libvirt"/> + </policy> + +</busconfig> +</pre> + + <p> + To get a list of supported drivers for the specific bus connection + you can run these commands (not all drivers may be available on + the host): + </p> + +<pre> +gdbus introspect --xml --session --dest org.libvirt --object-path /org/libvirt +gdbus introspect --xml --system --dest org.libvirt --object-path /org/libvirt +</pre> + + <p> + Every object is introspectable so you can get a list of available + interfaces with methods, signals and properties running this command: + </p> + +<pre> +gdbus introspect --xml --system --dest org.libvirt --object-path /org/libvirt/QEMU +</pre> + + <p> + To get a list of domains for specific connection driver you can run + this command: + </p> + +<pre> +gdbus call --system --dest org.libvirt --object-path /org/libvirt/QEMU \ + --method org.libvirt.Connect.ListDomains 0 +</pre> + + </body> +</html> diff --git a/docs/docs.html.in b/docs/docs.html.in index a8d544f83f..abd344ca2e 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -57,6 +57,7 @@ <dt><a href="bindings.html">Language bindings</a></dt> <dd>Bindings of the libvirt API for <a href="csharp.html">c#</a>, + <a href="dbus.html">D-Bus</a>, <a href="https://godoc.org/github.com/libvirt/libvirt-go">go</a>, <a href="java.html">java</a>, <a href="https://libvirt.org/ocaml/">ocaml</a>. diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 7c28e2ba9b..c2bc7af3e9 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -60,6 +60,21 @@ </td> <td></td> </tr> + <tr> + <td>D-Bus</td> + <td> + <a href="ftp://libvirt.org/libvirt/dbus/">ftp</a> + <a href="https://libvirt.org/sources/dbus/">https</a> + </td> + <td> + <a href="https://libvirt.org/git/?p=libvirt-dbus.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dbus">gitlab</a> + <a href="https://github.com/libvirt/libvirt-dbus">github</a> + </td> + <td></td> + </tr> <tr> <td>Go</td> <td> -- 2.14.3

3 6

[libvirt] [PATCH 0/1] Add KVM on Z to Planet virttools
by Stefan Raspl 23 Mar '18

23 Mar '18

Stefan Raspl (1): Add KVM on Z to Planet virttools updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.5

3 3

[libvirt] ANNOUNCE: libvirt-dbus 0.0.1 released
by Pavel Hrdina 23 Mar '18

23 Mar '18

I'm happy to announce the release of libvirt-dbus 0.0.1. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. This is a first release which should be considered as unstable release since we don't promise API stability. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-0.0.1.tar.gz This release contains a limited support of libvirt APIs as proof of concept, but we are planning to cover all relevant APIs. Thanks everybody who contributed! Pavel

1 0

[libvirt] [PATCH v4 0/5] Apparmor support for less common devices
by Christian Ehrhardt 23 Mar '18

23 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - Set(Memory|Input)Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) *Updates since v2* - Restore(Memory|Input)Label: drop secdef/relabel check - Set(Memory|Input)Label: check more pointers to be valid before using them *Updates since v3* - added the Acked-by of Jamie Strandboge on patches 1-4 - reuse the already existing tmpdir in virt-aa-helper-test for better cleanup Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 94 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 +++++++ tests/virt-aa-helper-test | 87 ++++++++++++++++++++++--------------- 3 files changed, 163 insertions(+), 34 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH] tools: fix variable scope in in check_guests_shutdown
by Christian Ehrhardt 23 Mar '18

23 Mar '18

libvirt-guests.sh when run with more active guests than requested to shut down in parallel will run until it times out only shutting down the first set of guests. This patch fixes parallel shutdown by fixing a variable scope issue where check_guests_shutdown unintentionally reset $guests which prevented further progress. Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1688508 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index d5e68e5..fcada31 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -333,11 +333,11 @@ guest_count() check_guests_shutdown() { uri=$1 - guests=$2 + guests_to_check=$2 guests_shutting_down= for guest in $guests; do - if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then + if ! guest_is_on "$uri" "$guests_to_check" >/dev/null 2>&1; then eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." echo continue -- 2.7.4

3 3

[libvirt] [PATCH v2] test_driver: Add testDomainDestroyFlags
by Katerina Koukiou 22 Mar '18

22 Mar '18

Adding this for completeness Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Needed by the libvirt-dbus which is using test_driver for tests. src/test/test_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4de0cc533..99c27cc0a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1782,13 +1782,16 @@ static int testConnectListDomains(virConnectPtr conn, NULL, NULL); } -static int testDomainDestroy(virDomainPtr domain) +static int testDomainDestroyFlags(virDomainPtr domain, + unsigned int flags) { testDriverPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_DESTROY_GRACEFUL, -1); + if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; @@ -1813,6 +1816,11 @@ static int testDomainDestroy(virDomainPtr domain) return ret; } +static int testDomainDestroy(virDomainPtr domain) +{ + return testDomainDestroyFlags(domain, 0); +} + static int testDomainResume(virDomainPtr domain) { testDriverPtr privconn = domain->conn->privateData; @@ -6872,6 +6880,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ -- 2.15.0

2 1

[libvirt] [PATCH 00/11] tests: Add QAPI schema validation (blockdev-add saga)
by Peter Krempa 22 Mar '18

22 Mar '18

The new test APIs allow to validate JSON objects against the QAPI schema. The infrastructure was developed as part of not-yet-posted blockdev JSON property generator. It is quite useful for developing generators for complex objects against the schema. Since it's kind of useful by itself I decided to post it prior to finishing the blockdev work. It at least makes the 'simple' test cases in the qemumonitorjsontest slightly useful. Peter Krempa (11): util: buffer: Tolerate NULL 'buf' in virBufferStrcat qemu: caps: Move QAPI schema related code into separate file qemu: qapi: Fix naming of moved functions qemu: monitor: Move processing of QMP schema to the new file util: json: Add accessor for looking up JSON value type qemu: qapi: Return correct entry in virQEMUQapiSchemaTraverse tests: Add data file with QEMU QAPI schema tests: qemu: Add infrastructure for QAPI schema testing tests: qemumonitorjson: Fix few arguments of test cases tests: qemumonitor: Allow testing schema for fake monitor interactions tests: qemumonitorjson: Do some useful testing in the 'simple' tests po/POTFILES.in | 1 + src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_capabilities.c | 171 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 41 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_qapi.c | 237 + src/qemu/qemu_qapi.h | 40 + src/util/virbuffer.c | 3 + src/util/virjson.c | 7 + src/util/virjson.h | 2 + tests/Makefile.am | 3 + tests/qemuhotplugtest.c | 3 +- tests/qemumonitorjsontest.c | 117 +- tests/qemumonitortestutils.c | 85 +- tests/qemumonitortestutils.h | 7 +- tests/qemuqapischema.json | 11364 +++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemuschema.c | 536 ++ tests/testutilsqemuschema.h | 30 + 21 files changed, 12446 insertions(+), 210 deletions(-) create mode 100644 src/qemu/qemu_qapi.c create mode 100644 src/qemu/qemu_qapi.h create mode 100644 tests/qemuqapischema.json create mode 100644 tests/testutilsqemuschema.c create mode 100644 tests/testutilsqemuschema.h -- 2.16.2

2 22

[libvirt] [PATCH v2 0/7] Add support for video and input devices on S390
by Farhan Ali 22 Mar '18

22 Mar '18

Hi, This patch series adds Libvirt support for video and input devices for QEMU guests on S390. QEMU v2.11.0 added support for the virtio-gpu-ccw device [1] and virtio-{keyboard, mouse, tablet}-ccw devices [2], which can be used as video and input devices respectively. Thanks Farhan [1] https://git.qemu.org/?p=qemu.git;a=commit;h=1f8ad88935f5cb5a2968909e392dbee… [2] https://git.qemu.org/?p=qemu.git;a=commit;h=3382cf1fabbf722dce931846853dae7… ChangeLog --------- v1 -> v2 - Split virtio-gpu-ccw capability (patch 1) and functionality (patch 2) into 2 patches. - Code changes per John's comments (patch 2). - Split capability for input devices (patch 4) and functionality (patch 5) into 2 patches. - Modify news update as per John's suggestion (patch 7). Farhan Ali (7): qemu: Introduce a new capability for virtio-gpu-ccw qemu: Add support for virtio-gpu-ccw video device on S390 tests: Add test cases for virtio-gpu-ccw qemu: Introduce capabilities for virtio input ccw devices qemu: Add support for virtio input ccw devices tests: Add test case for virtio input ccw devices news: Update for virtio-gpu-ccw and virtio input ccw devices docs/formatdomain.html.in | 5 ++ docs/news.xml | 10 +++ src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 6 ++ src/qemu/qemu_command.c | 27 +++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 12 +++- src/qemu/qemu_process.c | 5 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 83 +++++++++++++++++++--- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 6 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 26 +++++++ tests/qemuxml2argvdata/input-virtio-ccw.xml | 29 ++++++++ .../qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml | 18 +++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 25 +++++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml | 35 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/input-virtio-ccw.xml | 37 ++++++++++ .../video-virtio-gpu-ccw-auto.xml | 35 +++++++++ tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml | 39 ++++++++++ tests/qemuxml2xmltest.c | 22 ++++++ 20 files changed, 431 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml -- 2.7.4

2 13

[libvirt] [PATCH 0/2] rpc: cleanup some misc cruft
by Daniel P. Berrangé 22 Mar '18

22 Mar '18

Daniel P. Berrangé (2): rpc: remove remains of obsolete log_buffer_size config parameter rpc: avoid duplicating config in virtlockd/virtlogd augeas tests src/locking/test_virtlockd.aug.in | 15 ++++----------- src/locking/virtlockd.aug | 1 - src/locking/virtlockd.conf | 15 +++------------ src/logging/test_virtlogd.aug.in | 15 ++++----------- src/logging/virtlogd.aug | 1 - src/logging/virtlogd.conf | 5 ++++- src/remote/libvirtd.aug | 1 - src/remote/libvirtd.conf | 7 ------- src/remote/test_libvirtd.aug.in | 1 - 9 files changed, 15 insertions(+), 46 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH] test_driver: Add testDomainDestroyFlags
by Katerina Koukiou 22 Mar '18

22 Mar '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/test/test_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4de0cc533..f9482970a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1782,13 +1782,17 @@ static int testConnectListDomains(virConnectPtr conn, NULL, NULL); } -static int testDomainDestroy(virDomainPtr domain) +static int testDomainDestroyFlags(virDomainPtr domain, + unsigned int flags) { testDriverPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; int ret = -1; + virCheckFlags(0, -1); + + if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; @@ -1813,6 +1817,11 @@ static int testDomainDestroy(virDomainPtr domain) return ret; } +static int testDomainDestroy(virDomainPtr domain) +{ + return testDomainDestroyFlags(domain, 0); +} + static int testDomainResume(virDomainPtr domain) { testDriverPtr privconn = domain->conn->privateData; @@ -6872,6 +6881,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ -- 2.15.0

1 0

[libvirt] [dbus PATCH] Convert testsuite from unittest to pytest
by Katerina Koukiou 22 Mar '18

22 Mar '18

Also add flake8 target in tests Makefile and rewrite some parts to be more pythonic. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- HACKING.md | 2 +- test/Makefile.am | 15 ++++++++++++--- test/conftest.py | 15 +++++++++++++++ test/libvirttest.py | 51 ++++++++++++++++++++++++++++----------------------- test/test_connect.py | 35 +++++++++++++++-------------------- test/test_domain.py | 39 +++++++++++++++++---------------------- test/travis-run | 4 ++-- 7 files changed, 90 insertions(+), 71 deletions(-) create mode 100644 test/conftest.py diff --git a/HACKING.md b/HACKING.md index 75aa6d0..30d321c 100644 --- a/HACKING.md +++ b/HACKING.md @@ -35,7 +35,7 @@ Running from git repository make check ``` - The test tool requires python3 and python3-dbus. + The test tool requires python3, pytest and python3-dbus. * To run libvirt-dbus directly from the build dir without installing it diff --git a/test/Makefile.am b/test/Makefile.am index d3997f3..554c433 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,17 +1,26 @@ test_helpers = \ - libvirttest.py + libvirttest.py \ + conftest.py test_programs = \ test_connect.py \ test_domain.py -TESTS = $(test_programs) - EXTRA_DIST = \ $(test_helpers) \ $(test_programs) \ travis-run +TEST_PATH=./ + +lint: + flake8 --exclude=.tox --ignore=E501 + +test: + py.test --verbose --color=yes $(TEST_PATH) + +check: lint test + TESTS_ENVIRONMENT = \ abs_top_builddir=$(abs_top_builddir) \ VIRT_DBUS_INTERFACES_DIR=$(abs_top_srcdir)/data diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 0000000..a468599 --- /dev/null +++ b/test/conftest.py @@ -0,0 +1,15 @@ +import os +import subprocess +import pytest + + +(a)pytest.fixture(scope="session", autouse=True) +def dbus_daemon_session(): + """Fixture to start D-Bus message bus session daemon for use in the whole test suite. + """ + dbus_daemon = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], + stdout=subprocess.PIPE, universal_newlines=True) + os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_daemon.stdout.readline().strip() + yield + dbus_daemon.terminate() + dbus_daemon.wait(timeout=10) diff --git a/test/libvirttest.py b/test/libvirttest.py index 6a00aea..fc8c5c4 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -1,34 +1,33 @@ #!/usr/bin/python3 -from dbus.mainloop.glib import DBusGMainLoop -from gi.repository import GLib -import dbus import os import subprocess import time -import unittest +import pytest +from gi.repository import GLib +from dbus.mainloop.glib import DBusGMainLoop +import dbus -root = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) -exe = os.path.join(root, 'src', 'libvirt-dbus') +ROOT = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) +EXE = os.path.join(ROOT, 'src', 'libvirt-dbus') DBusGMainLoop(set_as_default=True) -class TestCase(unittest.TestCase): - @classmethod - def setUpClass(cls): - cls.bus = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], - stdout=subprocess.PIPE, universal_newlines=True) - os.environ['DBUS_SESSION_BUS_ADDRESS'] = cls.bus.stdout.readline().strip() - @classmethod - def tearDownClass(cls): - cls.bus.terminate() - cls.bus.wait(timeout=10) +class BaseTestClass(): + """ Base test class for whole test suite + """ + connect = None + bus = None + libvirt_dbus = None + loop = False - def setUp(self): + @pytest.fixture(autouse=True) + def libvirt_dbus_setup(self, request): + """Start libvirt-dbus for each test function + """ os.environ['LIBVIRT_DEBUG'] = '3' - - self.daemon = subprocess.Popen([exe]) + self.libvirt_dbus = subprocess.Popen([EXE]) self.bus = dbus.SessionBus() for i in range(10): @@ -41,12 +40,18 @@ class TestCase(unittest.TestCase): obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') - def tearDown(self): - self.daemon.terminate() - self.daemon.wait(timeout=10) + @pytest.fixture(autouse=True) + def libvirt_dbus_teardown(self): + """Terminate libvirt-dbus at the teardown of each test + """ + yield + self.libvirt_dbus.terminate() + self.libvirt_dbus.wait(timeout=10) def main_loop(self): - self.assertFalse(getattr(self, 'loop', False)) + """Initializes the mainloop + """ + assert getattr(self, 'loop', False) is False def timeout(): self.loop.quit() diff --git a/test/test_connect.py b/test/test_connect.py index 4ec3fe0..14f70d5 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -1,10 +1,9 @@ -#!/usr/bin/python3 - import dbus import libvirttest -import unittest -minimal_xml = ''' + +class TestConnect(libvirttest.BaseTestClass): + minimal_xml = ''' <domain type="test"> <name>foo</name> <memory>1024</memory> @@ -12,16 +11,15 @@ minimal_xml = ''' <type>hvm</type> </os> </domain> -''' + ''' -class TestConnect(libvirttest.TestCase): def test_list_domains(self): domains = self.connect.ListDomains(0) - self.assertEqual(type(domains), dbus.Array) - self.assertEqual(len(domains), 1) + assert isinstance(domains, dbus.Array) + assert len(domains) == 1 for path in domains: - self.assertEqual(type(path), dbus.ObjectPath) + assert isinstance(path, dbus.ObjectPath) domain = self.bus.get_object('org.libvirt', path) # ensure the path exists by calling Introspect on it @@ -29,29 +27,26 @@ class TestConnect(libvirttest.TestCase): def test_create(self): def domain_started(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStarted', domain_started) - path = self.connect.CreateXML(minimal_xml, 0) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.CreateXML(self.minimal_xml, 0) + assert isinstance(path, dbus.ObjectPath) self.main_loop() def test_define(self): def domain_defined(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainDefined', domain_defined) - path = self.connect.DefineXML(minimal_xml) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.DefineXML(self.minimal_xml) + assert isinstance(path, dbus.ObjectPath) self.main_loop() - -if __name__ == '__main__': - unittest.main(verbosity=2) diff --git a/test/test_domain.py b/test/test_domain.py index b1ab7a5..b176c29 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -1,10 +1,8 @@ -#!/usr/bin/python3 - import dbus import libvirttest -import unittest -class TestDomain(libvirttest.TestCase): + +class TestDomain(libvirttest.BaseTestClass): def domain(self): path = self.connect.ListDomains(0)[0] obj = self.bus.get_object('org.libvirt', path) @@ -14,21 +12,21 @@ class TestDomain(libvirttest.TestCase): obj, domain = self.domain() props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(type(props['Name']), dbus.String) - self.assertEqual(type(props['UUID']), dbus.String) - self.assertEqual(type(props['Id']), dbus.UInt32) - self.assertEqual(type(props['Vcpus']), dbus.UInt32) - self.assertEqual(type(props['OSType']), dbus.String) - self.assertEqual(type(props['Active']), dbus.Boolean) - self.assertEqual(type(props['Persistent']), dbus.Boolean) - self.assertEqual(type(props['State']), dbus.String) - self.assertEqual(type(props['Autostart']), dbus.Boolean) + assert isinstance(props['Name'], dbus.String) + assert isinstance(props['UUID'], dbus.String) + assert isinstance(props['Id'], dbus.UInt32) + assert isinstance(props['Vcpus'], dbus.UInt32) + assert isinstance(props['OSType'], dbus.String) + assert isinstance(props['Active'], dbus.Boolean) + assert isinstance(props['Persistent'], dbus.Boolean) + assert isinstance(props['State'], dbus.String) + assert isinstance(props['Autostart'], dbus.Boolean) # Call all methods except Reset and GetStats, because the test backend # doesn't support those xml = domain.GetXMLDesc(0) - self.assertEqual(type(xml), dbus.String) + assert isinstance(xml, dbus.String) domain.Reboot(0) domain.Shutdown() @@ -38,8 +36,8 @@ class TestDomain(libvirttest.TestCase): def test_shutdown(self): def domain_stopped(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStopped', domain_stopped) @@ -48,14 +46,14 @@ class TestDomain(libvirttest.TestCase): domain.Shutdown() state = obj.Get('org.libvirt.Domain', 'State', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(state, 'shutoff') + assert state == 'shutoff' self.main_loop() def test_undefine(self): def domain_undefined(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainUndefined', domain_undefined) @@ -65,6 +63,3 @@ class TestDomain(libvirttest.TestCase): domain.Undefine() self.main_loop() - -if __name__ == '__main__': - unittest.main(verbosity=2) diff --git a/test/travis-run b/test/travis-run index 7577253..c2ab729 100755 --- a/test/travis-run +++ b/test/travis-run @@ -22,7 +22,7 @@ sudo chroot "$CHROOT" << EOF set -ex # install build deps apt-get update -apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus +apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus pytest # run build and tests as user chown -R buildd:buildd /build @@ -31,6 +31,6 @@ set -ex cd /build/src ./autogen.sh make -j4 -make check || { cat test-suite.log; exit 1; } +make check EOU EOF -- 2.15.0

3 2

[libvirt] [PATCH] qemu: Fix virQEMUCapsCommands formatting
by John Ferlan 22 Mar '18

22 Mar '18

Starting with commit id 'fab9d6e1' the formatting of: { "command-name", QEMU_CAPS_NAME }, was altered to: { "command-name", QEMU_CAPS_NAME}, and then commit id 'e2b05c9a' altered that to: { "command-name", QEMU_CAPS_NAME} So, let's just fix that up to make things consistent with the rest of the structures. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Although I could say this was trivial, it does impact at least one upstream series (query-cpus-fast), so rather than just take that route, I figured it'd be better to give ample warning... I can also wait, but that series propagates the middle format with the comma at the end. src/qemu/qemu_capabilities.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3eb5ed6d1a..3b1bc051af 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1577,9 +1577,9 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "migrate-incoming", QEMU_CAPS_INCOMING_DEFER }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-qmp-schema", QEMU_CAPS_QUERY_QMP_SCHEMA }, - { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION}, - { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS}, - { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES} + { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, + { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, + { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES }, }; struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { -- 2.13.6

2 1

[libvirt] [PATCH] remote: fix path for locating libvirtd in source tree during autostart
by Daniel P. Berrangé 22 Mar '18

22 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f765c09416..0eec50b6bd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1063,7 +1063,7 @@ doRemoteOpen(virConnectPtr conn, if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) && !(daemonPath = virFileFindResourceFull("libvirtd", NULL, NULL, - abs_topbuilddir "/daemon", + abs_topbuilddir "/src", SBINDIR, "LIBVIRTD_PATH"))) goto failed; -- 2.14.3

3 2

[libvirt] [jenkins-ci PATCH] guests: Fix ~/.ccache ownership
by Andrea Bolognani 22 Mar '18

22 Mar '18

The directory and the files contained within need to be owned by the user or compilation will fail, either loudly or silently depending on the OS, due to missing write permissions. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/users.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 6134228..87693e0 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -55,8 +55,12 @@ file: path: /home/{{ flavor }}/.ccache state: directory + owner: '{{ flavor }}' + group: '{{ flavor }}' - name: '{{ flavor }}: Configure ccache' copy: src: files/ccache.conf dest: /home/{{ flavor }}/.ccache/ccache.conf + owner: '{{ flavor }}' + group: '{{ flavor }}' -- 2.14.3

2 1

[libvirt] PCI passthrough/SR-IOV on Cavium cn889x
by Ciprian Barbu 22 Mar '18

22 Mar '18

Hello, In the context of running Openstack on a cluster of Cavium ThunderX cn8890 aarch64 servers, we are trying to attach virtual functions to a VM. First some introduction. This Cavium SoC has a different approach to Virtual Functions than on x86 NICs, in which VFs are always enabled and there are two types of VFs and *one single* PF, as follows: - primary VFs - these are in fact assigned by the system to the physical ports of the server, e.g em2p1s0f1, em2p1s0f3 etc below. - secondary VFs - the main purpose of these is to provide additional HW queues under SW control (usually DPDK applications) by automatically binding them to the needed physical port. - one single "physical" function, device 0002:01:00.0 below, which to the best of my knowledge acts merely as a stub and cannot be assigned an interface name. Below is the output of "dpdk-devbind.py -s" which provides some useful information. Network devices using DPDK-compatible driver ============================================ 0002:01:00.2 'Device a034' drv=vfio-pci unused=nicvf Network devices using kernel driver =================================== 0000:01:10.0 'THUNDERX BGX (Common Ethernet Interface)' if= drv=thunder-BGX unused=thunder_bgx,vfio-pci 0000:01:10.1 'THUNDERX BGX (Common Ethernet Interface)' if= drv=thunder-BGX unused=thunder_bgx,vfio-pci 0002:01:00.0 'THUNDERX Network Interface Controller' if= drv=thunder-nic unused=nicpf,vfio-pci 0002:01:00.1 'Device a034' if=em2p1s0f1 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.3 'Device a034' if=em2p1s0f3 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.4 'Device a034' if=em2p1s0f4 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.5 'Device a034' if=em2p1s0f5 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.6 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.7 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:01.0 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci Now for the problem. I don't have a domain definition because libvirt fails to start a domain, but I might be able to find what nova generates. But what it tries to do is passthrough em2p1s0f3, address 0002:01:00.3: <interface type='hostdev' managed='yes'> <source> <address type='pci' domain='0x0002' bus='0x1' slot='0x0' function='0x3'/> </source> </interface> You can find attached a trimmed libvirtd.log where the main error is: 43236: error : virPCIGetVirtualFunctionInfo:2927 : internal error: The PF device for VF /sys/bus/pci/devices/0002:01:00.3 has no network device name I have actually spent a few days trying to do some hacks and learn some more. The main idea is that virPCIGetVirtualFunctionInfo fails to find the physical name for the virtual device at address 0002:01:00.3, which as I explained in the introduction is something that this Cavium SoC does not do. Looking further down the stream, almost all of the helper functions need a linkdev for the physical function, which means that making libvirt work on this system means some heavy refactoring, a solution being to use the sysfs path rather than the interface name. This will not work 100% from what I've seen, at least virNetDevGetVfConfig uses netlink to save the admin MAC (part of virNetDevSaveNetConfig), and netlink needs the ifname. So I'm quite stuck on finding a workaround/fix for this platform which would potentially be something upstreamable, so that we, ENEA, don't burden with maintaining an ugly hack. Right now we are using libvirt 3.5.0 but we can upgrade to something newer if need. The question(s) thus, are 1. is this problem known in the libvirt community? 2. Is there any plan to make it work? 3. Can you give some pointers on an approach to adapt libvirt to this system? 4. Maybe it's worth changing the kernel to assign a sort of dummy interface to the physical function? Thanks and sorry for the long email, /Ciprian

4 4

[libvirt] [dbus PATCH] m4: disable gcc8 -Wcast-function-type warnings from -Wextra
by Pavel Hrdina 22 Mar '18

22 Mar '18

GLib uses macros to create cleanup functions that are used by g_auto or g_autoptr macros. They expect a function defined as "void (*)(void *)" which is usually not that case. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. m4/virt-compile-warnings.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index f6ab795..6ece136 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -160,6 +160,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure # fire even without -O. wantwarn="$wantwarn -fipa-pure-const" + # We do "bad" function cast to define glib auto cleanup functions + wantwarn="$wantwarn -Wno-cast-function-type" if test "$enable_werror" = "yes" then -- 2.14.3

1 0

[libvirt] [PATCHv2 00/25] Python tweaks
by Radostin Stoyanov 22 Mar '18

22 Mar '18

Changes since v1 (https://www.redhat.com/archives/libvir-list/2018-March/msg01001.html) 01 - Fixed typo. 03 - Added whitespace after comma in: value = value + re.sub("^(\d+)U$","\\1", token[1]) 05 and 06 - Use printf style format and break strings everywhere there is a newline. 07 - Use try-except instead of an explicit check. 10 - Use isalnum() instead of a regex match, and a few more simplifications were added. 20 - Use try-except instead of an explicit check. 23 - Don't slice `line` in the loop condition. New patches: 9, 24, 25 The patches have been tested with `make check`, `make syntax-check`. The output of apibuild.py was tested with `cd docs/` followed by: srcdir=. builddir=. /usr/bin/python2 ./apibuild.py; sha1sum *.xml | sha1sum and srcdir=. builddir=. /usr/bin/python3 ./apibuild.py; sha1sum *.xml | sha1sum before and after the patches were applied. Radostin Stoyanov (25): apibuild: Use isinstance for type checking apibuild: Split imports on separate lines apibuild: Remove whitespace before ',' and ':' python: Add whitespace around = and % operators esx_vi_generator: Simplify generate_helper_source esx_vi_generator: Simplify generate_helper_header esx_vi_generator: Simplify get_occurrence_comment esx_vi_generator: Simplify alignment function cfg.mk: check ctype_macros only on *.[c|h] files apibuild: Simplify conditional statements python: Remove space around = in keyword args WmiClass: Don't share "versions" between instances apibuild: Simplify uniq function apibuild: Avoid double sorting of ids python3: cpu-reformat: Use the print() function apibuild: Drop backslash between brackets apibuild: Fix indentation not multiple of 4 apibuild: Simplify strip_lead_star() apibuild: Simplify parseTypeComment() apibuild: Simplify type checking of literals apibuild: Use list comprehension insteand of map apibuild: Simplify merging of preproc tokens apibuild: Simplify parsing string tokens apibuild: Remove redundant parentheses apibuild: Simplify getline() cfg.mk | 1 + docs/apibuild.py | 734 +++++++++++++++++-------------------- docs/index.py | 54 +-- src/esx/esx_vi_generator.py | 183 ++++----- src/hyperv/hyperv_wmi_generator.py | 36 +- tests/cputestdata/cpu-cpuid.py | 6 +- tests/cputestdata/cpu-reformat.py | 6 +- 7 files changed, 472 insertions(+), 548 deletions(-) -- 2.14.3

3 27

[libvirt] [dbus PATCH] run.in: fix typo in abs_top_builddir variable
by Pavel Hrdina 22 Mar '18

22 Mar '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. Thanks Katerina! run.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.in b/run.in index 1e48dc8..e98edaf 100644 --- a/run.in +++ b/run.in @@ -15,7 +15,7 @@ # # Find this script -b=@abs_tob_builddir@ +b=@abs_top_builddir@ export VIRT_DBUS_INTERFACES_DIR="$b/data" -- 2.14.3

1 0

[libvirt] [dbus PATCH v3 0/5] rewrite to GDBus
by Pavel Hrdina 22 Mar '18

22 Mar '18

Changes in v3: - introduced run script to help running libvirt-dbus without installing it - improved README and HACKING Changes in v2: - removed patch that set the required libvirt version to libvirt-dbus version Pavel Hrdina (5): introduce support for GDBus implementation introduce run script to execute libvirt-dbus daemon switch from sd-bus to GDBus implementation main: introduce thread pool to process D-Bus messages docs: rewrite HACKING and README into markdown format and improve it .gitignore | 1 + HACKING | 199 ------------ HACKING.md | 191 +++++++++++ Makefile.am | 2 + README | 80 ----- README.md | 72 +++++ configure.ac | 17 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++++ data/org.libvirt.Domain.xml | 51 +++ libvirt-dbus.spec.in | 10 +- run.in | 22 ++ src/Makefile.am | 20 +- src/connect.c | 324 ++++++++----------- src/connect.h | 37 +-- src/domain.c | 748 ++++++++++++++++++++----------------------- src/domain.h | 6 +- src/events.c | 177 +++++----- src/gdbus.c | 453 ++++++++++++++++++++++++++ src/gdbus.h | 112 +++++++ src/main.c | 315 ++++++++---------- src/util.c | 167 ++++------ src/util.h | 53 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 25 files changed, 1796 insertions(+), 1329 deletions(-) delete mode 100644 HACKING create mode 100644 HACKING.md delete mode 100644 README create mode 100644 README.md create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 run.in create mode 100644 src/gdbus.c create mode 100644 src/gdbus.h -- 2.14.3

2 14

[libvirt] [jenkins-ci PATCH] guests: Drop Ubuntu 12.04 support
by Andrea Bolognani 22 Mar '18

22 Mar '18

As of commit d4ea32e85f9e, libvirt no longer performs Ubuntu 12.04 builds on Travis, and reproducing locally issues that would hit those CI jobs was the only reason introduced support in the first place. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/host_vars/libvirt-ubuntu-12/install.yml | 3 --- guests/host_vars/libvirt-ubuntu-12/main.yml | 3 --- guests/vars/mappings.yml | 11 ----------- 3 files changed, 17 deletions(-) delete mode 100644 guests/host_vars/libvirt-ubuntu-12/install.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-12/main.yml diff --git a/guests/host_vars/libvirt-ubuntu-12/install.yml b/guests/host_vars/libvirt-ubuntu-12/install.yml deleted file mode 100644 index 997304f..0000000 --- a/guests/host_vars/libvirt-ubuntu-12/install.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -install_url: http://archive.ubuntu.com/ubuntu/dists/precise/main/installer-amd64/ -install_config: preseed.cfg diff --git a/guests/host_vars/libvirt-ubuntu-12/main.yml b/guests/host_vars/libvirt-ubuntu-12/main.yml deleted file mode 100644 index 2d21f14..0000000 --- a/guests/host_vars/libvirt-ubuntu-12/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -projects: - - libvirt diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index deae69d..d94d648 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -137,14 +137,12 @@ mappings: deb: libgnutls28-dev pkg: gnutls rpm: gnutls-devel - Ubuntu12: libgnutls-dev Ubuntu14: libgnutls-dev go: default: golang FreeBSD: go CentOS6: - Ubuntu12: Ubuntu14: gobject-introspection: @@ -171,7 +169,6 @@ mappings: hal: FreeBSD: hal - Ubuntu12: libhal-dev intltool: default: intltool @@ -411,7 +408,6 @@ mappings: default: numad FreeBSD: Debian8: - Ubuntu12: Ubuntu14: openwsman: @@ -455,7 +451,6 @@ mappings: pkg: p5-Digest-MD5 rpm: perl-Digest-MD5 CentOS6: - Ubuntu12: Ubuntu14: perl-ExtUtils-MakeMaker: @@ -510,7 +505,6 @@ mappings: deb: libtest-lwp-useragent-perl pkg: p5-Test-LWP-UserAgent Fedora: perl-Test-LWP-UserAgent - Ubuntu12: perl-Test-Pod: deb: libtest-pod-perl @@ -526,7 +520,6 @@ mappings: deb: libtime-hr-perl pkg: p5-Time-HiRes rpm: perl-Time-HiRes - Ubuntu12: perl Ubuntu14: perl perl-XML-Twig: @@ -552,7 +545,6 @@ mappings: pkg-config: default: pkgconf rpm: pkgconfig - Ubuntu12: pkg-config polkit: default: polkit @@ -614,7 +606,6 @@ mappings: default: python3-requests FreeBSD: py36-requests CentOS: - Ubuntu12: qemu-img: default: qemu-utils @@ -642,7 +633,6 @@ mappings: sanlock: deb: libsanlock-dev rpm: sanlock-devel - Ubuntu12: screen: default: screen @@ -692,7 +682,6 @@ mappings: deb: wireshark-dev Fedora: wireshark-devel Debian8: - Ubuntu12: Ubuntu14: xen: -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH 0/3] guests: Various cleanups
by Andrea Bolognani 22 Mar '18

22 Mar '18

Applies on top of https://www.redhat.com/archives/libvir-list/2018-March/msg01093.html Andrea Bolognani (3): guests: Configure Jenkins agent based on secret availability guests: Don't expose 'jenkins' pseudo-package guests: Don't expose 'base' pseudo-package guests/host_vars/libvirt-centos-6/main.yml | 2 -- guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/host_vars/libvirt-debian-8/main.yml | 2 -- guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-debian-sid/main.yml | 1 - guests/host_vars/libvirt-fedora-26/main.yml | 2 -- guests/host_vars/libvirt-fedora-27/main.yml | 2 -- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 -- guests/host_vars/libvirt-freebsd-10/main.yml | 2 -- guests/host_vars/libvirt-freebsd-11/main.yml | 2 -- guests/host_vars/libvirt-freebsd-current/main.yml | 1 - guests/host_vars/libvirt-ubuntu-12/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/site.yml | 15 ++++++++++++--- guests/tasks/jenkins.yml | 7 +++++++ 16 files changed, 19 insertions(+), 26 deletions(-) -- 2.14.3

3 28

[libvirt] [PATCH v3 00/12] Basic implementation of persistent reservations
by Michal Privoznik 22 Mar '18

22 Mar '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-February/msg01021.html Diff to v2: - John's review worked in The event on pr-helper process dying is still not implemented as qemu has no implementation yet. Michal Privoznik (12): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu: Generate alias and socket path for pr-helper qemu: Store pr runtime data in status XML qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu_domain: Track pr-helper PID in status XML qemu: Start PR daemon on domain startup qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations qemu: Detect pr-manager-helper capability docs/formatdomain.html.in | 25 ++- docs/schemas/domaincommon.rng | 34 +-- docs/schemas/storagecommon.rng | 50 +++++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 36 ++++ src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 48 +++++ src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 238 ++++++++++++++++++--- src/qemu/qemu_domain.h | 15 ++ src/qemu/qemu_hotplug.c | 94 ++++++++ src/qemu/qemu_process.c | 193 +++++++++++++++++ src/qemu/qemu_process.h | 7 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virstoragefile.c | 181 ++++++++++++++++ src/util/virstoragefile.h | 19 ++ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + .../disk-virtio-scsi-reservations-not-managed.args | 29 +++ .../disk-virtio-scsi-reservations-not-managed.xml | 41 ++++ .../disk-virtio-scsi-reservations.args | 29 +++ .../disk-virtio-scsi-reservations.xml | 39 ++++ tests/qemuxml2argvtest.c | 8 + .../disk-virtio-scsi-reservations-not-managed.xml | 1 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 4 + 30 files changed, 1064 insertions(+), 57 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.16.1

3 20

[libvirt] [PATCH 0/2] virCommand: Two trivial fixes
by Michal Privoznik 22 Mar '18

22 Mar '18

Although not pushed, so review appreciated. Michal Privoznik (2): virCommandPassFD: Give name to flags virCommandFDIsSet: Update documentation src/util/vircommand.c | 13 ++++++------- src/util/vircommand.h | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) -- 2.16.1

3 5

[libvirt] [RFC PATCH 0/2] Add vmgenid XML, schema, docs
by John Ferlan 22 Mar '18

22 Mar '18

Could be a v1, but figured I'd get feedback first - I have a "working example" for QEMU (supported since 2.9.0), but it's not quite ready to be fully posted. Currently only needed for windows guests, but there is some work upstream (somewhere) to make a Linux implementation. Still have to work out all the various "combinations" of when to add the vmgenid device and I think there's one combination that's not quite possible and may require some sort of set vmgenid guid value qmp command (that's being debated on qemu upstream now). To read up on the QEMU implementation, see from the top of a QEMU source tree: docs/specs/vmgenid.txt The (ahem) Microsoft details on the device is found at: http://go.microsoft.com/fwlink/?LinkId=260709 John Ferlan (2): conf: Introduce VIR_DOMAIN_DEVICE_VMGENID conf: Add VM Generation ID device docs/formatdomain.html.in | 54 ++++++++++++++ docs/schemas/domaincommon.rng | 21 ++++++ src/conf/domain_conf.c | 120 +++++++++++++++++++++++++++++- src/conf/domain_conf.h | 12 +++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_driver.c | 6 ++ src/qemu/qemu_hotplug.c | 1 + tests/qemuxml2argvdata/vmgenid-auto.xml | 32 ++++++++ tests/qemuxml2argvdata/vmgenid.xml | 32 ++++++++ tests/qemuxml2xmloutdata/vmgenid-auto.xml | 1 + tests/qemuxml2xmloutdata/vmgenid.xml | 1 + tests/qemuxml2xmltest.c | 3 + 13 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/vmgenid-auto.xml create mode 100644 tests/qemuxml2argvdata/vmgenid.xml create mode 120000 tests/qemuxml2xmloutdata/vmgenid-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vmgenid.xml -- 2.13.6

3 5

[libvirt] [snmp PATCH 1/2] Replace U64 with struct counter64 to fix build
by Michael Corcoran 22 Mar '18

22 Mar '18

Upstream net-snmp removed the U64 typedef in 2016 as it clashed with a name in Perl, thus all usages of U64 must be replaced by struct counter64 to compile against recent versions of net-snmp. The replacements were made by hand, while referencing diff with new source generated by the mib2c tool. net-snmp have a mib2c-update tool which supposedly assists with updating existing (modified) source code but I was unable to get it to work. Signed-off-by: Michael Corcoran <tracer(a)outlook.co.nz> --- src/defaults/node-libvirtGuestCpuTime.m2d | 2 +- src/libvirtGuestTable-README-libvirtGuestTable.txt | 2 +- src/libvirtGuestTable.h | 4 ++-- src/libvirtGuestTable_data_get.c | 4 ++-- src/libvirtGuestTable_data_get.h | 2 +- src/libvirtGuestTable_data_set.h | 4 ++-- src/libvirtGuestTable_interface.c | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/defaults/node-libvirtGuestCpuTime.m2d b/src/defaults/node-libvirtGuestCpuTime.m2d index 795f697..fc93506 100644 --- a/src/defaults/node-libvirtGuestCpuTime.m2d +++ b/src/defaults/node-libvirtGuestCpuTime.m2d @@ -11,7 +11,7 @@ ## If you do, it is likely to break lots of generated code that ## you will have to fix. ## -## @eval $m2c_decl = U64@ +## @eval $m2c_decl = "struct counter64"@ ## ######################################################################## ## Generate/use mapping functions? Useful if the MIB defines diff --git a/src/libvirtGuestTable-README-libvirtGuestTable.txt b/src/libvirtGuestTable-README-libvirtGuestTable.txt index 5a74dae..74e2274 100644 --- a/src/libvirtGuestTable-README-libvirtGuestTable.txt +++ b/src/libvirtGuestTable-README-libvirtGuestTable.txt @@ -722,7 +722,7 @@ The CPU time used by the virtual guest, in nanoseconds. * * * Its syntax is COUNTER64 (based on perltype COUNTER64) - * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (U64) + * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (struct counter64) */ /*--------------------------------------------------------------------- * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index ca27abd..6762238 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -119,9 +119,9 @@ typedef struct libvirtGuestTable_data_s { u_long libvirtGuestMemoryLimit; /* - * libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + * libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ - U64 libvirtGuestCpuTime; + struct counter64 libvirtGuestCpuTime; /* * libvirtGuestRowStatus(9)/RowStatus/ASN_INTEGER/long(u_long)//l/A/W/E/r/d/h diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index b252bdd..08ddb4a 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -442,7 +442,7 @@ The CPU time used by the virtual guest, in nanoseconds. * * * Its syntax is COUNTER64 (based on perltype COUNTER64) - * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (U64) + * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (struct counter64) */ /** * Extract the current value of the libvirtGuestCpuTime data. @@ -459,7 +459,7 @@ The CPU time used by the virtual guest, in nanoseconds. * @retval MFD_ERROR : Any other error */ int -libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 * libvirtGuestCpuTime_val_ptr ) +libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 * libvirtGuestCpuTime_val_ptr ) { /** we should have a non-NULL pointer */ netsnmp_assert( NULL != libvirtGuestCpuTime_val_ptr ); diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 450d112..6a0e7ff 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -55,7 +55,7 @@ extern "C" { int libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestCpuCount_val_ptr ); int libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestMemoryCurrent_val_ptr ); int libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestMemoryLimit_val_ptr ); - int libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 * libvirtGuestCpuTime_val_ptr ); + int libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 * libvirtGuestCpuTime_val_ptr ); int libvirtGuestRowStatus_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestRowStatus_val_ptr ); diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index cce0fe7..873f9f5 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -80,9 +80,9 @@ int libvirtGuestMemoryLimit_undo_setup( libvirtGuestTable_rowreq_ctx *rowreq_ctx int libvirtGuestMemoryLimit_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long libvirtGuestMemoryLimit_val ); int libvirtGuestMemoryLimit_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); -int libvirtGuestCpuTime_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 libvirtGuestCpuTime_val); +int libvirtGuestCpuTime_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 libvirtGuestCpuTime_val); int libvirtGuestCpuTime_undo_setup( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); -int libvirtGuestCpuTime_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 libvirtGuestCpuTime_val ); +int libvirtGuestCpuTime_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 libvirtGuestCpuTime_val ); int libvirtGuestCpuTime_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); int libvirtGuestRowStatus_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long libvirtGuestRowStatus_val); diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index ce29c3b..ee48291 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -842,11 +842,11 @@ rc = libvirtGuestMemoryCurrent_get(rowreq_ctx, (u_long *)var->val.string ); rc = libvirtGuestMemoryLimit_get(rowreq_ctx, (u_long *)var->val.string ); break; - /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h */ + /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ case COLUMN_LIBVIRTGUESTCPUTIME: - var->val_len = sizeof(U64); + var->val_len = sizeof(struct counter64); var->type = ASN_COUNTER64; -rc = libvirtGuestCpuTime_get(rowreq_ctx, (U64 *)var->val.string ); +rc = libvirtGuestCpuTime_get(rowreq_ctx, (struct counter64 *)var->val.string ); break; /* libvirtGuestRowStatus(9)/RowStatus/ASN_INTEGER/long(u_long)//l/A/W/E/r/d/h */ @@ -1022,7 +1022,7 @@ _libvirtGuestTable_check_column( libvirtGuestTable_rowreq_ctx *rowreq_ctx, rc = SNMP_ERR_NOTWRITABLE; break; - /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h */ + /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ case COLUMN_LIBVIRTGUESTCPUTIME: rc = SNMP_ERR_NOTWRITABLE; break;

2 2

[libvirt] snapshot: support rbd disk
by Zhangzijian 22 Mar '18

22 Mar '18

Hello, Qemu support create snapshot for rbd disk. But Libvirt have not yet supported this feature now, is there any roadmap? Thanks.

1 0

[libvirt] [PATCH] news: Xen: announce removal of hard-code scheduler weight
by Jim Fehlig 21 Mar '18

21 Mar '18

Also describe a possible side-affect due to changes in the default (unspecified) value from 1000 to 256. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 75a054308..93ab59cf4 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -66,6 +66,22 @@ If someone customizing IP address inside VM, it will be helpful. </description> </change> + <change> + <summary> + Xen: Remove hard-coded scheduler weight + </summary> + <description> + The libxl driver was accidentally hard-coding the per-domain + scheduler weight to 1000, silently ignoring any user-provided + <code><shares></code> in <code><cputune></code>. The + driver now honors <code><shares></code>, and defers setting + a default value to Xen. Note that the Xen default is 256, so any + domains started after this improvement will have one fourth the + shares of previously started domains. If all domains must have + equal CPU shares, administrators must manually set the weight of + previously started domains to 256, or restart them. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.16.2

2 1

[libvirt] [PATCH] libxl: don't hardcode scheduler weight
by Jim Fehlig 21 Mar '18

21 Mar '18

Long ago in commit dfa1e1dd53 the scheduler weight was accidentally hardcoded to 1000. Weight is a setting with no unit since it is relative to the weight of other domains. If no weight is specified, libxl defaults to 256. Instead of hardcoding the weight to 1000, honor any <shares> specified in <cputune>. libvirt's notion of shares is synonomous to libxl's scheduler weight setting. If shares is unspecified, defer default weight setting to libxl. Removing the hardcoded weight required some test fixup. While at it, add an explicit test for <shares> conversion to scheduler weight. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Honoring <shares> specified by the user is certainly desirable, but I'm not sure about changing the default weight. One problematic scenario that came to mind: Several domains started by pre-patch libvirtd with weight=1000, update libvirtd with patch, start more domains with weight=256. The pre-patch domains unknowingly have a weight nearly 4 times that of post-patch domains. src/libxl/libxl_conf.c | 4 +- tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- tests/libxlxml2domconfigdata/basic-pv.json | 2 +- tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 89 ++++++++++++++++++++++ tests/libxlxml2domconfigdata/cpu-shares-hvm.xml | 39 ++++++++++ tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- .../libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- tests/libxlxml2domconfigtest.c | 1 + 10 files changed, 138 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcd46873c..e40145cfa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -366,7 +366,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } } - b_info->sched_params.weight = 1000; + if (def->cputune.sharesSpecified) + b_info->sched_params.weight = def->cputune.shares; + b_info->max_memkb = virDomainDefGetMemoryInitial(def); b_info->target_memkb = def->mem.cur_balloon; if (hvm) { diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json index 6fa41f34f..ccd585385 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.json +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -19,7 +19,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json index 7e1abd3d6..0f846daab 100644 --- a/tests/libxlxml2domconfigdata/basic-pv.json +++ b/tests/libxlxml2domconfigdata/basic-pv.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json new file mode 100644 index 000000000..2e647eada --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json @@ -0,0 +1,89 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1500 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:66:12:b4", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif_ioemu" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml new file mode 100644 index 000000000..49085b4b7 --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml @@ -0,0 +1,39 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <cputune> + <shares>1500</shares> + </cputune> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock offset='utc'/> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:66:12:b4'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json index 8f861f34e..7bfd68bd6 100644 --- a/tests/libxlxml2domconfigdata/moredevs-hvm.json +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json index 4aff61d4b..80dca8261 100644 --- a/tests/libxlxml2domconfigdata/multiple-ip.json +++ b/tests/libxlxml2domconfigdata/multiple-ip.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json index 49d0a4330..69be9c64c 100644 --- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json index 3a5071e14..3b2fc5f40 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json @@ -107,7 +107,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index ea3d2884e..6eec4c752 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -192,6 +192,7 @@ mymain(void) DO_TEST("basic-pv"); DO_TEST("basic-hvm"); + DO_TEST("cpu-shares-hvm"); DO_TEST("variable-clock-hvm"); DO_TEST("moredevs-hvm"); DO_TEST("vnuma-hvm"); -- 2.16.1

2 2

[libvirt] [PATCH v3 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - Set(Memory|Input)Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) *Updates since v2* - Restore(Memory|Input)Label: drop secdef/relabel check - Set(Memory|Input)Label: check more pointers to be valid before using them Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 94 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 +++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 34 deletions(-) -- 2.7.4

2 11

[libvirt] [PATCH] travis: skip builds on -maint branches
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

For patches pushed upstream we want builds run on master branch, but don't want them run on the -maint branches, as we are not keeping the .travis.yml file on stable branches updated wrt latest needs of travis CI platforms. We can't just whitelist 'master' though, because that will prevent developers triggering their own private travis builds. So we just blacklist *-maint, since developers will typically use named feature branches for any work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 01dffaa602..d3f72d46f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false language: c cache: ccache +branches: + except: + - /^.*-maint$/ + matrix: include: - compiler: gcc -- 2.14.3

2 1

[libvirt] [snmp PATCH 2/2] Replace placeholder org OID with libvirt OID
by Michael Corcoran 21 Mar '18

21 Mar '18

An OID of 36957 was assigned to libvirt by IANA, but the placeholder OID of 12345 was never replaced. IANA lists the libvirt registration as: 36957 libvirt Daniel Veillard daniel&veillard.com https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers Signed-off-by: Michael Corcoran <tracer(a)outlook.co.nz> --- src/LIBVIRT-MIB.txt | 7 ++++--- src/libvirtGuestTable-README-libvirtGuestTable.txt | 18 +++++++++--------- src/libvirtGuestTable.h | 2 +- src/libvirtGuestTable_data_access.c | 4 ++-- src/libvirtGuestTable_data_access.h | 2 +- src/libvirtGuestTable_data_get.c | 16 ++++++++-------- src/libvirtGuestTable_data_get.h | 2 +- src/libvirtGuestTable_data_set.c | 6 +++--- src/libvirtGuestTable_data_set.h | 2 +- src/libvirtGuestTable_interface.c | 2 +- src/libvirtGuestTable_oids.h | 2 +- src/libvirtNotifications.c | 10 +++++----- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/LIBVIRT-MIB.txt b/src/LIBVIRT-MIB.txt index a8195ff..1fd2074 100644 --- a/src/LIBVIRT-MIB.txt +++ b/src/LIBVIRT-MIB.txt @@ -14,7 +14,7 @@ IMPORTS libvirtMIB MODULE-IDENTITY - LAST-UPDATED "201012020000Z" + LAST-UPDATED "201803200000Z" ORGANIZATION "www.libvirt.org" CONTACT-INFO "email: libvirt-users(a)redhat.com @@ -22,10 +22,11 @@ libvirtMIB MODULE-IDENTITY DESCRIPTION "First draft, for experimental purposes only! Not to be used in real deployment!" + REVISION "201803200000Z" + DESCRIPTION "Updated OID" REVISION "201012020000Z" DESCRIPTION "Initial version." - ::= { enterprises 12345 } --- TODO: user real libvirt OID here ^ + ::= { enterprises 36957 } -- structure advised by RFC 4181: diff --git a/src/libvirtGuestTable-README-libvirtGuestTable.txt b/src/libvirtGuestTable-README-libvirtGuestTable.txt index 74e2274..0871568 100644 --- a/src/libvirtGuestTable-README-libvirtGuestTable.txt +++ b/src/libvirtGuestTable-README-libvirtGuestTable.txt @@ -587,14 +587,14 @@ Table / column details /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /*--------------------------------------------------------------------- * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * @@ -620,7 +620,7 @@ The UUID of the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -638,7 +638,7 @@ Name of active virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -656,7 +656,7 @@ Current state of the active guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -674,7 +674,7 @@ Number of virtual CPUs the virtual guest uses. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -692,7 +692,7 @@ Current amount of memory (in MiB) used by the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -711,7 +711,7 @@ The maximum amount of memory (in MiB) that can be used by the virtual * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -728,7 +728,7 @@ The CPU time used by the virtual guest, in nanoseconds. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 6762238..529838b 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -68,7 +68,7 @@ void shutdown_libvirtGuestTable(void); /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* ********************************************************************* * When you register your mib, you get to provide a generic diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 2958284..d7de4d5 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -51,7 +51,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /** @@ -291,7 +291,7 @@ libvirtGuestTable_row_prep( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 3491aa4..49afb9d 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -45,7 +45,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 08ddb4a..890ba07 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -50,7 +50,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* --------------------------------------------------------------------- @@ -134,7 +134,7 @@ libvirtGuestTable_indexes_set(libvirtGuestTable_rowreq_ctx *rowreq_ctx, char *li * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -222,7 +222,7 @@ libvirtGuestName_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, char **libvirtGu * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -274,7 +274,7 @@ libvirtGuestState_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvir * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -326,7 +326,7 @@ libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * lib * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -378,7 +378,7 @@ libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -431,7 +431,7 @@ libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -479,7 +479,7 @@ libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counte * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 6a0e7ff..616f824 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * indexes diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index d67c9d9..7ee8e9f 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -46,7 +46,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * NOTE: if you update this chart, please update the versions in @@ -407,7 +407,7 @@ libvirtGuestTable_undo_commit( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -586,7 +586,7 @@ libvirtGuestState_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 873f9f5..28092c5 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index ee48291..14057aa 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -68,7 +68,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ typedef struct libvirtGuestTable_interface_ctx_s { diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index 85950f4..67ccd6f 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -29,7 +29,7 @@ extern "C" { /* column number definitions for table libvirtGuestTable */ -#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,12345,1,1 +#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,36957,1,1 #define COLUMN_LIBVIRTGUESTUUID 1 diff --git a/src/libvirtNotifications.c b/src/libvirtNotifications.c index 52c7ae4..135f177 100644 --- a/src/libvirtNotifications.c +++ b/src/libvirtNotifications.c @@ -34,15 +34,15 @@ int send_libvirtGuestNotif_trap(virDomainPtr dom) { netsnmp_variable_list *var_list = NULL; - const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 12345, 0, 1 }; + const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 0, 1 }; const oid libvirtGuestName_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 2, 0 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 }; const oid libvirtGuestUUID_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 1, 1 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 }; const oid libvirtGuestState_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 3, 2 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 }; const oid libvirtGuestRowStatus_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 9, 3 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 }; const char *domName = virDomainGetName(dom);

2 1

[libvirt] [PATCH v2 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - (Set|Restore)*Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 88 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 ++++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++++---------------- 3 files changed, 158 insertions(+), 34 deletions(-) -- 2.7.4

2 12

[libvirt] [PATCH 0/3] libxl: misc fixes for migration
by Jim Fehlig 21 Mar '18

21 Mar '18

While working on the {Begin,End}API improvements I noticed a few problems in the migration code. The first two are trival, but the third describes a problem I encountered while testing, and provides a potential fix. See the patch for more details. Jim Fehlig (3): libxl: dont dereference NULL libxlDomainObjPrivatePtr libxl: remove needless 'else' in libxlDomainMigrationPrepare util: introduce virSocketAddrParseQuiet src/libvirt_private.syms | 1 + src/libxl/libxl_migration.c | 10 ++++---- src/rpc/virnetsocket.c | 2 +- src/util/virsocketaddr.c | 60 +++++++++++++++++++++++++++++++++------------ src/util/virsocketaddr.h | 4 +++ 5 files changed, 55 insertions(+), 22 deletions(-) -- 2.16.2

3 8

[libvirt] [PATCH 0/8] Add optional pSeries features (HTM)
by Andrea Bolognani 21 Mar '18

21 Mar '18

Applies cleanly on top of 90d7262552e8de3b067239b215903144a285723d. Patch 2/8 is fairly big because of all the capabilities data being added: I'm sending a redacted version to the list, the rest of the code can be grabbed from https://github.com/andreabolognani/libvirt/tree/pseries-caps Changes from [RFC v3]: * can be considered for merging, since the QEMU part already has; * fix compatibility issues with QEMU <2.12 spotted by Shivaprasad; * drop all features except for HTM, at least for the time being; * add documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [RFC v3] https://www.redhat.com/archives/libvir-list/2018-March/msg00042.html [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (8): tests: Rename pseries-features-hpt test tests: Add capabilities data for QEMU 2.12 qemu: Add capability for qom-list-properties qemu: Rename virQEMUCapsObjectProps* -> virQEMUCapsDeviceProps* qemu: Extract generic part from qemuMonitorJSONGetDeviceProps() qemu: Add capability for the HTM pSeries feature qemu: Implement the HTM pSeries feature news: Update for the HTM pSeries feature docs/formatdomain.html.in | 7 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 19 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 281 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 149 + src/qemu/qemu_domain.c | 13 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 40 +- src/qemu/qemu_monitor_json.h | 5 + .../caps_2.12.0-gicv2.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv2.aarch64.xml | 319 + .../caps_2.12.0-gicv3.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv3.aarch64.xml | 319 + .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21247 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1095 + .../caps_2.12.0.x86_64.replies | 19121 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1271 ++ tests/qemucapabilitiestest.c | 4 + .../pseries-features-invalid-machine.xml | 1 + ...ies-features-hpt.args => pseries-features.args} | 2 +- ...eries-features-hpt.xml => pseries-features.xml} | 1 + tests/qemuxml2argvtest.c | 5 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 - tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 3 +- 29 files changed, 78113 insertions(+), 130 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (87%) rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (97%) delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.14.3

3 22

[libvirt] [PATCH] rpm: fix incorrect expansion of %systemd_preun macro
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

Macros in RPMs are expanded before line continuations, so when we write %systemd_preun foo \ bar What happens is that it expands to if [ $1 -eq 0 ] ; then # Package removal, not upgrade systemctl --no-reload disable --now foo \ > /dev/null 2>&1 || : fi bar which is obviously complete garbage and not what we expected. It is simply not safe to ever use line continuations in combination with macros. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index bc8257f34b..6bf8368476 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1512,9 +1512,9 @@ exit 0 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlockd-admin.socket \ - virtlogd.socket virtlogd-admin.socket \ - libvirtd.service + %systemd_post virtlockd.socket virtlockd-admin.socket + %systemd_post virtlogd.socket virtlogd-admin.socket + %systemd_post libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation @@ -1549,9 +1549,9 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.service \ - virtlogd.socket virtlogd-admin.socket virtlogd.service \ - virtlockd.socket virtlockd-admin.socket virtlockd.service + %systemd_preun libvirtd.service + %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service + %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade -- 2.14.3

3 9

[libvirt] Libvirt-4.1.0 build fails at the 'make install' linking stage with 4.0.0 installed
by Predrag Ivanović 21 Mar '18

21 Mar '18

Hi. When I try to build Libvirt-4.1.0 on a system that has 4.0.0 installed, the build fails at the 'make install' linking stage with the error below. Same thing happened with git master I tried (commit 43523d7421, haven't tried with the latest one yet) and rebuilding 4.0.0 works fine. 4.1.0 builds on a system without 4.0.0, though, with no changes to configure switches or anything else. Is something broken on my system and/or the way I built 4.0.0 , so 4.1.0 picks up on that? 'make check' passes without errors for both. qemu-2.11.1 ------- ibtool: warning: relinking 'libvirt_driver_qemu.la' libtool: install: (cd /usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src; /bin/sh "/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/libtool" --silent --tag CC --mode=relink gcc -I/usr/include/libxml2 -fno-common -W -Waddress -Waggressive-loop-optimizations -Wall -Wattributes -Wbad-function-cast -Wbool-compare -Wbuiltin-macro-redefined -Wcast-align -Wchar-subscripts -Wchkp -Wclobbered -Wcomment -Wcomments -Wcoverage-mismatch -Wcpp -Wdate-time -Wdeprecated-declarations -Wdesignated-init -Wdiscarded-array-qualifiers -Wdiscarded-qualifiers -Wdiv-by-zero -Wdouble-promotion -Wduplicated-cond -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-security -Wformat-y2k -Wformat-zero-length -Wframe-address -Wfree-nonheap-object -Whsa -Wignored-attributes -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wincompatible-pointer-types -Winit-self -Winline -Wint-conversion -Wint-to-pointer-cast -Winvalid-memory-model -Winvalid-pch -Wjump-misses- init -Wlogical-not-parentheses -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmemset-transposed-args -Wmisleading-indentation -Wmissing-braces -Wmissing-declarations -Wmissing-field-initializers -Wmissing-include-dirs -Wmissing-parameter-type -Wmissing-prototypes -Wmultichar -Wnarrowing -Wnested-externs -Wnonnull -Wnonnull-compare -Wnull-dereference -Wodr -Wold-style-declaration -Wold-style-definition -Wopenmp-simd -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas -Wpsabi -Wreturn-local-addr -Wreturn-type -Wscalar-storage-order -Wsequence-point -Wshadow -Wshift-count-negative -Wshift-count-overflow -Wshift-negative-value -Wsizeof-array-argument -Wsizeof-pointer-memaccess -Wstrict-aliasing -Wstrict-prototypes -Wsuggest-attribute=const -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wsuggest-final-methods -Wsuggest-final-types -Wswitch -Wswitch-bool -Wsync-nand -Wtautological- compare -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized -Wunknown-pragmas -Wunused -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function -Wunused-label -Wunused-local-typedefs -Wunused-parameter -Wunused-result -Wunused-value -Wunused-variable -Wvarargs -Wvariadic-macros -Wvector-operation-performance -Wvolatile-register-var -Wwrite-strings -Warray-bounds=2 -Wnormalized=nfc -Wshift-overflow=2 -Wunused-const-variable=2 -Wno-sign-compare -Wjump-misses-init -Wswitch-enum -Wno-format-nonliteral -fstack-protector-strong -fexceptions -fasynchronous-unwind-tables -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wframe-larger-than=4096 -O2 -march=x86-64 -pipe -DLIBXL_API_VERSION=0x040400 -module -avoid-version -export-dynamic -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -lX11 -o libvirt_driver_qemu.la -rpath /usr/lib/libvirt/connection-driver libvirt_driver_qemu_impl.la libvirt.la ../gnulib/lib/libgnu.la - ldl -inst-prefix-dir /usr/pkgmk/build/libvirt/pkg) ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessGetVolumeQcowPassphrase': qemu_process.c:(.text+0x1e98): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessSetupVcpu': qemu_process.c:(.text+0x4a65): undefined reference to `virResctrlAllocAddPID' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareDomain': qemu_process.c:(.text+0x4d32): undefined reference to `virGetConnectNetwork' qemu_process.c:(.text+0x52d7): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareHost': qemu_process.c:(.text+0x5bd5): undefined reference to `virDomainNetAllocateActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessLaunch': qemu_process.c:(.text+0x7ab1): undefined reference to `virResctrlAllocCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessStop': qemu_process.c:(.text+0x8ce3): undefined reference to `virDomainNetReleaseActualDevice' qemu_process.c:(.text+0x8dd4): undefined reference to `virResctrlAllocRemove' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessReconnect': qemu_process.c:(.text+0xa9a8): undefined reference to `virDomainDiskTranslateSourcePool' qemu_process.c:(.text+0xadbb): undefined reference to `virDomainNetNotifyActualDevice' qemu_process.c:(.text+0xb6ec): undefined reference to `virResctrlAllocDeterminePath' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateCleanup': qemu_driver.c:(.text+0x476): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x489): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x49c): undefined reference to `virPortAllocatorRangeFree' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateInitialize': qemu_driver.c:(.text+0x187e): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18af): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18e0): undefined reference to `virPortAllocatorRangeNew' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotUpdateDiskSources': qemu_driver.c:(.text+0x4174): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotDiskDataFree': qemu_driver.c:(.text+0x912e): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockCopyCommon': qemu_driver.c:(.text+0x937a): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x956c): undefined reference to `virStorageFileAccess' qemu_driver.c:(.text+0x958c): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x96bb): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97ce): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97fb): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x984f): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x98a1): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x98b7): undefined reference to `virStorageFileCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockPeek': qemu_driver.c:(.text+0x10823): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x108a7): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSetInterfaceParameters': qemu_driver.c:(.text+0x1156a): undefined reference to `virDomainNetBandwidthChangeAllowed' qemu_driver.c:(.text+0x115b3): undefined reference to `virDomainNetBandwidthUpdate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuSecurityChownCallback': qemu_driver.c:(.text+0x1c97c): undefined reference to `virStorageFileSupportsSecurityDriver' qemu_driver.c:(.text+0x1ca09): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x1ca50): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x1ca62): undefined reference to `virStorageFileChown' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageOpenStat.isra.15': qemu_driver.c:(.text+0x1d19b): undefined reference to `virStorageFileInitAs' qemu_driver.c:(.text+0x1d1ac): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x1d1b8): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStorageLimitsRefresh': qemu_driver.c:(.text+0x1d2f6): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainUpdateDeviceFlags': qemu_driver.c:(.text+0x24e17): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainAttachDeviceFlags': qemu_driver.c:(.text+0x25a67): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotCreateXML': qemu_driver.c:(.text+0x28f91): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x2901b): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x29031): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x2906b): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x2943d): undefined reference to `virStorageFileGetBackingStoreStr' qemu_driver.c:(.text+0x2976f): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x29af7): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29b9c): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29db4): undefined reference to `virStorageFileCreate' qemu_driver.c:(.text+0x2a179): undefined reference to `virStorageFileUnlink' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageCloseStat': qemu_driver.c:(.text+0x244f): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_alias.o): In function `qemuAssignDeviceNetAlias': qemu_alias.c:(.text+0x6f8): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainSecretInfoNew': qemu_domain.c:(.text+0x471f): undefined reference to `virGetConnectSecret' qemu_domain.c:(.text+0x48e1): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainStorageFileInit': qemu_domain.c:(.text+0x89ff): undefined reference to `virStorageFileInitAs' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDetermineDiskChain': qemu_domain.c:(.text+0x8ba2): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8bb4): undefined reference to `virStorageFileSupportsAccess' qemu_domain.c:(.text+0x8bd8): undefined reference to `virStorageFileAccess' qemu_domain.c:(.text+0x8be8): undefined reference to `virStorageFileDeinit' qemu_domain.c:(.text+0x8c9f): undefined reference to `virStorageFileGetMetadata' qemu_domain.c:(.text+0x8d14): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8d1c): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDefValidate': qemu_domain.c:(.text+0xb35d): undefined reference to `virDomainFeatureTypeToString' qemu_domain.c:(.text+0xb379): undefined reference to `virDomainFeatureTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFindSCSIControllerModel': qemu_domain_address.c:(.text+0x2505): undefined reference to `virDomainDeviceFindSCSIController' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFillDeviceIsolationGroup': qemu_domain_address.c:(.text+0x2621): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveHostDevice': qemu_hotplug.c:(.text+0xa41): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveNetDevice': qemu_hotplug.c:(.text+0x191e): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachDeviceDiskLive': qemu_hotplug.c:(.text+0x3b4e): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachNetDevice': qemu_hotplug.c:(.text+0x7093): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x716c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainChangeNet': qemu_hotplug.c:(.text+0x93da): undefined reference to `virDomainNetReleaseActualDevice' qemu_hotplug.c:(.text+0x9549): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x977c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachChrDevice': qemu_hotplug.c:(.text+0xbb12): undefined reference to `virDomainChrDeviceTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachMemoryDevice': qemu_hotplug.c:(.text+0xbdd6): undefined reference to `virDomainMemoryModelTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_migration.o): In function `qemuMigrationDstPrepareAny': qemu_migration.c:(.text+0x6ce1): undefined reference to `virGetConnectStorage' qemu_migration.c:(.text+0x6fc5): undefined reference to `virStoragePoolLookupByTargetPath' collect2: error: ld returned 1 exit status libtool: error: error: relink 'libvirt_driver_qemu.la' with the above command before installing it make[3]: *** [Makefile:6292: install-modLTLIBRARIES] Error 1 make[3]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[2]: *** [Makefile:12096: install-am] Error 2 make[2]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[1]: *** [Makefile:12090: install] Error 2 make[1]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make: *** [Makefile:2127: install-recursive] Error 1 =======> ERROR: Building '/usr/pkgmk/package/libvirt#4.1.0-1.pkg.tar.gz' failed. ------ Pedja

1 0

[libvirt] [PATCH] libvirt: Fix comments for two public APIs.
by Han Han 21 Mar '18

21 Mar '18

Fix comments for virConnectListAllNodeDevices and virConnectListAllSecrets. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-nodedev.c | 2 +- src/libvirt-secret.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 493b21f56..563ce889b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -72,7 +72,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) * @devices: Pointer to a variable to store the array containing the node * device objects or NULL if the list is not required (just returns * number of node devices). - * @flags: bitwise-OR of virConnectListAllNodeDevices. + * @flags: bitwise-OR of virConnectListAllNodeDeviceFlags. * * Collect the list of node devices, and allocate an array to store those * objects. diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 447d93f33..1e1cd4e65 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -90,7 +90,7 @@ virConnectNumOfSecrets(virConnectPtr conn) * @secrets: Pointer to a variable to store the array containing the secret * objects or NULL if the list is not required (just returns the * number of secrets). - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virConnectListAllSecretsFlags. * * Collect the list of secrets, and allocate an array to store those * objects. -- 2.16.2

2 1

[libvirt] [PATCH 0/3] libxl: finish use of {Begin, End}API pattern in APIs
by Jim Fehlig 21 Mar '18

21 Mar '18

This is a follow-up to John and I's recent work to improve locking and ref counting of virDomainObj in the libxl driver. These patches change the remaining APIs to use the begin and end API pattern used throughout libxl and other drivers. Jim Fehlig (3): libxl: lock virDomainObj after ListRemove libxl: call EndJob in error case libxl: convert DefineXMLFlags to use begin/end API pattern src/libxl/libxl_driver.c | 29 ++++++++++++++++------------- src/libxl/libxl_migration.c | 7 +++++-- 2 files changed, 21 insertions(+), 15 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH 0/4] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. Christian Ehrhardt (4): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory src/security/security_apparmor.c | 101 +++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 14 ++++++ 2 files changed, 115 insertions(+) -- 2.7.4

2 10

[libvirt] [dbus PATCH v2 0/3] rewrite to GDBus
by Pavel Hrdina 21 Mar '18

21 Mar '18

Changes in v2: - removed patch that set the required libvirt version to libvirt-dbus version Pavel Hrdina (3): introduce support for GDBus implementation switch from sd-bus to GDBus implementation main: introduce thread pool to process D-Bus messages README | 2 +- configure.ac | 15 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++++ data/org.libvirt.Domain.xml | 51 +++ libvirt-dbus.spec.in | 10 +- src/Makefile.am | 20 +- src/connect.c | 320 ++++++++---------- src/connect.h | 36 +-- src/domain.c | 749 ++++++++++++++++++++----------------------- src/domain.h | 7 +- src/events.c | 177 +++++----- src/gdbus.c | 456 ++++++++++++++++++++++++++ src/gdbus.h | 111 +++++++ src/main.c | 308 +++++++----------- src/util.c | 170 +++++----- src/util.h | 53 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 19 files changed, 1501 insertions(+), 1052 deletions(-) create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 src/gdbus.c create mode 100644 src/gdbus.h -- 2.14.3

1 4

[libvirt] Wiki Write Access
by Torsten Senf 21 Mar '18

21 Mar '18

Hi, I was in the irc #virt@OFTC last days and kashyap gave me a lot of helping. His wiki page https://wiki.libvirt.org/page/Live-disk-backup-with-active-blockcommit was very cool and I found some enhancements while testing. I would write this enhancements to the wiki page and would ask you for credentials to do this. Thank you. Greetings -- Torsten Senf sentor(a)sentor.de https://torstensenf.de

2 1

[libvirt] [PATCH] libxl: rename migration APIs to include Src or Dst in their name
by Jim Fehlig 21 Mar '18

21 Mar '18

Inspired by commit ffb7954f to improve readability of the libxl migration APIs. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Suggested by jferlan while reviewing other patches touch the libxl migration code https://www.redhat.com/archives/libvir-list/2018-March/msg00769.html src/libxl/libxl_driver.c | 28 +++---- src/libxl/libxl_migration.c | 179 ++++++++++++++++++++++---------------------- src/libxl/libxl_migration.h | 80 ++++++++++---------- 3 files changed, 144 insertions(+), 143 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 89432d03c..52eeb18f9 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5894,8 +5894,8 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, goto cleanup; } - xmlout = libxlDomainMigrationBegin(domain->conn, vm, xmlin, - cookieout, cookieoutlen); + xmlout = libxlDomainMigrationSrcBegin(domain->conn, vm, xmlin, + cookieout, cookieoutlen); cleanup: virDomainObjEndAPI(&vm); @@ -5940,14 +5940,14 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr dconn, goto error; - if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname))) goto error; if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) goto error; - if (libxlDomainMigrationPrepareTunnel3(dconn, st, &def, cookiein, - cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepareTunnel3(dconn, st, &def, cookiein, + cookieinlen, flags) < 0) goto error; return 0; @@ -5995,14 +5995,14 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, goto error; - if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname))) goto error; if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) goto error; - if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, - cookiein, cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepare(dconn, &def, uri_in, uri_out, + cookiein, cookieinlen, flags) < 0) goto error; return 0; @@ -6058,12 +6058,12 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, goto cleanup; if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { - if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, - dconnuri, uri, dname, flags) < 0) + if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, + dconnuri, uri, dname, flags) < 0) goto cleanup; } else { - if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, - uri, dname, flags) < 0) + if (libxlDomainMigrationSrcPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) goto cleanup; } @@ -6124,7 +6124,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn, return NULL; } - ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled); + ret = libxlDomainMigrationDstFinish(dconn, vm, flags, cancelled); libxlDomainObjEndJob(driver, vm); @@ -6161,7 +6161,7 @@ libxlDomainMigrateConfirm3Params(virDomainPtr domain, if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) goto cleanup; - ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 7dc39ae02..bfe359f59 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -256,7 +256,7 @@ libxlMigrationDstArgsOnceInit(void) VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs) static void -libxlDoMigrateReceive(void *opaque) +libxlDoMigrateDstReceive(void *opaque) { libxlMigrationDstArgs *args = opaque; virDomainObjPtr vm = args->vm; @@ -306,9 +306,9 @@ libxlDoMigrateReceive(void *opaque) static void -libxlMigrateReceive(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, - void *opaque) +libxlMigrateDstReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) { libxlMigrationDstArgs *args = opaque; virNetSocketPtr *socks = args->socks; @@ -335,7 +335,7 @@ libxlMigrateReceive(virNetSocketPtr sock, */ args->recvfd = recvfd; if (virThreadCreate(&thread, false, - libxlDoMigrateReceive, args) < 0) { + libxlDoMigrateDstReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration data")); goto fail; @@ -357,10 +357,10 @@ libxlMigrateReceive(virNetSocketPtr sock, } static int -libxlDoMigrateSend(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - int sockfd) +libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); int xl_flags = 0; @@ -395,11 +395,11 @@ libxlDomainMigrationIsAllowed(virDomainDefPtr def) } char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen) +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen) { libxlDriverPrivatePtr driver = conn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -449,9 +449,9 @@ libxlDomainMigrationBegin(virConnectPtr conn, } virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname) +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def; @@ -554,12 +554,12 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, } int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlMigrationCookiePtr mig = NULL; libxlDriverPrivatePtr driver = dconn->privateData; @@ -619,7 +619,7 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, args->nsocks = 0; mig = NULL; - if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { + if (virThreadCreate(&thread, false, libxlDoMigrateDstReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration data")); goto error; @@ -645,13 +645,13 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, } int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlDriverPrivatePtr driver = dconn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -783,7 +783,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, if (virNetSocketAddIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE, - libxlMigrateReceive, + libxlMigrateDstReceive, args, NULL) < 0) continue; @@ -834,10 +834,10 @@ struct _libxlTunnelMigrationThread { /* * The data flow of tunnel3 migration in the src side: - * libxlDoMigrateSend() -> pipe - * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. + * libxlDoMigrateSrcSend() -> pipe + * libxlTunnel3MigrationSrcFunc() polls pipe out and then write to dest stream. */ -static void libxlTunnel3MigrationFunc(void *arg) +static void libxlTunnel3MigrationSrcFunc(void *arg) { libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *)arg; char *buffer = NULL; @@ -858,7 +858,7 @@ static void libxlTunnel3MigrationFunc(void *arg) if (errno == EAGAIN || errno == EINTR) continue; virReportError(errno, "%s", - _("poll failed in libxlTunnel3MigrationFunc")); + _("poll failed in libxlTunnel3MigrationSrcFunc")); goto cleanup; } @@ -904,11 +904,11 @@ struct libxlTunnelControl { }; static int -libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - virStreamPtr st, - struct libxlTunnelControl **tnl) +libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + virStreamPtr st, + struct libxlTunnelControl **tnl) { struct libxlTunnelControl *tc = NULL; libxlTunnelMigrationThread *arg = NULL; @@ -931,7 +931,7 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, /* Write to dest stream */ arg->st = st; if (virThreadCreate(&tc->thread, true, - libxlTunnel3MigrationFunc, arg) < 0) { + libxlTunnel3MigrationSrcFunc, arg) < 0) { virReportError(errno, "%s", _("Unable to create tunnel migration thread")); goto out; @@ -939,16 +939,17 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, virObjectUnlock(vm); /* Send data to pipe */ - ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); + ret = libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]); virObjectLock(vm); out: - /* libxlMigrationStopTunnel will be called in libxlDoMigrateP2P to free - * all resources for us. */ + /* libxlMigrationSrcStopTunnel will be called in libxlDoMigrateSrcP2P + * to free all resources for us. + */ return ret; } -static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) +static void libxlMigrationSrcStopTunnel(struct libxlTunnelControl *tc) { if (!tc) return; @@ -966,15 +967,15 @@ static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) * introduced in libxl. */ static int -libxlDoMigrateP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - virConnectPtr dconn, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *dname, - const char *uri, - unsigned int flags) +libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + virConnectPtr dconn, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *dname, + const char *uri, + unsigned int flags) { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; @@ -992,8 +993,8 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, virStreamPtr st = NULL; struct libxlTunnelControl *tc = NULL; - dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin, - &cookieout, &cookieoutlen); + dom_xml = libxlDomainMigrationSrcBegin(sconn, vm, xmlin, + &cookieout, &cookieoutlen); if (!dom_xml) goto cleanup; @@ -1048,10 +1049,10 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); if (flags & VIR_MIGRATE_TUNNELLED) - ret = libxlMigrationStartTunnel(driver, vm, flags, st, &tc); + ret = libxlMigrationSrcStartTunnel(driver, vm, flags, st, &tc); else - ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); + ret = libxlDomainMigrationSrcPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); if (ret < 0) orig_err = virSaveLastError(); @@ -1082,7 +1083,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); - ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", @@ -1090,7 +1091,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, cleanup: if (flags & VIR_MIGRATE_TUNNELLED) { - libxlMigrationStopTunnel(tc); + libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } @@ -1129,14 +1130,14 @@ static virConnectAuth virConnectAuthConfig = { * the migration process with an established virConnectPtr to the destination. */ int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - const char *dconnuri, - const char *uri_str ATTRIBUTE_UNUSED, - const char *dname, - unsigned int flags) +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + const char *dconnuri, + const char *uri_str ATTRIBUTE_UNUSED, + const char *dname, + unsigned int flags) { int ret = -1; bool useParams; @@ -1170,8 +1171,8 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, goto cleanup; } - ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, - dname, uri_str, flags); + ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, + dname, uri_str, flags); cleanup: orig_err = virSaveLastError(); @@ -1187,13 +1188,13 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, } int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml ATTRIBUTE_UNUSED, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *uri_str, - const char *dname ATTRIBUTE_UNUSED, - unsigned int flags) +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; @@ -1233,7 +1234,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); - ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd); virObjectLock(vm); if (ret < 0) @@ -1249,10 +1250,10 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, } virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverPrivatePtr driver = dconn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -1347,10 +1348,10 @@ libxlDomainMigrationFinish(virConnectPtr dconn, } int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDomainObjPrivatePtr priv = vm->privateData; @@ -1358,7 +1359,7 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, int ret = -1; if (cancelled) { - /* Resume lock process that was paused in MigrationPerform */ + /* Resume lock process that was paused in MigrationSrcPerform */ virDomainLockProcessResume(driver->lockManager, "xen:///system", vm, diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 3bc2d0eae..42897426d 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -42,63 +42,63 @@ NULL char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen); +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen); virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname); +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags); int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags); int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +int +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - virConnectPtr sconn, const char *dom_xml, const char *dconnuri, const char *uri_str, const char *dname, unsigned int flags); -int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml, - const char *dconnuri, - const char *uri_str, - const char *dname, - unsigned int flags); - virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); #endif /* LIBXL_DRIVER_H */ -- 2.16.2

2 1

[libvirt] [jenkins-ci PATCH 0/3] guests: Configure ccache
by Andrea Bolognani 20 Mar '18

20 Mar '18

See patch 3/3 for the rationale. Andrea Bolognani (3): guests: Rename 'ci' flavor to 'jenkins' guests: Factor out user creation guests: Configure ccache guests/README.markdown | 9 +++++---- guests/files/ccache.conf | 1 + guests/lcitool | 12 ++++++------ guests/site.yml | 8 ++------ guests/tasks/jenkins.yml | 6 ------ guests/tasks/test.yml | 21 --------------------- guests/tasks/user.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 guests/files/ccache.conf delete mode 100644 guests/tasks/test.yml create mode 100644 guests/tasks/user.yml -- 2.14.3

2 6

[libvirt] [PATCH] travis: Test both python2 and python3
by Andrea Bolognani 20 Mar '18

20 Mar '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d071c98634..01dffaa602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,12 @@ matrix: - compiler: gcc dist: trusty env: + - PYTHON=$(which python2) - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart" - compiler: clang dist: trusty env: + - PYTHON=$(which python3) - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd" - compiler: clang os: osx -- 2.14.3

2 1