- Devel - libvirt List Archives

[libvirt] [PATCH 00/18] Refactor event-test
by Peter Krempa 18 Apr '16

18 Apr '16

I was asked to add the new event to the test. My eyes started bleeding after opening the file. Refactor the mega-ancient code and add missing stuff. As a finishing touch add a static check that new events are not forgotten. P.S: I contemplated just deleting that ... stuff ... at first. But I coudn't think of a bulletproof justification other than the state of the code. Peter Krempa (18): event-test: Remove forward declarations event-test: Get rid of useless and ambiguous VIR_DEBUG macro event-test: Remove unnecessary 'usage' function event-test: touch up coding style event-test: Use functions with typecasted switch to convert enums lib: document fields virConnectDomainEventDiskChangeReason event-test: Force compiler check in switch for connectClose callback event-test: Use typecasted enum to convert graphics event phase event-test: Use switch instead of if/else if chains for lifecycle event translation event-test: make few switch statements future proof event-test: Enable enum sentinels and warn on not fully populated enums event-test: make domain event registration declarative event-test: Add VIR_DOMAIN_EVENT_ID_BLOCK_JOB and VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 event-test: Add VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION callback event-test: Add VIR_DOMAIN_EVENT_ID_JOB_COMPLETED event-test: Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED event-test: Add VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON event-test: Enforce domain event sync examples/Makefile.am | 5 + examples/object-events/event-test.c | 973 +++++++++++++++++++++--------------- include/libvirt/libvirt-domain.h | 6 +- 3 files changed, 580 insertions(+), 404 deletions(-) -- 2.8.0

2 36

[libvirt] [PATCH v3] security: Rename DomainSetDirLabel to DomainSetPathLabel
by Martin Kletzander 18 Apr '16

18 Apr '16

It already labels abritrary paths, so it's just the naming that was wrong. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: The other patch from the series was pushed, so this is the only one missing right now, so it needed rebasing. src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/security/security_dac.c | 8 ++++---- src/security/security_driver.h | 8 ++++---- src/security/security_manager.c | 10 +++++----- src/security/security_manager.h | 6 +++--- src/security/security_selinux.c | 8 ++++---- src/security/security_stack.c | 12 ++++++------ 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 61fc5004bbb7..1118fdcfa3bc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1055,7 +1055,7 @@ virSecurityDriverLookup; # security/security_manager.h virSecurityManagerCheckAllLabel; virSecurityManagerClearSocketLabel; -virSecurityManagerDomainSetDirLabel; +virSecurityManagerDomainSetPathLabel; virSecurityManagerGenLabel; virSecurityManagerGetBaseLabel; virSecurityManagerGetDOI; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed1e0e502925..e031e0fc42c8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -527,8 +527,8 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, path) < 0) + if (virSecurityManagerDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 81d86c2d1aa2..c0873007d397 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4486,8 +4486,8 @@ qemuProcessMakeDir(virQEMUDriverPtr driver, goto cleanup; } - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, path) < 0) + if (virSecurityManagerDomainSetPathLabel(driver->securityManager, + vm->def, path) < 0) goto cleanup; ret = 0; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index a09aba5f62c6..df3ed4793be8 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1542,9 +1542,9 @@ virSecurityDACGetBaseLabel(virSecurityManagerPtr mgr, } static int -virSecurityDACDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path) +virSecurityDACDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr seclabel; @@ -1607,5 +1607,5 @@ virSecurityDriver virSecurityDriverDAC = { .getBaseLabel = virSecurityDACGetBaseLabel, - .domainSetDirLabel = virSecurityDACDomainSetDirLabel, + .domainSetPathLabel = virSecurityDACDomainSetPathLabel, }; diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 784b0dee65ea..7cb62f029343 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -118,9 +118,9 @@ typedef int (*virSecurityDomainSetImageLabel) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src); -typedef int (*virSecurityDomainSetDirLabel) (virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path); +typedef int (*virSecurityDomainSetPathLabel) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); struct _virSecurityDriver { @@ -172,7 +172,7 @@ struct _virSecurityDriver { virSecurityDriverGetBaseLabel getBaseLabel; - virSecurityDomainSetDirLabel domainSetDirLabel; + virSecurityDomainSetPathLabel domainSetPathLabel; }; virSecurityDriverPtr virSecurityDriverLookup(const char *name, diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 07a05224e0be..ecb4a40f05c8 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -987,14 +987,14 @@ virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, int -virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path) +virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) { - if (mgr->drv->domainSetDirLabel) { + if (mgr->drv->domainSetPathLabel) { int ret; virObjectLock(mgr); - ret = mgr->drv->domainSetDirLabel(mgr, vm, path); + ret = mgr->drv->domainSetPathLabel(mgr, vm, path); virObjectUnlock(mgr); return ret; } diff --git a/src/security/security_manager.h b/src/security/security_manager.h index e534e31d4a55..4cbc2d85d0f1 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -160,8 +160,8 @@ int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm, virStorageSourcePtr src); -int virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path); +int virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path); #endif /* VIR_SECURITY_MANAGER_H__ */ diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 04760a1f41d1..b33d54a81d58 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2594,9 +2594,9 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr, } static int -virSecuritySELinuxDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def, - const char *path) +virSecuritySELinuxDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) { virSecurityLabelDefPtr seclabel; @@ -2652,5 +2652,5 @@ virSecurityDriver virSecurityDriverSELinux = { .domainGetSecurityMountOptions = virSecuritySELinuxGetSecurityMountOptions, .getBaseLabel = virSecuritySELinuxGetBaseLabel, - .domainSetDirLabel = virSecuritySELinuxDomainSetDirLabel, + .domainSetPathLabel = virSecuritySELinuxDomainSetPathLabel, }; diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 00d1fa7012bb..3ea27518fcc1 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -600,17 +600,17 @@ virSecurityStackRestoreImageLabel(virSecurityManagerPtr mgr, } static int -virSecurityStackDomainSetDirLabel(virSecurityManagerPtr mgr, - virDomainDefPtr vm, - const char *path) +virSecurityStackDomainSetPathLabel(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) { virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityStackItemPtr item = priv->itemsHead; int rc = 0; for (; item; item = item->next) { - if (virSecurityManagerDomainSetDirLabel(item->securityManager, - vm, path) < 0) + if (virSecurityManagerDomainSetPathLabel(item->securityManager, + vm, path) < 0) rc = -1; } @@ -667,5 +667,5 @@ virSecurityDriver virSecurityDriverStack = { .getBaseLabel = virSecurityStackGetBaseLabel, - .domainSetDirLabel = virSecurityStackDomainSetDirLabel, + .domainSetPathLabel = virSecurityStackDomainSetPathLabel, }; -- 2.8.1

2 1

[libvirt] [PATCH v4 0/2] persistent live migration with specified XML
by Dmitry Andreev 18 Apr '16

18 Apr '16

v4: wrong param name in commit msg v3: - use shorter name for param and rename args - move qemuMigrationCookieAddPersistent out from qemuMigrationBakeCookie - rebase to master v2: reimplemented with new migration param Libvirt doesn't allow to specify destination persistent domain configuration. VIR_MIGRATE_PARAM_DEST_XML migration param is used for active configuration and persistent configuration is taken from source domain. The problem is mentioned in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=835300 This patch-set introduces new migration param VIR_MIGRATE_PARAM_PERSIST_XML and implements its support in qemu driver. Dmitry Andreev (2): qemuMigrationCookieAddPersistent: move it out and change argument type qemu: migration: new migration param for persistent destination XML include/libvirt/libvirt-domain.h | 15 ++++++++++ src/qemu/qemu_driver.c | 12 +++++--- src/qemu/qemu_migration.c | 64 ++++++++++++++++++++++++---------------- src/qemu/qemu_migration.h | 2 ++ 4 files changed, 63 insertions(+), 30 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH] qemu: reject min_guarantee at parse time
by Cole Robinson 18 Apr '16

18 Apr '16

min_guarantee isn't implemented for qemu, and an explicit check was added in june 2014 to reject the VM at qemu startup time. It's a weird place to do XML validation, so move it to the post parse area where we have similar checks. Also drop a validation check against min_guarantee in the command line building; it will never see min_guarantee there. --- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 7 +++++++ src/qemu/qemu_process.c | 7 ------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26c19ff..2fb967a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9143,7 +9143,6 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, if (virMemoryLimitIsSet(def->mem.hard_limit) || virMemoryLimitIsSet(def->mem.soft_limit) || - def->mem.min_guarantee || virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 73187ce..f5fafc8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1690,6 +1690,13 @@ qemuDomainDefPostParse(virDomainDefPtr def, return ret; } + if (def->mem.min_guarantee) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Parameter 'min_guarantee' " + "not supported by QEMU.")); + return -1; + } + if (def->os.loader && def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && def->os.loader->readonly == VIR_TRISTATE_SWITCH_ON && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 81d86c2..387aff5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4550,13 +4550,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, virDomainDefCheckDuplicateDiskInfo(vm->def) < 0) return -1; - if (vm->def->mem.min_guarantee) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Parameter 'min_guarantee' " - "not supported by QEMU.")); - return -1; - } - VIR_DEBUG("Checking for any possible (non-fatal) issues"); /* -- 2.7.3

2 2

[libvirt] [python PATCH] event: Add support VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED
by Peter Krempa 18 Apr '16

18 Apr '16

--- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 5be4978..f96c917 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -535,6 +535,9 @@ def myDomainEventMigrationIteration(conn, dom, iteration, opaque): dom.name(), dom.ID(), iteration)) def myDomainEventJobCompletedCallback(conn, dom, params, opaque): print("myDomainEventJobCompletedCallback: Domain %s(%s) %s" % (dom.name(), dom.ID(), params)) +def myDomainEventDeviceRemovalFailedCallback(conn, dom, dev, opaque): + print("myDomainEventDeviceRemovalFailedCallback: Domain %s(%s) failed to remove device: %s" % ( + dom.name(), dom.ID(), dev)) ########################################################################## # Network events @@ -649,6 +652,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 396a6ed..0f76c59 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -234,6 +234,15 @@ cb(self, virDomain(self, _obj=dom), params, opaque) return 0 + def _dispatchDomainEventDeviceRemovalFailedCallback(self, dom, devAlias, cbData): + """Dispatches event to python user domain device removal failed event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), devAlias, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index ee355da..4640ed5 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6894,6 +6894,61 @@ libvirt_virConnectDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_U } #endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ + +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED +static int +libvirt_virConnectDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *devAlias, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventDeviceRemovalFailedCallback", + (char*)"OsO", + pyobj_dom, devAlias, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; + +} +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED */ + + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -7004,6 +7059,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventJobCompletedCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_JOB_COMPLETED */ +#ifdef VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED + case VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceRemovalFailedCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.8.0

2 1

[libvirt] [libvirt-glib v2] spec: Add verification of the tarball GPG signature
by Christophe Fergeau 18 Apr '16

18 Apr '16

This at least allows to make sure that all tarballs are signed with the same GPG key, and that the tarball was not corrupted between the time it was uploaded upstream, and the time the RPM is built. danpb-BE86EBB415104FDF.gpg is generated with: gpg2 -v --armor --export 15104FDF | gpg2 --no-default-keyring --keyring ./danpb-BE86EBB415104FDF.gpg --import We cannot unconditionally enable gpg signature checks as when building from tarballs with rpmbuild -ta (for example), the needed keyring file will no be available, so this commit checks that BE86EBB415104FDF.gpg exists before attempting to do the check. --- libvirt-glib.spec.in | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Hey, here is my attempt at addressing the issue raised with v1 (rpmbuild -ta being broken by the change). I cannot rely on the usual test on %{fedora} and %{rhel} as they are set when running rpmbuild on a fedora. Instead I added a test for the existence of the keyring file. Maybe there are better ways of writing this file existence check.. Christophe diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index 32ce4f0..02a27d5 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -1,5 +1,12 @@ # -*- rpm-spec -*- +# We cannot unconditionally enable gpg signature checks as when +# building from tarballs with rpmbuild -ta (for example), the needed +# keyring file will no be available +%define gpg_keyring danpb-BE86EBB415104FDF.gpg +%define has_gpg_keyring %(if [ -f %{gpg_keyring} ]; then echo 1; else echo 0; fi) +%define with_gpg_check %{has_gpg_keyring} + %define with_introspection 0 %define with_python 0 %define with_vala 0 @@ -28,6 +35,10 @@ Group: Development/Libraries License: LGPLv2+ URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz +%if %{with_gpg_check} +Source1: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz.asc +Source2: %{gpg_keyring} +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= @GLIB2_REQUIRED@ @@ -45,6 +56,9 @@ BuildRequires: libtool %if %{with_vala} BuildRequires: vala-tools %endif +%if %{with_gpg_check} +BuildRequires: gnupg2 +%endif %package devel Group: Development/Libraries @@ -109,6 +123,9 @@ libvirt and the glib event loop %endif %prep +%if %{with_gpg_check} +gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%endif %setup -q %build -- 2.5.5

1 0

[libvirt] [PATCH] tests: Fix syntax in iSCSI auth/secret tests
by John Ferlan 18 Apr '16

18 Apr '16

While working on the tests for the secret initialization vector, I found that the existing iSCSI tests were lacking in how they defined the IQN. Many had IQN's of just 'iqn.1992-01.com.example' for one disk while using 'iqn.1992-01.com.example/1' for the second disk (same for hostdevs - guess how they were copied/generated). Typically (and documented this way), IQN's would include be of the form 'iqn.1992-01.com.example:storage/1' indicating an IQN using "storage" for naming authority specific string and "/1" for the iSCSI LUN. So modify the input XML's to use the more proper format - this of course has a ripple effect on the output XML and the args. Also note that the "%3A" is generated by the virURIFormat/xmlSaveUri to represent the colon. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- .../qemuargv2xml-disk-drive-network-iscsi-auth.args | 6 +++--- .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 4 ++-- .../qemuxml2argv-disk-drive-network-iscsi-auth.args | 8 +++++--- .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 7 +++++-- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 4 ++-- .../qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 4 ++-- .../qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 4 ++-- .../qemuxml2xmlout-disk-drive-network-iscsi-auth.xml | 7 +++++-- .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 4 ++-- .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 4 ++-- 11 files changed, 32 insertions(+), 24 deletions(-) diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args index 5bebcae..44c9506 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args @@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example,format=raw,if=virtio \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ -if=virtio \ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \ +-drive file=iscsi://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\ +format=raw,if=virtio \ -net none \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml index 35b3abc..b5f948b 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml @@ -19,14 +19,14 @@ <auth username='myname'> <secret type='iscsi' usage='qemuargv2xml_usage'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args index 735a0ae..66e2497 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args @@ -18,10 +18,12 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -6000/iqn.1992-01.com.example,format=raw,if=none,id=drive-virtio-disk0 \ +6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,\ +id=drive-virtio-disk0 \ -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\ id=virtio-disk0 \ --drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\ -if=none,id=drive-virtio-disk1 \ +-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ +6000/iqn.1992-01.com.example%3Astorage/2,format=raw,if=none,\ +id=drive-virtio-disk1 \ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,\ id=virtio-disk1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml index 5ac4abf..1f80d3b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.xml @@ -19,14 +19,17 @@ <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args index 2bd98e5..ff6655f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args @@ -21,9 +21,9 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,scsi-id=4,drive=drive-hostdev0,id=hostdev0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev1 \ -device scsi-generic,bus=scsi0.0,scsi-id=5,drive=drive-hostdev1,id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml index ed2bf25..f988165 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml @@ -26,7 +26,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -35,7 +35,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args index 624be94..42113c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args @@ -21,11 +21,11 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example,if=none,format=raw,id=drive-hostdev0 \ +3260/iqn.1992-01.com.example%3Astorage/1,if=none,format=raw,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,drive=drive-hostdev0,\ id=hostdev0 \ -drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\ -3260/iqn.1992-01.com.example/1,if=none,format=raw,id=drive-hostdev1 \ +3260/iqn.1992-01.com.example%3Astorage/2,if=none,format=raw,id=drive-hostdev1 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=5,drive=drive-hostdev1,\ id=hostdev1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml index 33577ab..b70b84e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml @@ -26,7 +26,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -35,7 +35,7 @@ <address type='drive' controller='0' bus='0' target='2' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml index 4f0e87f..fc8aba1 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml @@ -19,7 +19,7 @@ <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='6000'/> </source> <target dev='vda' bus='virtio'/> @@ -27,7 +27,10 @@ </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw'/> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <auth username='myname'> + <secret type='iscsi' usage='mycluster_myname'/> + </auth> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='6000'/> </source> <target dev='vdb' bus='virtio'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml index 5ed4095..1db5ed9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -41,7 +41,7 @@ <address type='drive' controller='0' bus='0' target='0' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml index a5d3b8e..64c149f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml @@ -32,7 +32,7 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> @@ -41,7 +41,7 @@ <address type='drive' controller='0' bus='0' target='2' unit='4'/> </hostdev> <hostdev mode='subsystem' type='scsi' managed='yes'> - <source protocol='iscsi' name='iqn.1992-01.com.example/1'> + <source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'> <host name='example.org' port='3260'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> -- 2.5.5

2 1

[libvirt] [PATCH] ZFS: Support sparse volumes
by Richard Laager 17 Apr '16

17 Apr '16

By default, `zfs create -V ...` reserves space for the entire volsize, plus some extra (which attempts to account for overhead). If `zfs create -s -V ...` is used instead, zvols are (fully) sparse. A middle ground (partial allocation) can be achieved with `zfs create -s -o refreservation=... -V ...`. Both libvirt and ZFS support this approach, so the ZFS storage backend should support it. Signed-off-by: Richard Laager <rlaager(a)wiktel.com> --- src/storage/storage_backend_zfs.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c index 2e6e407..6dc3cec 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -112,7 +112,7 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, if (!(tokens = virStringSplitCount(volume_string, "\t", 0, &count))) return -1; - if (count != 2) + if (count != 3) goto cleanup; if (!(name_tokens = virStringSplit(tokens[0], "/", 2))) @@ -151,6 +151,20 @@ virStorageBackendZFSParseVol(virStoragePoolObjPtr pool, goto cleanup; } + if (virStrToLong_ull(tokens[2], NULL, 10, &volume->target.allocation) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed refreservation reported")); + goto cleanup; + } + if (volume->target.allocation >= volume->target.capacity) { + /* A zvol created without -s will have a refreservation slightly larger + * than volblocksize. + */ + volume->target.allocation = volume->target.capacity; + } else { + volume->target.sparse = true; + } + if (is_new_vol && VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, @@ -190,7 +204,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, cmd = virCommandNewArgList(ZFS, "list", "-Hp", "-t", "volume", "-r", - "-o", "name,volsize", + "-o", "name,volsize,refreservation", pool->def->source.name, NULL); virCommandSetOutputBuffer(cmd, &volumes_list); @@ -320,15 +334,28 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; /** * $ zfs create -o volmode=dev -V 10240K test/volname + * $ zfs create -o volmode=dev -s -V 10240K test/volname + * $ zfs create -o volmode=dev -s -o refreservation=1024K -V 10240K test/volname * * -o volmode=dev -- we want to get volumes exposed as cdev * devices. If we don't specify that zfs * will lookup vfs.zfs.vol.mode sysctl value + * -s -- create a sparse volume + * -o refreservation -- reserve the specified amount of space * -V -- tells to create a volume with the specified size */ cmd = virCommandNewArgList(ZFS, "create", NULL); if (volmode_needed) virCommandAddArgList(cmd, "-o", "volmode=dev", NULL); + if (vol->target.capacity != vol->target.allocation) { + virCommandAddArg(cmd, "-s"); + if (vol->target.allocation > 0) { + virCommandAddArg(cmd, "-o"); + virCommandAddArgFormat(cmd, "refreservation=%lluK", + VIR_DIV_UP(vol->target.allocation, 1024)); + } + vol->target.sparse = true; + } virCommandAddArg(cmd, "-V"); virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->target.capacity, 1024)); -- 2.1.4

2 7

[libvirt] [libvirt-sandbox PATCH] virt-sandbox: document how to pass arguments to commands
by Guido Günther 17 Apr '16

17 Apr '16

The example was already correct but the synopsis didn't mention '--' is required. --- bin/virt-sandbox.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index 9495e85..d6a441c 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -345,7 +345,9 @@ virt-sandbox - Run cmd under a virtual machine sandbox =head1 SYNOPSIS -virt-sandbox [OPTIONS...] COMMAND [CMDARG1 [CMDARG2 [...]]] +virt-sandbox [OPTIONS...] COMMAND + +virt-sandbox [OPTIONS...] -- COMMAND [CMDARG1 [CMDARG2 [...]]] =head1 DESCRIPTION -- 2.8.0.rc3

2 2

Re: [libvirt] [PATCH] storage_scsi: Handle physical HBA when deleting vHBA vport.
by John Ferlan 16 Apr '16

16 Apr '16

On 04/15/2016 02:26 PM, Nitesh Konkar wrote: > On Fri, Apr 15, 2016 at 8:08 PM, John Ferlan <jferlan(a)redhat.com> wrote: > Please do not remove libvir-list from a response. I've replaced it. Someone may have a different idea. >> >> >> On 04/15/2016 10:11 AM, Nitesh Konkar wrote: >>> Thanks John for the reply. >>> >>> On Fri, Apr 15, 2016 at 5:08 PM, John Ferlan <jferlan(a)redhat.com> wrote: >>> >>>> >>>> >>>> On 04/07/2016 05:09 AM, Nitesh Konkar wrote: >>>>> HBA will get treated as vHBA if not returned >>>>> after detecting vhba_parent format. >>>>> >>>>> Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> >>>>> --- >>>>> Before Patch: >>>>> # virsh pool-destroy poolhba_name >>>>> error: Failed to destroy pool poolhba_name >>>>> error: internal error: Invalid adapter name 'pci_000x_0x_00_x' for SCSI >>>> pool >>>>> >>>>> # virsh nodedev-dumpxml scsi_host2 >>>>> <device> >>>>> <name>scsi_host2</name> >>>>> <path>xxxx</path> >>>>> <parent>pci_000x_0x_00_x</parent> >>>>> <capability type='scsi_host'> >>>>> <host>2</host> >>>>> ... >>>>> ... >>>>> <capability type='vport_ops'> >>>>> <max_vports>255</max_vports> >>>>> <vports>0</vports> >>>>> </capability> >>>>> </capability> >>>>> </device> >>>>> >>>>> After Patch: >>>>> # virsh pool-destroy poolhba_name >>>>> Pool poolhba_name destroyed >>>>> >>>>> src/storage/storage_backend_scsi.c | 5 +++++ >>>>> 1 file changed, 5 insertions(+) >>>>> >>>> >>>> Can you provide the pool-dumpxml for poolhba_name? Can you provide the >>>> nodedev-dumpxml of the 'scsi_host#' that was created for the vHBA pool? >>>> >>>> >>> This patch is to destroy a pool created out from a Physical HBA. >> Apologies, >>> if the >>> commit message was misleading. >>> >>> # virsh pool-dumpxml poolhba_name >>> <pool type='scsi'> >>> <name>poolhba_name</name> >>> <uuid>60d74134-0c18-4d4f-9305-24d96ce1a1b6</uuid> >>> <capacity unit='bytes'>268435456000</capacity> >>> <allocation unit='bytes'>268435456000</allocation> >>> <available unit='bytes'>0</available> >>> <source> >>> <adapter type='fc_host' managed='yes' wwnn='20000120fa8f1271' >>> wwpn='10000090fa8f1271'/> >>> </source> >>> <target> >>> <path>/dev/disk/by-id</path> >>> <permissions> >>> <mode>0700</mode> >>> <owner>0</owner> >>> <group>0</group> >>> </permissions> >>> </target> >>> </pool> >>> >> >> OK, maybe I wasn't clear enough... Which 'scsi_host#' is *this* pool >> associated with. Prior to creating it, do a virsh nodedev-list >> scsi_host. Then create it. Then generate the list again. >> >> The pool poolhba_name is associated with scsi_host2. > > #virsh list --all > Id Name State > ---------------------------------------------------- > > # virsh nodedev-list scsi_host > scsi_host0 > scsi_host1 > scsi_host2 > scsi_host3 > scsi_host4 > > #virsh pool-list --all > Name State Autostart > ------------------------------------------- > poolhba_name active yes > > # virsh nodedev-dumpxml scsi_host2 > <device> > <name>scsi_host2</name> > > <path>/sys/devices/pci0001:00/0001:00:00.0/0001:01:00.0/0001:02:09.0/0001:09:00.1/host2</path> > <parent>pci_0001_09_00_1</parent> > <capability type='scsi_host'> > <host>2</host> > <unique_id>1</unique_id> > <capability type='fc_host'> > <wwnn>20000120fa8f1271</wwnn> > <wwpn>10000090fa8f1271</wwpn> > <fabric_wwn>100050eb1a99d430</fabric_wwn> > </capability> > <capability type='vport_ops'> > <max_vports>255</max_vports> > <vports>1</vports> > </capability> > </capability> > </device> > > Or of course since you cannot delete the poolvhba_name, go through the >> various scsi_host#'s on your host looking for the one with the match >> wwwn/wwpn - then do the nodedev-dumpxml of that. For you example you >> are looking for the scsi_host# with the matching wwnn='20000120fa8f1271' >> and wwpn='10000090fa8f1271'. >> >> That one is supposed to list 'scsi_host2' in the <parent> field as my >> 'scsi_host19' does below. >> >> # virsh pool-list --all > Name State Autostart > ------------------------------------------- > poolhba_name active yes > > # virsh nodedev-dumpxml scsi_host2 > <device> > <name>scsi_host2</name> > > <path>/sys/devices/pci0001:00/0001:00:00.0/0001:01:00.0/0001:02:09.0/0001:09:00.1/host2</path> > <parent>pci_0001_09_00_1</parent> > <capability type='scsi_host'> > <host>2</host> > <unique_id>1</unique_id> > <capability type='fc_host'> > <wwnn>20000120fa8f1271</wwnn> > <wwpn>10000090fa8f1271</wwpn> > <fabric_wwn>100050eb1a99d430</fabric_wwn> > </capability> > <capability type='vport_ops'> > <max_vports>255</max_vports> > <vports>1</vports> > </capability> > </capability> > </device> > > Here the parent field has "pci_0001_09_00_1" and not 'scsi_host2' . This is > why it errors out. > > # virsh pool-destroy poolhba_name > 2016-04-15 18:21:07.054+0000: 113209: error : virGetSCSIHostNumber:1922 : > internal error: Invalid adapter name 'pci_0001_09_00_1' for SCSI pool > error: Failed to destroy pool poolhba_name > error: internal error: Invalid adapter name 'pci_0001_09_00_1' for SCSI pool > > Am I missing something? > Perhaps - I think I explained how the vHBA is created before... Look at the code for createVport() - see the 'parent_hoststr' description. When you did a pool-{create|define} for the "poolhba_name", you provided some XML which would search the existing 'scsi_host#' for one that's capable of supporting a vHBA. What that create is supposed to do (at least it does it on the systems I used) is create another 'scsi_host#'. That scsi_host# is then the vHBA - it's *parent* is supposed to be 'scsi_host2' - see my example. On your host perhaps scsi_host3 or scsi_host4. Do either one of those two have the wwnn/wwpn that's in your poolhba_name: <adapter type='fc_host' managed='yes' wwnn='20000120fa8f1271' wwpn='10000090fa8f1271'/> I'm really not quite sure what's happening on your host/environment. Perhaps you could follow how createVport generates things and report back. You can always 'create' another vHBA using a different wwnn/wwpn John

1 0

[libvirt] [PATCH libvirt v2 0/2] libxl: support vscsi
by Olaf Hering 15 Apr '16

15 Apr '16

Add support for upcoming vscsi= in libxl. Changes between v1 and v2: - rebase to 'master' (ad584cb) - Update API to v12 Olaf Hering (2): libxl: include a XLU_Config in _libxlDriverConfig libxl: support vscsi src/libxl/libxl_conf.c | 66 +++++++++++++++++ src/libxl/libxl_conf.h | 8 ++ src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 187 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 262 insertions(+), 1 deletion(-)

2 5

[libvirt] [PATCH] libxl config file convertion: correct `type=netfront' to 'type=vif'
by Chunyan Liu 15 Apr '16

15 Apr '16

According to current xl.cfg docs and xl codes, it uses type=vif instead of type=netfront. Currently after domxml-to-native, libvirt xml model=netfront will be converted to xl type=netfront. This has no problem before, xen codes for a long time just check type=ioemu, if not, set type to _VIF. Since libxl uses parse_nic_config to avoid duplicate codes, it compares 'type=vif' and 'type=ioemu' for valid parameters, others are considered as invalid, thus we have problem with type=netfront in xl config file. #xl create sles12gm-hvm.orig Parsing config from sles12gm-hvm.orig Invalid parameter `type'. Correct the convertion in libvirt, so that it matchs libxl codes and also xl.cfg. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- Since type=netfront config has been used for a very long time, at lease for xm/xend, it has no problem. I'm not sure if we need to split into xenParseXLVif vs xenParseXMVif, and xenFormatXLVif vs xenFormatXMVif for this change? src/xenconfig/xen_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 4dcd484..ae81635 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -944,7 +944,8 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def) VIR_STRDUP(net->model, model) < 0) goto cleanup; - if (!model[0] && type[0] && STREQ(type, "netfront") && + if (!model[0] && type[0] && + (STREQ(type, "netfront") || STREQ(type, "vif")) && VIR_STRDUP(net->model, "netfront") < 0) goto cleanup; @@ -1201,7 +1202,7 @@ xenFormatNet(virConnectPtr conn, virBufferAsprintf(&buf, ",model=%s", net->model); } else { if (net->model != NULL && STREQ(net->model, "netfront")) { - virBufferAddLit(&buf, ",type=netfront"); + virBufferAddLit(&buf, ",type=vif"); } else { if (net->model != NULL) virBufferAsprintf(&buf, ",model=%s", net->model); -- 2.1.4

3 2

[libvirt] [PATCH V2] libxl: use LIBXL_API_VERSION 0x040200
by Jim Fehlig 15 Apr '16

15 Apr '16

To ensure the libvirt libxl driver will build with future versions of Xen where the libxl API may change in incompatible ways, explicitly use LIBXL_API_VERSION 0x040200. The libxl driver does use new libxl APIs that have been added since Xen 4.2, but currently it does not make use of any changes made to existing APIs such as libxl_domain_create_restore or libxl_set_vcpuaffinity. The version can be bumped if/when the libxl driver consumes the changed APIs. Further details can be found in the following discussion thread https://www.redhat.com/archives/libvir-list/2016-April/msg00178.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- configure.ac | 2 ++ src/libxl/libxl_conf.h | 12 ------------ src/libxl/libxl_domain.c | 15 --------------- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index b1500f6..446f2a2 100644 --- a/configure.ac +++ b/configure.ac @@ -894,6 +894,7 @@ if test "$with_libxl" != "no" ; then PKG_CHECK_MODULES([LIBXL], [xenlight], [ LIBXL_FIRMWARE_DIR=`$PKG_CONFIG --variable xenfirmwaredir xenlight` LIBXL_EXECBIN_DIR=`$PKG_CONFIG --variable libexec_bin xenlight` + LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200" with_libxl=yes ], [LIBXL_FOUND=no]) if test "$LIBXL_FOUND" = "no"; then @@ -906,6 +907,7 @@ if test "$with_libxl" != "no" ; then LIBS="$LIBS $LIBXL_LIBS" AC_CHECK_LIB([xenlight], [libxl_ctx_alloc], [ with_libxl=yes + LIBXL_CFLAGS="$LIBXL_CFLAGS -DLIBXL_API_VERSION=0x040200" LIBXL_LIBS="$LIBXL_LIBS -lxenlight" ],[ if test "$with_libxl" = "yes"; then diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 3c0eafb..24e2911 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -69,18 +69,6 @@ # endif -/* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new - * parameter has been added, representative of 'VCPU soft affinity'. If one - * does not care about it (and that's libvirt case), passing NULL is the - * right thing to do. To mark that change, LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY - * is defined. */ -# ifdef LIBXL_HAVE_VCPUINFO_SOFT_AFFINITY -# define libxl_set_vcpuaffinity(ctx, domid, vcpuid, map) \ - libxl_set_vcpuaffinity((ctx), (domid), (vcpuid), (map), NULL) -# define libxl_set_vcpuaffinity_all(ctx, domid, max_vcpus, map) \ - libxl_set_vcpuaffinity_all((ctx), (domid), (max_vcpus), (map), NULL) -# endif - typedef struct _libxlDriverPrivate libxlDriverPrivate; typedef libxlDriverPrivate *libxlDriverPrivatePtr; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 86fb713..14a900c 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1026,9 +1026,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, int managed_save_fd = -1; libxlDomainObjPrivatePtr priv = vm->privateData; libxlDriverConfigPtr cfg; -#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS - libxl_domain_restore_params params; -#endif virHostdevManagerPtr hostdev_mgr = driver->hostdevMgr; libxl_asyncprogress_how aop_console_how; @@ -1118,20 +1115,8 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = libxl_domain_create_new(cfg->ctx, &d_config, &domid, NULL, &aop_console_how); } else { -#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD) - params.checkpointed_stream = 0; - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, - restore_fd, -1, &params, NULL, - &aop_console_how); -#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS) - params.checkpointed_stream = 0; - ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, - restore_fd, &params, NULL, - &aop_console_how); -#else ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, restore_fd, NULL, &aop_console_how); -#endif } virObjectLock(vm); -- 2.6.1

3 3

[libvirt] Regarding PCI/PCIe Multifunction hotplug support in libvirt
by Shivaprasad bhat 15 Apr '16

15 Apr '16

Hi All, I am exploring how to go about supporting multi-function hot-plug/unplug support from libvirt now that Qemu has enabled it. The Qemu semantics is that, qemu queues the notification to guest until function 0 is hot- plugged and on function 0 hot-plug, all the previously added devices in the slot are notified to the guest. For hot-unplug - On x86, unplug of any device in the slot would unplug all the functions of the slot. On PPC, unplug all non-zero functions first, then unplug the function zero which triggers the unplug of all the functions in the slot. On Libvirt, I had a brief chat with Laine Stump on IRC and we "think" the below semantics would be appropriate. 1) Change the virDomainAttachDeviceFlags() to recognize multiple devices in the XML and the application should make one call to attach all the functions for the slot at one time. 2) The libvirt qemu driver to translate this into multiple attach device commands to qemu with the final operation being for function 0. 3) The XML now needs to accept multiple devices and there is a need for single parent element. I am thinking if we should have all devices to be enclosed in <device></device> parent element. Note that this is only when all the devices should go to the same slot. We probably should disallow user attempting to hot-plug to different slots with this. 4) For the hot-unplug, the application to send all the devices the same way enclosed in <device></devices> and libvirt to go ahead with unplug only if all the devices are specified in the XML for the slot. Want to know if you foresee any problem with using <device></device> semantics Or you have any different approach/suggestions. Any comments greatly appreciated. Thanks and Regards, Shivaprasad

2 1

[libvirt] [PATCH v2 0/4] Fix parsing our own XMLs
by Martin Kletzander 15 Apr '16

15 Apr '16

v2: - Just a rebase - I did *not* use virPCIDeviceAddress wording instead as discussed in the v1 thread. That's because we have lot of functions working with virDevicePCIAddress named exactly after that and renaming those would be ugly IMHO. v1: - https://www.redhat.com/archives/libvir-list/2016-April/msg00081.html Martin Kletzander (4): Change virPCIDeviceAddress to virDevicePCIAddress Move capability formatting together schemas: Update nodedev schema to match reality conf: Parse more of our nodedev XML docs/schemas/nodedev.rng | 29 +++--- src/conf/device_conf.h | 11 +-- src/conf/node_device_conf.c | 109 +++++++++++++++++++-- src/conf/node_device_conf.h | 6 +- src/libvirt_private.syms | 10 +- src/network/bridge_driver.c | 4 +- src/node_device/node_device_linux_sysfs.c | 6 +- src/util/virhostdev.c | 12 +-- src/util/virnetdev.c | 4 +- src/util/virnetdev.h | 2 +- src/util/virpci.c | 80 +++++++-------- src/util/virpci.h | 29 +++--- .../pci_0000_00_1c_0_header_type.xml | 2 +- tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml | 23 +++++ .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 29 ++++++ ...i_0000_02_10_7_sriov_pf_vfs_all_header_type.xml | 30 ++++++ .../pci_0000_02_10_7_sriov_vfs.xml | 26 +++++ .../pci_0000_02_10_7_sriov_zero_vfs_max_count.xml | 21 ++++ tests/nodedevxml2xmltest.c | 7 ++ 19 files changed, 335 insertions(+), 105 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml -- 2.8.1

2 8

[libvirt] [PATCH] ploop: Fix build with gluster
by Jiri Denemark 15 Apr '16

15 Apr '16

Recent patches addiing support for ploop volumes did not properly update gluster backend. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as a build-breaker. src/storage/storage_backend_gluster.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index d2e79bc..0085052 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -435,6 +435,7 @@ virStorageBackendGlusterVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, case VIR_STORAGE_VOL_FILE: case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_BLOCK: + case VIR_STORAGE_VOL_PLOOP: case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_NO_SUPPORT, _("removing of '%s' volumes is not supported " -- 2.8.1

1 0

[libvirt] [PATCH v5] Add functions for handling exponential backoff loops.
by Richard W.M. Jones 15 Apr '16

15 Apr '16

v4b -> v5: - Move documentation to .c file. - Change the name of the while function to virTimeBackOffWait. Rich.

3 5

[libvirt] [PATCH v6 0/7] storage:dir: ploop volumes support
by Olga Krishtal 15 Apr '16

15 Apr '16

This series of patches introduces the support of ploop volumes in storage pools (dir, fs, etc). Ploop volume is a disk loopback block device consists of root.hds (it is the image file) and DiskDescriptor.xml: https://openvz.org/Ploop/format. Due to this fact it can't be treated as file or any other volume type, moreover, in order to successfully manipulate with such volume, ploop tools should be installed. All callbacks except the wipeVol are supported. First patch introduces ploop volume type. This is a directory with two files inside. The name of the directory is the name of the volume. Patch 2 deals with creating an empty volume and cloning the existing one. Clone is done via simle cp operation. If any of this operation fails - directory will be deleted. Patch 3 deletes recursively ploop directory. Patch 4 uses ploop tool to resize volume. Patch 6 adapts all refreshing functions to work with ploop. To get information the directory is checked. The volume is treated as the ploops one only if it contains ploop files. Every time the pool is refreshed DiskDescriptor.xml is restored. This is necessary, because the content of the volume may have changed. Upload and download (patch 7) can't be done if the volume contains snapshots. v6: - There is no DiskDescriptor.xml restoring during the refresh pool operation. This operation is moved to storage driver. - fixed issue with regenerating xml for ploop volume with the snapshots. v5: - added ploop volume type - there is no change in opening volume functions. Now reopening takes place is the volume is ploops one. - restore DiskDescriptor.xml every refresh pool - all information, except format is taken from header - forbidden upload and download ops for volume with snapshots - there is no separate function for deleting the volume - fixed identation and leaks v4: - fixed identation issues. - in case of .uploadVol, DiskDescriptor.xml is restored. - added check of ploops'accessibility v3: - no VIR_STORAGE_VOL_PLOOP type any more - adapted all patches according to previous change - fixed comments v2: - fixed memory leak - chenged the return value of all helper functions to 0/-1. Now check for success is smth like that: vir****Ploop() < 0 - fixed some identation issues.

2 16

[libvirt] [PATCH] storage_scsi: Handle physical HBA when deleting vHBA vport.
by Nitesh Konkar 15 Apr '16

15 Apr '16

HBA will get treated as vHBA if not returned after detecting vhba_parent format. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- Before Patch: # virsh pool-destroy poolhba_name error: Failed to destroy pool poolhba_name error: internal error: Invalid adapter name 'pci_000x_0x_00_x' for SCSI pool # virsh nodedev-dumpxml scsi_host2 <device> <name>scsi_host2</name> <path>xxxx</path> <parent>pci_000x_0x_00_x</parent> <capability type='scsi_host'> <host>2</host> ... ... <capability type='vport_ops'> <max_vports>255</max_vports> <vports>0</vports> </capability> </capability> </device> After Patch: # virsh pool-destroy poolhba_name Pool poolhba_name destroyed src/storage/storage_backend_scsi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index e6c8bb5..dd0343f 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -842,6 +842,11 @@ deleteVport(virConnectPtr conn, if (!(vhba_parent = virStoragePoolGetVhbaSCSIHostParent(conn, name))) goto cleanup; + if (STRPREFIX(vhba_parent, "pci")) { + ret = 0; + goto cleanup; + } + if (virGetSCSIHostNumber(vhba_parent, &parent_host) < 0) goto cleanup; } -- 1.8.3.1

2 4

[libvirt] [PATCH 0/4] syntax-check: Minor cleanups
by Andrea Bolognani 15 Apr '16

15 Apr '16

Ran into something confusing while working on something unrelated, ended up making a few tiny cleanups. Cheers. Andrea Bolognani (4): util: Fix 'exempt from syntax-check' comment cfg.mk: Remove spurious whitespace cfg.mk: Use single quotes wherever possible cfg.mk: Always enclose syntax-check error messages in quotes cfg.mk | 36 ++++++++++++++++++------------------ src/util/virutil.c | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) -- 2.5.5

2 13

[libvirt] [PATCH] qemu: Remove redundant DomainObjIsActive check
by Cole Robinson 15 Apr '16

15 Apr '16

We perform the same check several lines earlier --- src/qemu/qemu_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e795062..ced808a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18403,32 +18403,26 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto cleanup; } if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto endjob; - } - qemuDomainObjEnterAgent(vm); ret = qemuAgentArbitraryCommand(priv->agent, cmd, &result, timeout); qemuDomainObjExitAgent(vm); if (ret < 0) VIR_FREE(result); endjob: qemuDomainObjEndJob(driver, vm); cleanup: virDomainObjEndAPI(&vm); return result; } -- 2.7.3

2 3

[libvirt] [PATCH] Return error when --start <number> in cpu-stats is invalid.
by Nitesh Konkar 15 Apr '16

15 Apr '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- # virsh cpu-stats --domain 40 --start 159 CPU159: cpu_time 0.000000000 seconds vcpu_time 0.000000000 seconds # virsh cpu-stats --domain 40 --start 160 Start cpu 160 larger than maximum of 159. tools/virsh-domain.c | 6 ++++++ 1 files changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 800829e..3d6b626 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7357,6 +7357,12 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) /* get number of cpus on the node */ if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, 0)) < 0) goto failed_stats; + + if (cpu >= max_id) { + vshPrint(ctl, "Start cpu %d larger than maximum of %d.", cpu, max_id - 1); + goto cleanup; + } + if (show_count < 0 || show_count > max_id) { if (show_count > max_id) vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); -- 1.8.3.1

2 1

[libvirt] RFC: spec file cleanup ideas
by Cole Robinson 15 Apr '16

15 Apr '16

Hi all, I wanted to float some ideas about cleaning up the RPM spec file. None of it is urgent but I'll end up scratching the itch eventually and I want to make sure people are on board Old distro bits: * Drop support for building on rhel5... this was ACKd previously by eblake: http://www.redhat.com/archives/libvir-list/2015-November/msg00175.html * Drop support for end-of-life Fedora. There's lots of Fedora conditionals going back to Fedora 13. I don't think it's really interesting to try to support building an RPM on a distribution that is no longer receiving updates. But we could be a bit conservative and give a couple release window, dropping support for less than Fedora 20 for example (which went EOL in June 2015) Configuration variables: some of these could still feasibly be 'useful' even if they aren't programmatically set by any distro conditional, but I think unless someone actively uses them we should seek to have as few conditionals as possible, rather than conditionalize everything by default which seems more common. Some ideas: * Drop with_* conditionals that are only used by old Fedora or RHEL5. I didn't audit all of them but the obvious ones are straight forward like: with_systemd_macros, with_polkit, with_capng, with_netcf, with_yajl, with_capng, with_avahi, with_hal/all HAL support * Drop client_only/server_drivers/with_libvirtd ... do these serve any good purpose? (once the rhel5 bits are gone) * Drop with_driver_modules: it's unconditionally enabled and has been since it was introduced Old spec bits cleanup: * drop defattr(), it's long since not needed * drop manual removal of the buildroot, it's long since not needed * use %global consistently instead of %define * consider using %{with/without X} pattern instead of defining variables as with_X * The top of the spec has this block: # If neither fedora nor rhel was defined, try to guess them from dist %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.el$[0-9]\+$.*/%%define rhel \1/p')} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.fc\?$[0-9]\+$.*/%%define fedora \1/p')} %endif Is it actually still relevant? It was added 5 years ago... I don't know in what case rhel or fedora macros won't be defined

4 8

[libvirt] [PATCH] spec: Only pull in API docs with -devel package
by Cole Robinson 15 Apr '16

15 Apr '16

Move some API specific documentation out of -docs package and into -devel, and some end user docs out of -devel and into -docs, then drop the -devel dep on -docs. This is more in line with the suggested Fedora guidelines. https://bugzilla.redhat.com/show_bug.cgi?id=1310155 --- libvirt.spec.in | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8036fa3..500cde9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1197,7 +1197,6 @@ namespaces. Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries Requires: %{name}-client = %{version}-%{release} -Requires: %{name}-docs = %{version}-%{release} Requires: pkgconfig %description devel @@ -1949,14 +1948,10 @@ exit 0 %files docs %defattr(-, root, root) -%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/* +%doc AUTHORS ChangeLog.gz NEWS README TODO +%doc libvirt-docs/* +%doc docs/*.html docs/html docs/*.gif -# API docs -%dir %{_datadir}/gtk-doc/html/libvirt/ -%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp -%doc %{_datadir}/gtk-doc/html/libvirt/*.html -%doc %{_datadir}/gtk-doc/html/libvirt/*.png -%doc %{_datadir}/gtk-doc/html/libvirt/*.css %if %{with_libvirtd} %files daemon @@ -2387,8 +2382,12 @@ exit 0 %{_datadir}/libvirt/api/libvirt-qemu-api.xml %{_datadir}/libvirt/api/libvirt-lxc-api.xml - -%doc docs/*.html docs/html docs/*.gif +# API docs +%dir %{_datadir}/gtk-doc/html/libvirt/ +%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp +%doc %{_datadir}/gtk-doc/html/libvirt/*.html +%doc %{_datadir}/gtk-doc/html/libvirt/*.png +%doc %{_datadir}/gtk-doc/html/libvirt/*.css %doc docs/libvirt-api.xml %doc examples/hellolibvirt %doc examples/object-events -- 2.7.3

2 2

[libvirt] [PATCH] qemu: migration: Drop dead VNC cookie handling
by Cole Robinson 15 Apr '16

15 Apr '16

The only caller of this code is: for (i = 0; i < dom->def->ngraphics; i++) { if (dom->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { if (!(mig->graphics = qemuMigrationCookieGraphicsAlloc(driver, dom->def->graphics[i]))) return -1; mig->flags |= QEMU_MIGRATION_COOKIE_GRAPHICS; break; } } So this is never triggered for VNC, and in fact VNC has no support for seamless migration anyways so that seems correct. Drop the dead VNC handling. --- src/qemu/qemu_migration.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8d2ca3b..ca3619d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -320,33 +320,21 @@ qemuMigrationCookieGraphicsAlloc(virQEMUDriverPtr driver, goto error; mig->type = def->type; - if (mig->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - mig->port = def->data.vnc.port; - listenAddr = virDomainGraphicsListenGetAddress(def, 0); - if (!listenAddr) - listenAddr = cfg->vncListen; + mig->port = def->data.spice.port; + if (cfg->spiceTLS) + mig->tlsPort = def->data.spice.tlsPort; + else + mig->tlsPort = -1; + listenAddr = virDomainGraphicsListenGetAddress(def, 0); + if (!listenAddr) + listenAddr = cfg->spiceListen; #ifdef WITH_GNUTLS - if (cfg->vncTLS && - !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->vncTLSx509certdir))) - goto error; + if (cfg->spiceTLS && + !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->spiceTLSx509certdir))) + goto error; #endif - } else { - mig->port = def->data.spice.port; - if (cfg->spiceTLS) - mig->tlsPort = def->data.spice.tlsPort; - else - mig->tlsPort = -1; - listenAddr = virDomainGraphicsListenGetAddress(def, 0); - if (!listenAddr) - listenAddr = cfg->spiceListen; -#ifdef WITH_GNUTLS - if (cfg->spiceTLS && - !(mig->tlsSubject = qemuDomainExtractTLSSubject(cfg->spiceTLSx509certdir))) - goto error; -#endif - } if (VIR_STRDUP(mig->listen, listenAddr) < 0) goto error; -- 2.7.3

2 2