- Devel - libvirt List Archives

[libvirt] [PATCH glib] Don't set LC_ALL=C during build as that breaks python apps
by Daniel P. Berrange 26 Jul '17

26 Jul '17

Setting LC_ALL=C breaks python apps doing I/O on UTF-8 source files. In particular this broke glib-mkenums GEN libvirt-gconfig-enum-types.h Traceback (most recent call last): File "/usr/bin/glib-mkenums", line 669, in <module> process_file(fname) File "/usr/bin/glib-mkenums", line 406, in process_file line = curfile.readline() File "/usr/lib64/python3.6/encodings/ascii.py", line 26, in decode return codecs.ascii_decode(input, self.errors)[0] UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 849: ordinal not in range(128) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed to fix rawhide build maint.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maint.mk b/maint.mk index 405c6d0..ef72b4f 100644 --- a/maint.mk +++ b/maint.mk @@ -117,8 +117,8 @@ news-check-lines-spec ?= 1,10 news-check-regexp ?= '^\*.* $(VERSION_REGEXP) $$(today)$' # Prevent programs like 'sort' from considering distinct strings to be equal. -# Doing it here saves us from having to set LC_ALL elsewhere in this file. -export LC_ALL = C +# Doing it here saves us from having to set LC_COLLATE elsewhere in this file. +export LC_COLLATE = C ## --------------- ## ## Sanity checks. ## -- 2.13.3

2 2

[libvirt] [PATCH 0/3] Introduce RW locks to virDomainObjList
by Michal Privoznik 26 Jul '17

26 Jul '17

While this is not that critical (hash tables have O(1) time complexity for lookups), it lays down path towards making virDomainObj using RW locks instead of mutexes. Still, in my limited testing this showed slight improvement. Michal Privoznik (3): virthread: Introduce virRWLockInitPreferWriter virobject: Introduce virObjectRWLockable virdomainobjlist: Use virObjectRWLockable src/conf/virdomainobjlist.c | 24 ++++---- src/libvirt_private.syms | 4 ++ src/util/virobject.c | 144 ++++++++++++++++++++++++++++++++++---------- src/util/virobject.h | 16 +++++ src/util/virthread.c | 35 +++++++++++ src/util/virthread.h | 1 + 6 files changed, 180 insertions(+), 44 deletions(-) -- 2.13.0

4 28

[libvirt] [PATCH] qemu: we prefer C89 comment styles over C99
by Pavel Hrdina 26 Jul '17

26 Jul '17

Introduced by commit 'a7bc2c8cfd6f'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dcdbfc9701..5c073027db 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7264,7 +7264,8 @@ qemuDomainPrepareChannel(virDomainChrDefPtr channel, "%s/%s", domainChannelTargetDir, channel->target.name) < 0) return -1; - } else { // Generate a unique name + } else { + /* Generate a unique name */ if (virAsprintf(&channel->source->data.nix.path, "%s/vioser-%02d-%02d-%02d.sock", domainChannelTargetDir, -- 2.13.3

2 1

[libvirt] [PATCH v2] Generate unique socket file
by Scott Garfinkle 25 Jul '17

25 Jul '17

It's possible to have more than one unnamed virtio-serial unix channel. We need to generate a unique name for each channel. Currently, we use ".../unknown.sock" for all of them. Better practice would be to specify an explicit target path name; however, in the absence of that, we need uniqueness in the names we generate internally. Before the changes we'd get /var/lib/libvirt/qemu/channel/target/unknown.sock for each instance of <channel type='unix'> <source mode='bind'/> <target type='virtio'/> </channel> Now, we get vioser-00-00-01.sock, vioser-00-00-02.sock, etc. Changes from v1: new socket name Signed-off-by: Scott Garfinkle <seg(a)us.ibm.com> --- src/qemu/qemu_domain.c | 24 +++++++++++++++------- .../qemuxml2argv-channel-virtio-unix.args | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 78e75f1..7a9958d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7178,18 +7178,28 @@ int qemuDomainPrepareChannel(virDomainChrDefPtr channel, const char *domainChannelTargetDir) { - if (channel->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - channel->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && - !channel->source->data.nix.path) { + if (channel->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO || + channel->source->type != VIR_DOMAIN_CHR_TYPE_UNIX || + channel->source->data.nix.path) + return 0; + + if (channel->target.name) { if (virAsprintf(&channel->source->data.nix.path, "%s/%s", domainChannelTargetDir, - channel->target.name ? channel->target.name - : "unknown.sock") < 0) + channel->target.name) < 0) + return -1; + } else { // Generate a unique name + if (virAsprintf(&channel->source->data.nix.path, + "%s/vioser-%02d-%02d-%02d.sock", + domainChannelTargetDir, + channel->info.addr.vioserial.controller, + channel->info.addr.vioserial.bus, + channel->info.addr.vioserial.port) < 0) return -1; - - channel->source->data.nix.listen = true; } + channel->source->data.nix.listen = true; + return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args index 2b72965..8e0452a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args @@ -29,7 +29,7 @@ path=/tmp/channel/domain--1-QEMUGuest1/org.qemu.guest_agent.0,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,\ id=channel0,name=org.qemu.guest_agent.0 \ -chardev socket,id=charchannel1,\ -path=/tmp/channel/domain--1-QEMUGuest1/unknown.sock,server,nowait \ +path=/tmp/channel/domain--1-QEMUGuest1/vioser-00-00-02.sock,server,nowait \ -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,\ id=channel1 \ -chardev socket,id=charchannel2,path=/tmp/channel/domain--1-QEMUGuest1/ble,\ -- 1.8.3.1

3 2

[libvirt] [PATCH v3] storage: Disallow usage of the HBA for a fc_host backing
by John Ferlan 25 Jul '17

25 Jul '17

Disallow providing the wwnn/wwpn of the HBA in the adapter XML: <adapter type='fc_host' [parent='scsi_hostN'] wwnn='HBA_wwnn' wwpn='HBA_wwpn'/> This should be considered a configuration error since a vHBA would not be created. In order to use the HBA as the backing the following XML should be used: <adapter type='scsi_host' name='scsi_hostN'/> So add a check prior to the checkParent call to validate that the provided wwnn/wwpn resolves to a vHBA and not an HBA. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v2: https://www.redhat.com/archives/libvir-list/2017-July/msg01019.html Changes since v2, from review, simplify logic even more. docs/formatstorage.html.in | 27 +++++++++++++++------------ src/storage/storage_backend_scsi.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 4946ddf..27578e8 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -207,18 +207,21 @@ </dl> <dl> <dt><code>wwnn</code> and <code>wwpn</code></dt> - <dd>The "World Wide Node Name" (<code>wwnn</code>) and "World Wide - Port Name" (<code>wwpn</code>) are used by the "fc_host" adapter - to uniquely identify the device in the Fibre Channel storage fabric - (the device can be either a HBA or vHBA). Both wwnn and wwpn should - be specified. Use the command 'virsh nodedev-dumpxml' to determine - how to set the values for the wwnn/wwpn of a (v)HBA. The wwnn and - wwpn have very specific numerical format requirements based on the - hypervisor being used, thus care should be taken if you decide to - generate your own to follow the standards; otherwise, the pool - will fail to start with an opaque error message indicating failure - to write to the vport_create file during vport create/delete due - to "No such file or directory". + <dd>The required "World Wide Node Name" (<code>wwnn</code>) and + "World Wide Port Name" (<code>wwpn</code>) are used by the + "fc_host" adapter to uniquely identify the vHBA device in the + Fibre Channel storage fabric. If the vHBA device already exists + as a Node Device, then libvirt will use it; otherwise, the vHBA + will be created using the provided values. It is considered a + configuration error use the values from the HBA as those would + be for a "scsi_host" <code>type</code> pool instead. The + <code>wwnn</code> and <code>wwpn</code> have very specific + format requirements based on the hypervisor being used, thus + care should be taken if you decide to generate your own to + follow the standards; otherwise, the pool will fail to start + with an opaque error message indicating failure to write to + the vport_create file during vport create/delete due to + "No such file or directory". <span class="since">Since 1.0.4</span> </dd> </dl> diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index af12889..575e6a6 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -211,6 +211,33 @@ getAdapterName(virStorageAdapterPtr adapter) } +/** + * @name: Name from a wwnn/wwpn lookup + * + * Validate that the @name fetched from the wwnn/wwpn is a vHBA + * and not an HBA as that should be a configuration error. It's only + * possible to use an existing wwnn/wwpn of a vHBA because that's + * what someone would have created using the node device create via XML + * functionality. Using the HBA "just because" it has a wwnn/wwpn and + * the characteristics of a vHBA is just not valid + * + * Returns true if the @name is OK, false on error + */ +static bool +checkName(const char *name) +{ + unsigned int host_num; + + if (virSCSIHostGetNumber(name, &host_num) && + virVHBAIsVportCapable(NULL, host_num)) + return true; + + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the wwnn/wwpn for '%s' are assigned to an HBA"), name); + return false; +} + + /* * Using the host# name found via wwnn/wwpn lookup in the fc_host * sysfs tree to get the parent 'scsi_host#' to ensure it matches. @@ -288,6 +315,9 @@ createVport(virConnectPtr conn, * this pool and we don't have to create the vHBA */ if ((name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + if (!(checkName(name))) + goto cleanup; + /* If a parent was provided, let's make sure the 'name' we've * retrieved has the same parent. If not this will cause failure. */ if (!fchost->parent || checkParent(conn, name, fchost->parent)) -- 2.9.4

2 1

[libvirt] [PATCH v2] storage: Disallow usage of the HBA for a fc_host backing
by John Ferlan 25 Jul '17

25 Jul '17

Disallow providing the wwnn/wwpn of the HBA in the adapter XML: <adapter type='fc_host' [parent='scsi_hostN'] wwnn='HBA_wwnn' wwpn='HBA_wwpn'/> This should be considered a configuration error since a vHBA would not be created. In order to use the HBA as the backing the following XML should be used: <adapter type='scsi_host' name='scsi_hostN'/> So add a check prior to the checkParent call to validate that the provided wwnn/wwpn resolves to a vHBA and not an HBA. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This used to be patch 4 of the series: https://www.redhat.com/archives/libvir-list/2017-July/msg00837.html which while the series was in it's 3rd review cycle, this particular patch was new to the series and thus becomes a v2 since the three other patches from the series were pushed. docs/formatstorage.html.in | 27 +++++++++-------- src/storage/storage_backend_scsi.c | 62 +++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 20 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 4946ddf..27578e8 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -207,18 +207,21 @@ </dl> <dl> <dt><code>wwnn</code> and <code>wwpn</code></dt> - <dd>The "World Wide Node Name" (<code>wwnn</code>) and "World Wide - Port Name" (<code>wwpn</code>) are used by the "fc_host" adapter - to uniquely identify the device in the Fibre Channel storage fabric - (the device can be either a HBA or vHBA). Both wwnn and wwpn should - be specified. Use the command 'virsh nodedev-dumpxml' to determine - how to set the values for the wwnn/wwpn of a (v)HBA. The wwnn and - wwpn have very specific numerical format requirements based on the - hypervisor being used, thus care should be taken if you decide to - generate your own to follow the standards; otherwise, the pool - will fail to start with an opaque error message indicating failure - to write to the vport_create file during vport create/delete due - to "No such file or directory". + <dd>The required "World Wide Node Name" (<code>wwnn</code>) and + "World Wide Port Name" (<code>wwpn</code>) are used by the + "fc_host" adapter to uniquely identify the vHBA device in the + Fibre Channel storage fabric. If the vHBA device already exists + as a Node Device, then libvirt will use it; otherwise, the vHBA + will be created using the provided values. It is considered a + configuration error use the values from the HBA as those would + be for a "scsi_host" <code>type</code> pool instead. The + <code>wwnn</code> and <code>wwpn</code> have very specific + format requirements based on the hypervisor being used, thus + care should be taken if you decide to generate your own to + follow the standards; otherwise, the pool will fail to start + with an opaque error message indicating failure to write to + the vport_create file during vport create/delete due to + "No such file or directory". <span class="since">Since 1.0.4</span> </dd> </dl> diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index af12889..8892822 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -211,21 +211,66 @@ getAdapterName(virStorageAdapterPtr adapter) } +/** + * @name: Name from a wwnn/wwpn lookup + * + * Validate that the @name fetched from the wwnn/wwpn is a vHBA and not + * an HBA as that should be a configuration error. It's only possible to + * use an existing wwnn/wwpn of a vHBA because that's what someone would + * have created using the node device create functionality. Using the + * HBA "just because" it has a wwnn/wwpn and the characteristics of a + * vHBA is just not valid + * + * Returns the @scsi_host_name to be used or NULL on errror + */ +static char * +checkName(const char *name) +{ + char *scsi_host_name = NULL; + unsigned int host_num; + + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + return NULL; + + if (virSCSIHostGetNumber(scsi_host_name, &host_num) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("host name '%s' is not properly formatted"), + name); + goto error; + } + + /* If scsi_host_name is vport capable, then it's an HBA. This is + * a configuration error as the wwnn/wwpn should only be for a vHBA */ + if (virVHBAIsVportCapable(NULL, host_num)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("the wwnn/wwpn for '%s' are assigned to an HBA"), + scsi_host_name); + goto error; + } + + return scsi_host_name; + + error: + VIR_FREE(scsi_host_name); + return NULL; +} + + /* * Using the host# name found via wwnn/wwpn lookup in the fc_host * sysfs tree to get the parent 'scsi_host#' to ensure it matches. */ static bool checkParent(virConnectPtr conn, - const char *name, + const char *scsi_host_name, const char *parent_name) { unsigned int host_num; - char *scsi_host_name = NULL; char *vhba_parent = NULL; bool retval = false; - VIR_DEBUG("conn=%p, name=%s, parent_name=%s", conn, name, parent_name); + VIR_DEBUG("conn=%p, scsi_host_name=%s, parent_name=%s", + conn, scsi_host_name, parent_name); /* autostarted pool - assume we're OK */ if (!conn) @@ -245,9 +290,6 @@ checkParent(virConnectPtr conn, goto cleanup; } - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; @@ -255,7 +297,7 @@ checkParent(virConnectPtr conn, virReportError(VIR_ERR_XML_ERROR, _("Parent attribute '%s' does not match parent '%s' " "determined for the '%s' wwnn/wwpn lookup."), - parent_name, vhba_parent, name); + parent_name, vhba_parent, scsi_host_name); goto cleanup; } @@ -263,7 +305,6 @@ checkParent(virConnectPtr conn, cleanup: VIR_FREE(vhba_parent); - VIR_FREE(scsi_host_name); return retval; } @@ -275,6 +316,7 @@ createVport(virConnectPtr conn, virStorageAdapterFCHostPtr fchost) { char *name = NULL; + char *scsi_host_name = NULL; virStoragePoolFCRefreshInfoPtr cbdata = NULL; virThread thread; int ret = -1; @@ -288,6 +330,9 @@ createVport(virConnectPtr conn, * this pool and we don't have to create the vHBA */ if ((name = virVHBAGetHostByWWN(NULL, fchost->wwnn, fchost->wwpn))) { + if (!(scsi_host_name = checkName(name))) + goto cleanup; + /* If a parent was provided, let's make sure the 'name' we've * retrieved has the same parent. If not this will cause failure. */ if (!fchost->parent || checkParent(conn, name, fchost->parent)) @@ -333,6 +378,7 @@ createVport(virConnectPtr conn, cleanup: VIR_FREE(name); + VIR_FREE(scsi_host_name); return ret; } -- 2.9.4

2 5

[libvirt] [PATCH 0/4] Clean up machineName-related code
by Martin Kletzander 25 Jul '17

25 Jul '17

Just in case we'll want to use the "cleaned-up" machineName for anything else in the future, I decided to modify the code so that it is always generated, saved and cleaned-up. While doing that I identified some code duplication, leak and a TODO/XXX comment that are all fixed with this series. And it only adds four lines overall! Martin Kletzander (4): conf: Pass config.priv to xmlopt->privateData.alloc qemu: Save qemu driver in qemuDomainObjPrivateData lxc: Make lxcProcessStop callable even without PID being available Move machineName generation from virsystemd into domain_conf src/bhyve/bhyve_domain.c | 2 +- src/conf/domain_conf.c | 65 +++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 7 ++++- src/libvirt_private.syms | 2 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_cgroup.c | 5 +--- src/lxc/lxc_domain.c | 21 ++++++++++++++- src/lxc/lxc_domain.h | 3 +++ src/lxc/lxc_process.c | 57 +++++++++++----------------------------- src/qemu/qemu_cgroup.c | 24 ++++------------- src/qemu/qemu_domain.c | 24 ++++++++++++++++- src/qemu/qemu_domain.h | 5 ++++ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 11 +++++--- src/uml/uml_driver.c | 2 +- src/util/vircgroup.c | 15 ++++------- src/util/vircgroup.h | 14 +++++----- src/util/virsystemd.c | 62 ------------------------------------------- src/util/virsystemd.h | 5 ---- src/vmware/vmware_driver.c | 2 +- src/vz/vz_utils.c | 2 +- tests/virsystemdtest.c | 4 +-- 22 files changed, 170 insertions(+), 166 deletions(-) -- 2.13.3

2 9

[libvirt] [PATCH v3 0/3] More virsecretobj changes to prepare for common object
by John Ferlan 25 Jul '17

25 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-July/msg00520.html Changes in v3: Former patch 1, dropped Former patch 2, pushed Former patch 3, adjusted: -> Use @objDef instead of @objdef -> Handle the if (backup) leak shown during review Former patch 4, split -> Patch 3 handles the virsecretobj call to virSecretObjListRemove -> Patch 4 handles the secret_driver calls to virSecretObjListRemove John Ferlan (3): secret: Properly handle @def after virSecretObjAdd in driver secret: Fix memory leak in virSecretLoad secret: Handle object list removal and deletion properly src/conf/virsecretobj.c | 14 ++++++-------- src/secret/secret_driver.c | 31 ++++++++++++++++++------------- 2 files changed, 24 insertions(+), 21 deletions(-) -- 2.9.4

2 4

[libvirt] [PATCH v2 0/4] More virsecretobj changes to prepare for common object
by John Ferlan 25 Jul '17

25 Jul '17

v1: https://www.redhat.com/archives/libvir-list/2017-June/msg00168.html but review was done more recently in 2017-July... Changes since v1... ... Pushed v1 patches 1-3 since they were ACK'd ... Altered old patch 4, new patch 1 to use if/else processing ... Altered old patch 5, new patch 2 to account for merge conflict (old patch 5 was ACK'd) ... Dropped old patch 6 ... Altered old patch 7, new patch 3 to use VIR_STEAL_PTR and updated the commit message to also describe the @def usage problem ... Altered old patch 8, new patch 4 to change the commit message to have more details John Ferlan (4): secret: Clean up virSecretObjListAdd processing secret: Remove need for local configFile and base64File in ObjectAdd secret: Properly handle @def after virSecretObjAdd in driver secret: Handle object list removal and deletion properly src/conf/virsecretobj.c | 53 ++++++++++++++++++++-------------------------- src/secret/secret_driver.c | 28 ++++++++++++++---------- 2 files changed, 40 insertions(+), 41 deletions(-) -- 2.9.4

2 15

[libvirt] [PATCH] Revert "virthread: Introduce virRWLockInitPreferWriter"
by Michal Privoznik 25 Jul '17

25 Jul '17

This reverts commit 328bd24443d2a345a5832ee48ebba0208f8036ea. As it turns out, this is not portable and very Linux & glibc specific. Worse, this may lead to not starving writers on Linux but everywhere else. Revert this and if the starvation occurs resolve it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 - src/util/virobject.c | 2 +- src/util/virthread.c | 35 ----------------------------------- src/util/virthread.h | 1 - 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3cc6f4c6e..d98417678 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2733,7 +2733,6 @@ virMutexUnlock; virOnce; virRWLockDestroy; virRWLockInit; -virRWLockInitPreferWriter; virRWLockRead; virRWLockUnlock; virRWLockWrite; diff --git a/src/util/virobject.c b/src/util/virobject.c index 4236abfef..b1bb378b4 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -275,7 +275,7 @@ virObjectRWLockableNew(virClassPtr klass) if (!(obj = virObjectNew(klass))) return NULL; - if (virRWLockInitPreferWriter(&obj->lock) < 0) { + if (virRWLockInit(&obj->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to initialize RW lock")); virObjectUnref(obj); diff --git a/src/util/virthread.c b/src/util/virthread.c index a8dd72f8b..6c495158f 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -95,15 +95,6 @@ void virMutexUnlock(virMutexPtr m) } -/** - * virRWLockInit: - * @m: rwlock to init - * - * Initializes RW lock using pthread default attributes (which - * is PTHREAD_RWLOCK_PREFER_READER_NP). - * - * Returns 0 on success, -1 otherwise. - */ int virRWLockInit(virRWLockPtr m) { int ret; @@ -115,32 +106,6 @@ int virRWLockInit(virRWLockPtr m) return 0; } - -/** - * virRWLockInitPreferWriter: - * @m: rwlock to init - * - * Initializes RW lock which prefers writers over readers. - * - * Returns 0 on success, -1 otherwise. - */ -int virRWLockInitPreferWriter(virRWLockPtr m) -{ - int ret; - pthread_rwlockattr_t attr; - - pthread_rwlockattr_init(&attr); - pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); - ret = pthread_rwlock_init(&m->lock, &attr); - pthread_rwlockattr_destroy(&attr); - if (ret != 0) { - errno = ret; - return -1; - } - return 0; -} - - void virRWLockDestroy(virRWLockPtr m) { pthread_rwlock_destroy(&m->lock); diff --git a/src/util/virthread.h b/src/util/virthread.h index 18b785af2..e466d9bf0 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -136,7 +136,6 @@ void virMutexUnlock(virMutexPtr m); int virRWLockInit(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK; -int virRWLockInitPreferWriter(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK; void virRWLockDestroy(virRWLockPtr m); void virRWLockRead(virRWLockPtr m); -- 2.13.0

2 1

[libvirt] [PATCH] Generate unique virtio-serial socket file names
by seg＠us.ibm.com 25 Jul '17

25 Jul '17

It's possible to have more than one unix channel with type=virtio-serial. We need to generate a unique name for each channel. Currently, we use "unknown.sock" for all of them. Signed-off-by: Scott Garfinkle <seg(a)us.ibm.com>

2 2

[libvirt] [PATCH] qemu: fix migration fail of an auto-placement vm after attached memory to it
by Yi Wang 24 Jul '17

24 Jul '17

This patch fix this condition: -vm has the "auto" placement in vcpu -hot-plug memory with source node "1-3" through attach-device command -migrate the vm to a host with only 2 numa node And the migration will fail with error: "error: unsupported configuration: NUMA node 2 is unavailable" Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/qemu_process.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b708be..dcc564c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5259,6 +5259,16 @@ qemuProcessPrepareDomain(virConnectPtr conn, goto cleanup; } + VIR_DEBUG("Updating memory source nodes"); + for (i = 0; i < vm->def->nmems; i++) { + virDomainMemoryDefPtr mem = vm->def->mems[i]; + if (priv->autoNodeset && mem && mem->sourceNodes) { + virBitmapFree(mem->sourceNodes); + if (!(mem->sourceNodes = virBitmapNewCopy(priv->autoNodeset))) + goto cleanup; + } + } + /* Whether we should use virtlogd as stdio handler for character * devices source backend. */ if (cfg->stdioLogD && -- 1.8.3.1

4 4

[libvirt] [PATCH v3 0/4] Fix a couple issues found w/ vHBA logic
by John Ferlan 24 Jul '17

24 Jul '17

v2: https://www.redhat.com/archives/libvir-list/2017-July/msg00661.html Changes since v2: * Patch 1 - make the requested logic adjustment * Patch 2 - no change * Patch 3 - make this *just* the check that the provided @parent_name is a valid fc_host (whether it's vHBA or HBA). * Patch 4 - Alter the checkParent logic to cause a failure if the passed @name (from the wwnn/wwpn's provided) are for an HBA instead of a vHBA. Make this an invalid configuration. Modify the docs to describe that the provided wwnn/wwpn must be for an existing vHBA, are to be used to create a vHBA, but cannot be from an existing HBA. NB: No change to the Destroy code since it's possible one of these exists and there needs to be a way to shut it down. The failure could turn into a "conversion" of sorts as well by changing the type to 'scsi_host', saving the generated scsi_host name, removing the parent and wwnn & wwpn fields. Tested using my vHBA system with various valid and invalid configurations. John Ferlan (4): storage: Fix existing parent check for vHBA creation storage: Remove @conn from virNodeDeviceCreateVport storage: Check if provided parent is vHBA capable storage: Disallow usage of the HBA for a fc_host backing docs/formatstorage.html.in | 27 ++++++----- src/conf/node_device_conf.c | 63 ++----------------------- src/conf/node_device_conf.h | 3 +- src/storage/storage_backend_scsi.c | 94 +++++++++++++++++++++++++++++++++++++- 4 files changed, 112 insertions(+), 75 deletions(-) -- 2.9.4

2 7

[libvirt] [PATCH v2 0/2] Fix backwards migration of pSeries guests
by Andrea Bolognani 24 Jul '17

24 Jul '17

Changes from [v1]: * don't hide the controller model check inside a function and propely explain the reason not to format it; * rename a confusingly named function. [v1] https://www.redhat.com/archives/libvir-list/2017-July/msg00705.html Andrea Bolognani (2): conf: Fix backwards migration of pSeries guests conf: Rename virDomainControllerIsPCIHostBridge() to IsPSeriesPHB() src/conf/domain_conf.c | 29 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- 6 files changed, 31 insertions(+), 8 deletions(-) -- 2.7.5

2 4

[libvirt] [PATCH v2 0/3] implement migrate-getmaxdowntime command
by seg＠us.ibm.com 24 Jul '17

24 Jul '17

Currently, the maximum tolerable downtime for a domain being migrated is write-only. This patch implements a way to query that value nondestructively. Changes from [v1]: * Fixed formatting and style problems * Add additional JSON error check * Better patch submission mail, I hope [v1} https://www.redhat.com/archives/libvir-list/2017-July/msg00908.html Scott Garfinkle (3): migrate-getmaxdowntime command qemu side migrate-getmaxdowntime public symbols and table indices migrate-getmaxdowntime local/libvirt enablement src/qemu/qemu_driver.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 40 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 3 +++ src/libvirt_public.syms | 4 ++++ src/remote/remote_protocol.x | 16 +++++++++++++++- src/remote_protocol-structs | 8 ++++++++ include/libvirt/libvirt-domain.h | 4 ++++ src/driver-hypervisor.h | 6 ++++++ src/libvirt-domain.c | 45 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 12 +++++++++++ src/remote/remote_driver.c | 1 + tools/virsh-domain.c | 46 ++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 18 ++++++++++++++++ 14 files changed, 240 insertions(+), 1 deletion(-)

2 4

[libvirt] [PATCH v6 0/4] Make virNodeDeviceObj and virNodeDeviceObjList private
by John Ferlan 24 Jul '17

24 Jul '17

NB: Like v5, keeping same title for consistency v5: https://www.redhat.com/archives/libvir-list/2017-July/msg00610.html Changes since v5: * Replace patch 1 w/ the aha moment from review. The deletion API's don't need to use virNodeDeviceObjListGetParentHost. Instead they can just use virNodeDeviceObjListFindByName as the parent_wwnn/wwpn and parent_fabric_wwn are not stored in the vHBA. They're merely for the purpose of creation. The vHBA *does* store the def->parent by name and we can use that instead * Add patch 2 in order to remove the CREATE_DEVICE boolean from virNodeDeviceObjListGetParentHost as it won't be necessary since the only consumers are now CreateXML callers * Modify patch 3 calls to virHashSearch to add a NULL parameter since commit '38e516a52' added this (a real buzzkill for other changes too) * Modify patch 4 to include removing the locks in Nodedev calls for test_driver as well. John Ferlan (4): nodedev: Alter node device deletion logic nodedev: Remove @create from virNodeDeviceObjListGetParentHost nodedev: Convert virNodeDeviceObjListPtr to use hash tables nodedev: Remove driver locks around object list mgmt code src/conf/virnodedeviceobj.c | 580 ++++++++++++++++++++++++----------- src/conf/virnodedeviceobj.h | 3 +- src/node_device/node_device_driver.c | 90 ++---- src/node_device/node_device_hal.c | 16 +- src/node_device/node_device_udev.c | 13 +- src/test/test_driver.c | 53 ++-- 6 files changed, 459 insertions(+), 296 deletions(-) -- 2.9.4

2 10

[libvirt] [PATCH RESEND] qemu: Remove inactive vm when failed to start it
by Yi Wang 24 Jul '17

24 Jul '17

Libvirt forgets to remove inactive vm when failed to start a defined vm. That may result in residual domain in driver->domains on such condition: during the process of starting a vm, undefine it, and qemu exit because of some exception. As we undefined the vm successfully, the vm->persistent was set to 0, we will always fail to undefine it until restart libvirtd. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cdb727b..af8afab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7185,6 +7185,8 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) endjob: qemuProcessEndJob(driver, vm); + if (ret < 0) + qemuDomainRemoveInactive(driver, vm); cleanup: virDomainObjEndAPI(&vm); -- 1.8.3.1

3 6

[libvirt] [PATCH] testutils: Remove unneeded variable
by Martin Kletzander 24 Jul '17

24 Jul '17

virDomainXMLOptionNew() gladly accepts NULL and it is used in some drivers. There is no need for additional variable with no members set Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. tests/testutils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index f45596997d6d..ed01136a07c1 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1130,13 +1130,11 @@ virCapsPtr virTestGenericCapsInit(void) static virDomainDefParserConfig virTestGenericDomainDefParserConfig = { .features = VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS, }; -static virDomainXMLPrivateDataCallbacks virTestGenericPrivateDataCallbacks; virDomainXMLOptionPtr virTestGenericDomainXMLConfInit(void) { return virDomainXMLOptionNew(&virTestGenericDomainDefParserConfig, - &virTestGenericPrivateDataCallbacks, - NULL, NULL, NULL); + NULL, NULL, NULL, NULL); } -- 2.13.3

1 0

[libvirt] [PATCH] qemu_capabilities: Fix the formatting with a space
by Shivaprasad G Bhat 24 Jul '17

24 Jul '17

It was observed while adding new property that there should be a space before closing a curly brace in intel-iommu object property definition. Fixing it as a separate patch. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5fb6fd4..3f2c089 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1908,7 +1908,7 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { -1 }, { "intel-iommu", virQEMUCapsObjectPropsIntelIOMMU, ARRAY_CARDINALITY(virQEMUCapsObjectPropsIntelIOMMU), - QEMU_CAPS_DEVICE_INTEL_IOMMU}, + QEMU_CAPS_DEVICE_INTEL_IOMMU }, { "spapr-pci-host-bridge", virQEMUCapsObjectPropsSpaprPCIHostBridge, ARRAY_CARDINALITY(virQEMUCapsObjectPropsSpaprPCIHostBridge), QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE },

2 1

[libvirt] [PATCH] storage: Fix editing mistake in storagePoolSetAutostart
by John Ferlan 24 Jul '17

24 Jul '17

Commit id '905f1024b' had a rogue editing mistake that inadvertently dropped a goto cleanup in storagePoolSetAutostart, but Coverity noted it. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NB: Pushed as trivial the other day, but forgot to send the email to the list on it. src/storage/storage_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index df563f1..e616ae0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1280,6 +1280,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool, if (!obj->configFile) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("pool has no config file")); + goto cleanup; } autostart = (autostart != 0); -- 2.9.4

1 0

[libvirt] [PATCH] rpc : fix a access for null pointer
by Peng Hao 24 Jul '17

24 Jul '17

virNetSocketRemoveIOCallback get sock's ObjectLock and will call virNetSocketEventFree. virNetSocketEventFree may be free sock object and virNetSocketRemoveIOCallback will access a null pointer in release sock's ObjectLock. Signed-off-by: Liu Yun <liu.yunh(a)zte.com.cn> Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> --- src/rpc/virnetsocket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d228c8a..8b550e8 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -2140,14 +2140,12 @@ static void virNetSocketEventFree(void *opaque) virFreeCallback ff; void *eopaque; - virObjectLock(sock); ff = sock->ff; eopaque = sock->opaque; sock->func = NULL; sock->ff = NULL; sock->opaque = NULL; - virObjectUnlock(sock); - + if (ff) ff(eopaque); @@ -2207,6 +2205,7 @@ void virNetSocketUpdateIOCallback(virNetSocketPtr sock, void virNetSocketRemoveIOCallback(virNetSocketPtr sock) { + virObjectRef(sock); virObjectLock(sock); if (sock->watch < 0) { @@ -2220,6 +2219,7 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock) sock->watch = -1; virObjectUnlock(sock); + virObjectRef(sock); } void virNetSocketClose(virNetSocketPtr sock) -- 1.8.3.1

3 5

[libvirt] [PATCH] conf: Fix backwards migration of pSeries guests
by Andrea Bolognani 24 Jul '17

24 Jul '17

Recent commits made it so that pci-root controllers for pSeries guests are automatically assigned the spapr-pci-host-bridge model name; however, that prevents guests to migrate to older versions of libvirt which don't know about that model name at all, which at the moment is all of them :) To avoid the issue, just strip the model name from PHBs when formatting the migratable XML; guests that use more than one PHB are not going to be migratable anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9320794..21bd7c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21919,7 +21919,20 @@ virDomainControllerDefFormat(virBufferPtr buf, } if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { - if (def->opts.pciopts.modelName != VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) { + bool formatModelName = true; + + if (def->opts.pciopts.modelName == VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) + formatModelName = false; + + /* Don't format the model name for PHBs when migrating so that + * guests that only use the default one can be migrated to older + * libvirt version which don't know about PHBs at all */ + if (virDomainControllerIsPCIHostBridge(def) && + flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) { + formatModelName = false; + } + + if (formatModelName) { modelName = virDomainControllerPCIModelNameTypeToString(def->opts.pciopts.modelName); if (!modelName) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.7.5

2 7

[libvirt] [PATCH 0/2] docs: Fix enum documentation
by Michal Privoznik 24 Jul '17

24 Jul '17

So this patch sent to the list got me roll up my sleeves and get working: https://www.redhat.com/archives/libvir-list/2017-July/msg00835.html It wasn't that bad after all. Michal Privoznik (2): apibuild.py: Handle enum comments properly docs: Span cells if there's not doc text for enum val docs/apibuild.py | 8 +++++++- docs/newapi.xsl | 25 +++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) -- 2.13.0

3 6

[libvirt] An API to copy files.
by Julio Faracco 24 Jul '17

24 Jul '17

Hi guys, Unfortunately, my company does not allow access to IRC. I need to ask question by email. Why doesn't libvirt have any method to copy files? A kind of virFileCopy(src, dst) for example. Libvirt has a lots of helper functions but it does not have a specific method to copy a file. There is a similar method inside openvz_conf.c. But I don't see any method inside virfile.c -- Julio Cesar Faracco

3 2

[libvirt] [PATCH v2 0/6] Convert port to unsigned integer
by Peter Krempa 24 Jul '17

24 Jul '17

Since Michal did not want to finis this I did. I also found a few bugs in my previous patches which are addressed here. Peter Krempa (6): qemu: command: Rename and move qemuNetworkDriveGetPort util: uri: Convert port number to unsigned integer qemu: command: Remove condition to use default sheepdog port util: storage: fill in default ports when parsing backing chain conf: domain: Split up virDomainStorageHostParse and rename it virStorageNetHostDef: Turn @port into integer src/conf/domain_conf.c | 133 +++++++++++++++++++--------------- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_block.c | 7 +- src/qemu/qemu_command.c | 30 ++------ src/qemu/qemu_parse_command.c | 13 ++-- src/storage/storage_backend_gluster.c | 17 +---- src/storage/storage_driver.c | 7 +- src/util/virstoragefile.c | 68 +++++++---------- src/util/virstoragefile.h | 4 +- src/util/virstring.c | 37 ++++++++++ src/util/virstring.h | 4 + src/util/viruri.h | 2 +- src/xenconfig/xen_xl.c | 2 +- tests/virstoragetest.c | 14 ++-- 15 files changed, 182 insertions(+), 159 deletions(-) -- 2.13.2

3 9