- Devel - libvirt List Archives

[libvirt] [PATCH] network: remove stale function
by Laine Stump 10 Jan '19

10 Jan '19

networkMigrateStateFiles was added nearly 5 years ago when the network state directory was moved from /var/lib/libvirt to /var/run/libvirt just prior to libvirt-1.2.4). It was only required to maintain proper state information for networks that were active during an upgrade that didn't involve rebooting the host. At this point the likelyhood of anyone upgrading their libvirt from pre-1.2.4 directly to 5.0.0 or later *without rebooting the host* is probably so close to 0 that no properly informed bookie would take *any* odds on it happening, so it seems appropriate to remove this pointless code. Signed-off-by: Laine Stump <laine(a)laine.org> --- src/network/bridge_driver.c | 92 ------------------------------------- 1 file changed, 92 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index aed80c04d5..8a16e50feb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -559,92 +559,6 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, #endif -static int -networkMigrateStateFiles(virNetworkDriverStatePtr driver) -{ - /* Due to a change in location of network state xml beginning in - * libvirt 1.2.4 (from /var/lib/libvirt/network to - * /var/run/libvirt/network), we must check for state files in two - * locations. Anything found in the old location must be written - * to the new location, then erased from the old location. (Note - * that we read/write the file rather than calling rename() - * because the old and new state directories are likely in - * different filesystems). - */ - int ret = -1; - const char *oldStateDir = LOCALSTATEDIR "/lib/libvirt/network"; - DIR *dir; - int direrr; - struct dirent *entry; - char *oldPath = NULL, *newPath = NULL; - char *contents = NULL; - int rc; - - if ((rc = virDirOpenIfExists(&dir, oldStateDir)) <= 0) - return rc; - - if (virFileMakePath(driver->stateDir) < 0) { - virReportSystemError(errno, _("cannot create directory %s"), - driver->stateDir); - goto cleanup; - } - - while ((direrr = virDirRead(dir, &entry, oldStateDir)) > 0) { - if (entry->d_type != DT_UNKNOWN && - entry->d_type != DT_REG) - continue; - - if (virAsprintf(&oldPath, "%s/%s", - oldStateDir, entry->d_name) < 0) - goto cleanup; - - if (entry->d_type == DT_UNKNOWN) { - struct stat st; - - if (lstat(oldPath, &st) < 0) { - virReportSystemError(errno, - _("failed to stat network status file '%s'"), - oldPath); - goto cleanup; - } - - if (!S_ISREG(st.st_mode)) { - VIR_FREE(oldPath); - continue; - } - } - - if (virFileReadAll(oldPath, 1024*1024, &contents) < 0) - goto cleanup; - - if (virAsprintf(&newPath, "%s/%s", - driver->stateDir, entry->d_name) < 0) - goto cleanup; - if (virFileWriteStr(newPath, contents, S_IRUSR | S_IWUSR) < 0) { - virReportSystemError(errno, - _("failed to write network status file '%s'"), - newPath); - goto cleanup; - } - - unlink(oldPath); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - } - if (direrr < 0) - goto cleanup; - - ret = 0; - cleanup: - VIR_DIR_CLOSE(dir); - VIR_FREE(oldPath); - VIR_FREE(newPath); - VIR_FREE(contents); - return ret; -} - - /** * networkStateInitialize: * @@ -691,12 +605,6 @@ networkStateInitialize(bool privileged, LOCALSTATEDIR "/lib/libvirt/radvd") < 0) goto error; - /* migration from old to new location is only applicable for - * privileged mode - unprivileged mode directories haven't - * changed location. - */ - if (networkMigrateStateFiles(network_driver) < 0) - goto error; } else { configdir = virGetUserConfigDirectory(); rundir = virGetUserRuntimeDirectory(); -- 2.20.1

2 1

[libvirt] [PATCH v2 0/6] Allow adding mountOpts to the storage pool mount command
by John Ferlan 09 Jan '19

09 Jan '19

v1: https://www.redhat.com/archives/libvir-list/2018-December/msg00558.html Kept the subject the same, but the concept has been adjusted to follow issues pointed out by jtomko vis-a-vis allowing arbitrary options via XML. This series adds both the NFS and the RBD adjustments that were essentially in the referenced series from review. Changes since v1: * Patch 1: (NEW) Implements a bare-bones infrastructure for storage pool XML namespace. Could be split again, but separately the patches were too small IMO. * Patch 2: (NEW) Implementation of providing XML Namespace functions. The details of the operation are in the subsequent patch. I could combine 2 and 3, but perhaps it's easier to review separated. * Patch 3: (REWORK) Rework the previous series patch1 in order to utilize the Storage Pool XML Namespace. Adjust the description of the configuration and modify the storagepoolxml2xmltest appropriately. * Patch 4: (REWORK) Utilize the XML Namespace data to generate the command line which doesn't change since v1. * Patch 5: (REWORK) Rework the virsh code in order to generate the proper syntax to utilize Storage Pool XML Namespaces. * Patch 6: (NEW) Well, new as in this series, but it's essentially a rework of what was posted in the series jtomko referenced. The code will "prove" (to a degree) that the concept can work for multiple pool types. The "downside" is that there's no (easy) way that I could find to generate output to show the commands are executed. John Ferlan (6): conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool mount options to command line virsh: Add source-mount-opts for pool commands rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 87 ++++++++++ docs/schemas/storagepool.rng | 43 +++++ src/conf/storage_conf.c | 51 +++++- src/conf/storage_conf.h | 24 +++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 127 ++++++++++++++ src/storage/storage_backend_rbd.c | 159 +++++++++++++++++- src/storage/storage_util.c | 36 ++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-mountopts.argv | 1 + tests/storagepoolxml2argvtest.c | 4 + .../pool-netfs-mountopts.xml | 24 +++ .../pool-rbd-configopts.xml | 17 ++ .../pool-netfs-mountopts.xml | 24 +++ .../pool-rbd-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 7 + tools/virsh-pool.c | 39 ++++- tools/virsh.pod | 5 + 19 files changed, 680 insertions(+), 7 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-configopts.xml -- 2.20.1

3 20

[libvirt] [PATCH 0/4] util: Fixing libvirt errors on cavium/thunder-nicvf
by Radoslaw Biernacki 09 Jan '19

09 Jan '19

ThunderX is Cavium SoC. This platform contain SRIOV NIC. Unlike other commonly known network devices it does not have VF functionality duplicated in its PF. PF is purely management device (on HW level). This creates several problems with existing libvirt code as in many places libvirt assumes that each VF netdev has PF netdev assigned. This patch series trying to address issues which can be easily fixed. (mostly bug fixes found while working on full featured solution) First patch in series is most important as it allows to unblock the netdev detection and use <hostdev> on this platform. More details about those issues can be found at: https://bugs.linaro.org/show_bug.cgi?id=3778 https://bugs.launchpad.net/charm-nova-compute/+bug/1771662 Radoslaw Biernacki (4): util: fixing wrong assumption that PF has to have netdev assigned util: Code simplification util: Fix for NULL dereference util: Fixing invalid error checking from virPCIGetNetname() src/qemu/qemu_domain_address.c | 11 ++--- src/util/virhostdev.c | 2 +- src/util/virnetdev.c | 50 ++++---------------- 3 files changed, 16 insertions(+), 47 deletions(-) -- 2.14.1

3 19

[libvirt] [PATCH] src/qemu: Fix indentation in Makefile.inc.am
by Michal Privoznik 09 Jan '19

09 Jan '19

Three lines are a bit off there. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/Makefile.inc.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am index 2afa67f195..0b2bc074c0 100644 --- a/src/qemu/Makefile.inc.am +++ b/src/qemu/Makefile.inc.am @@ -35,9 +35,9 @@ QEMU_DRIVER_SOURCES = \ qemu/qemu_migration.h \ qemu/qemu_migration_cookie.c \ qemu/qemu_migration_cookie.h \ - qemu/qemu_migration_params.c \ - qemu/qemu_migration_params.h \ - qemu/qemu_migration_paramspriv.h \ + qemu/qemu_migration_params.c \ + qemu/qemu_migration_params.h \ + qemu/qemu_migration_paramspriv.h \ qemu/qemu_monitor.c \ qemu/qemu_monitor.h \ qemu/qemu_monitor_priv.h \ -- 2.19.2

2 1

[libvirt] [PATCH 0/3] Fix examples/ under mingw
by Eric Blake 09 Jan '19

09 Jan '19

My recent patch to make all of the examples work independently of gnulib worked fine on Linux, but failed on mingw: https://travis-ci.org/libvirt/libvirt/jobs/476898635 The whole point of gnulib is to work around portability pitfalls so we don't have to bend over backwards thinking about it in our code; and it would be possible to fix this bug by linking the problematic example binaries against gnulib after all. But since the examples are still small and self-contained enough that using manual workarounds wasn't too daunting, that's the approach I took here. I'm pushing this series as a build-breaker fix in a couple of hours, or sooner if I get a review. Eric Blake (3): examples: Work around mingw printf() weakness examples: Work around lack of mingw sigaction() examples: Work around lack of mingw localtime_r() cfg.mk | 2 +- examples/admin/client_info.c | 6 +++++- examples/admin/list_clients.c | 6 +++++- examples/domtop/domtop.c | 13 ++++++------- examples/object-events/event-test.c | 16 +++++++--------- 5 files changed, 24 insertions(+), 19 deletions(-) -- 2.20.1

4 10

[libvirt] [PATCH] qemu: Use ULL instead of uint64_t for RDMA GID event
by Michal Privoznik 09 Jan '19

09 Jan '19

In the previous commit we are using uint64_t for storing subnet prefix and interface id that qemu reports in RDMA_GID_STATUS_CHANGED event. We also report them in some debug messages. This poses a problem because uint64_t can be UL or ULL depending on the host architecture and hence we wouldn't know which format to use. Switch to ULL which is big enough and doesn't suffer from the issue. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 12 +++++++----- src/qemu/qemu_process.c | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 419ea66a6a..7ce5bd668e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1688,11 +1688,11 @@ int qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon, const char *netdev, bool gid_status, - uint64_t subnet_prefix, - uint64_t interface_id) + unsigned long long subnet_prefix, + unsigned long long interface_id) { int ret = -1; - VIR_DEBUG("netdev=%s, gid_status=%d, subnet_prefix=0x%lx, interface_id=0x%lx", + VIR_DEBUG("netdev=%s, gid_status=%d, subnet_prefix=0x%llx, interface_id=0x%llx", netdev, gid_status, subnet_prefix, interface_id); QEMU_MONITOR_CALLBACK(mon, ret, domainRdmaGidStatusChanged, mon->vm, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 93804233db..8fcac8850f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -294,8 +294,8 @@ typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, const char *netdev, bool gid_status, - uint64_t subnet_prefix, - uint64_t interface_id, + unsigned long long subnet_prefix, + unsigned long long interface_id, void *opaque); typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; @@ -466,9 +466,11 @@ int qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon, const char *prManager, bool connected); -int qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon, const char *netdev, - bool gid_status, uint64_t subnet_prefix, - uint64_t interface_id); +int qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon, + const char *netdev, + bool gid_status, + unsigned long long subnet_prefix, + unsigned long long interface_id); int qemuMonitorStartCPUs(qemuMonitorPtr mon); int qemuMonitorStopCPUs(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 83a054663f..aad6c12552 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1720,8 +1720,8 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, const char *netdev, bool gid_status, - uint64_t subnet_prefix, - uint64_t interface_id, + unsigned long long subnet_prefix, + unsigned long long interface_id, void *opaque) { virQEMUDriverPtr driver = opaque; @@ -1731,7 +1731,7 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virObjectLock(vm); - VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%lx,interface_id=0x%lx", + VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%llx,interface_id=0x%llx", netdev, gid_status, subnet_prefix, interface_id); if (VIR_ALLOC(info) < 0 || -- 2.19.2

1 0

[libvirt] [PATCH 0/2] Fix build on FreeBSD
by Ján Tomko 09 Jan '19

09 Jan '19

The recent gnulib update pulled in a commit that broke the build of examples on FreeBSD Ján Tomko (2): examples: add spaces after #include examples: include config.h examples/admin/client_close.c | 10 ++++++---- examples/admin/client_info.c | 13 +++++++------ examples/admin/client_limits.c | 8 +++++--- examples/admin/list_clients.c | 10 ++++++---- examples/admin/list_servers.c | 8 +++++--- examples/admin/logging.c | 17 +++++++++-------- examples/admin/threadpool_params.c | 8 +++++--- examples/dommigrate/dommigrate.c | 2 ++ examples/hellolibvirt/hellolibvirt.c | 2 ++ examples/openauth/openauth.c | 2 ++ examples/rename/rename.c | 2 ++ 11 files changed, 51 insertions(+), 31 deletions(-) -- 2.16.4

4 6

[libvirt] [PATCH v3 RESEND] qemu: Process RDMA GID state change event
by Yuval Shaia 09 Jan '19

09 Jan '19

This event is emitted on the monitor when a GID table in pvrdma device is modified and the change needs to be propagate to the backend RDMA device's GID table. The control over the RDMA device's GID table is done by updating the device's Ethernet function addresses. Usually the first GID entry is determine by the MAC address, the second by the first IPv6 address and the third by the IPv4 address. Other entries can be added by adding more IP addresses. The opposite is the same, i.e. whenever an address is removed, the corresponding GID entry is removed. The process is done by the network and RDMA stacks. Whenever an address is added the ib_core driver is notified and calls the device driver's add_gid function which in turn update the device. To support this in pvrdma device we need to hook into the create_bind and destroy_bind HW commands triggered by pvrdma driver in guest. Whenever a changed is made to the pvrdma device's GID table a special QMP messages is sent to be processed by libvirt to update the address of the backend Ethernet device. Signed-off-by: Yuval Shaia <yuval.shaia(a)oracle.com> --- (fixing mail subject from v2 to v3, rest is the same) Hi, Corresponding qemu commit was merged to master as part of the following patch-set: https://www.mail-archive.com/qemu-devel@nongnu.org/msg583387.html Appreciate if this patch can be reviewed and merged as well. Thanks, Yuval v1 -> v2: * Address all comments from Michal Privoznik v2 -> v3: * Remove static initialization in processRdmaGidStatusChangedEvent --- src/qemu/qemu_domain.c | 3 +++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 44 ++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 +++++++++++++++++++ src/qemu/qemu_monitor.h | 27 +++++++++++++++++++ src/qemu/qemu_monitor_json.c | 36 +++++++++++++++++++++++++ src/qemu/qemu_process.c | 52 ++++++++++++++++++++++++++++++++++++ 7 files changed, 190 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ba3fff607a..8da54c7ee9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13479,6 +13479,9 @@ qemuProcessEventFree(struct qemuProcessEvent *event) case QEMU_PROCESS_EVENT_GUESTPANIC: qemuMonitorEventPanicInfoFree(event->data); break; + case QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED: + qemuMonitorEventRdmaGidStatusFree(event->data); + break; case QEMU_PROCESS_EVENT_WATCHDOG: case QEMU_PROCESS_EVENT_DEVICE_DELETED: case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 80bd4bde91..64bceb9a98 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -487,6 +487,7 @@ typedef enum { QEMU_PROCESS_EVENT_BLOCK_JOB, QEMU_PROCESS_EVENT_MONITOR_EOF, QEMU_PROCESS_EVENT_PR_DISCONNECT, + QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED, QEMU_PROCESS_EVENT_LAST } qemuProcessEventType; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a52e2495d5..5c6ab3c0ea 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4788,6 +4788,47 @@ processPRDisconnectEvent(virDomainObjPtr vm) } +static void +processRdmaGidStatusChangedEvent(virDomainObjPtr vm, + qemuMonitorRdmaGidStatusChangedPrivatePtr info) +{ + unsigned int prefix_len; + virSocketAddr addr; + int rc; + + if (!virDomainObjIsActive(vm)) + return; + + VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%llx,interface_id=0x%llx", + info->netdev, info->gid_status, info->subnet_prefix, + info->interface_id); + + if (info->subnet_prefix) { + prefix_len = 64; + uint32_t ipv6[4]; + memcpy(&ipv6[0], &info->subnet_prefix, sizeof(info->subnet_prefix)); + memcpy(&ipv6[2], &info->interface_id, sizeof(info->interface_id)); + virSocketAddrSetIPv6AddrNetOrder(&addr, ipv6); + } else { + prefix_len = 24; + virSocketAddrSetIPv4AddrNetOrder(&addr, info->interface_id >> 32); + } + + if (info->gid_status) { + VIR_DEBUG("Adding %s to %s", virSocketAddrFormat(&addr), info->netdev); + rc = virNetDevIPAddrAdd(info->netdev, &addr, NULL, prefix_len); + } else { + VIR_DEBUG("Removing %s from %s", virSocketAddrFormat(&addr), + info->netdev); + rc = virNetDevIPAddrDel(info->netdev, &addr, prefix_len); + } + + if (rc < 0) + VIR_WARN("Fail to update address %s to %s", virSocketAddrFormat(&addr), + info->netdev); +} + + static void qemuProcessEventHandler(void *data, void *opaque) { struct qemuProcessEvent *processEvent = data; @@ -4828,6 +4869,9 @@ static void qemuProcessEventHandler(void *data, void *opaque) case QEMU_PROCESS_EVENT_PR_DISCONNECT: processPRDisconnectEvent(vm); break; + case QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED: + processRdmaGidStatusChangedEvent(vm, processEvent->data); + break; case QEMU_PROCESS_EVENT_LAST: break; } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7f7013e115..4bf71dbf8c 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1686,6 +1686,22 @@ qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon, } +int +qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon, const char *netdev, + bool gid_status, uint64_t subnet_prefix, + uint64_t interface_id) +{ + int ret = -1; + VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%lx,interface_id=0x%lx", + netdev, gid_status, subnet_prefix, interface_id); + + QEMU_MONITOR_CALLBACK(mon, ret, domainRdmaGidStatusChanged, mon->vm, netdev, + gid_status, subnet_prefix, interface_id); + + return ret; +} + + int qemuMonitorSetCapabilities(qemuMonitorPtr mon) { @@ -4298,6 +4314,17 @@ qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info) } +void +qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatusChangedPrivatePtr info) +{ + if (!info) + return; + + VIR_FREE(info->netdev); + VIR_FREE(info); +} + + int qemuMonitorSetWatchdogAction(qemuMonitorPtr mon, const char *action) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 48b142a4f4..b639a0a9d2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -109,8 +109,22 @@ struct _qemuMonitorEventPanicInfo { } data; }; + +typedef struct _qemuMonitorRdmaGidStatusChangedPrivate qemuMonitorRdmaGidStatusChangedPrivate; +typedef qemuMonitorRdmaGidStatusChangedPrivate *qemuMonitorRdmaGidStatusChangedPrivatePtr; +struct _qemuMonitorRdmaGidStatusChangedPrivate { + virObject parent; + + char *netdev; + bool gid_status; + unsigned long long subnet_prefix; + unsigned long long interface_id; +}; + + char *qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfoPtr info); void qemuMonitorEventPanicInfoFree(qemuMonitorEventPanicInfoPtr info); +void qemuMonitorEventRdmaGidStatusFree(qemuMonitorRdmaGidStatusChangedPrivatePtr info); typedef void (*qemuMonitorDestroyCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -281,6 +295,14 @@ typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitorPtr mo bool connected, void *opaque); +typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitorPtr mon, + virDomainObjPtr vm, + const char *netdev, + bool gid_status, + uint64_t subnet_prefix, + uint64_t interface_id, + void *opaque); + typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks; typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr; struct _qemuMonitorCallbacks { @@ -314,6 +336,7 @@ struct _qemuMonitorCallbacks { qemuMonitorDomainBlockThresholdCallback domainBlockThreshold; qemuMonitorDomainDumpCompletedCallback domainDumpCompleted; qemuMonitorDomainPRManagerStatusChangedCallback domainPRManagerStatusChanged; + qemuMonitorDomainRdmaGidStatusChangedCallback domainRdmaGidStatusChanged; }; char *qemuMonitorEscapeArg(const char *in); @@ -448,6 +471,10 @@ int qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon, const char *prManager, bool connected); +int qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon, const char *netdev, + bool gid_status, uint64_t subnet_prefix, + uint64_t interface_id); + int qemuMonitorStartCPUs(qemuMonitorPtr mon); int qemuMonitorStopCPUs(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3de298c9e2..8df9b426ba 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -91,6 +91,7 @@ static void qemuMonitorJSONHandleAcpiOstInfo(qemuMonitorPtr mon, virJSONValuePtr static void qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data); typedef struct { const char *type; @@ -114,6 +115,7 @@ static qemuEventHandler eventHandlers[] = { { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, }, { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, { "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusChanged, }, + { "RDMA_GID_STATUS_CHANGED", qemuMonitorJSONHandleRdmaGidStatusChanged, }, { "RESET", qemuMonitorJSONHandleReset, }, { "RESUME", qemuMonitorJSONHandleResume, }, { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, }, @@ -1351,6 +1353,40 @@ static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, } +static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon, + virJSONValuePtr data) +{ + const char *netdev; + bool gid_status; + unsigned long long subnet_prefix, interface_id; + + if (!(netdev = virJSONValueObjectGetString(data, "netdev"))) { + VIR_WARN("missing netdev in GID_STATUS_CHANGED event"); + return; + } + + if (virJSONValueObjectGetBoolean(data, "gid-status", &gid_status)) { + VIR_WARN("missing gid-status in GID_STATUS_CHANGED event"); + return; + } + + if (virJSONValueObjectGetNumberUlong(data, "subnet-prefix", + &subnet_prefix)) { + VIR_WARN("missing subnet-prefix in GID_STATUS_CHANGED event"); + return; + } + + if (virJSONValueObjectGetNumberUlong(data, "interface-id", + &interface_id)) { + VIR_WARN("missing interface-id in GID_STATUS_CHANGED event"); + return; + } + + qemuMonitorEmitRdmaGidStatusChanged(mon, netdev, gid_status, subnet_prefix, + interface_id); +} + + int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, const char *cmd_str, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9cf971808c..6cf0ace5cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1703,6 +1703,57 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } +static int +qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm, const char *netdev, + bool gid_status, uint64_t subnet_prefix, + uint64_t interface_id, void *opaque) +{ + virQEMUDriverPtr driver = opaque; + struct qemuProcessEvent *processEvent = NULL; + qemuMonitorRdmaGidStatusChangedPrivatePtr rdmaGitStatusChangedPriv = NULL; + int ret = -1; + + virObjectLock(vm); + + VIR_DEBUG("netdev=%s,gid_status=%d,subnet_prefix=0x%lx,interface_id=0x%lx", + netdev, gid_status, subnet_prefix, interface_id); + + if (VIR_ALLOC(rdmaGitStatusChangedPriv) < 0) + goto out_unlock; + + if (VIR_STRDUP(rdmaGitStatusChangedPriv->netdev, netdev) < 0) + goto out_free; + + rdmaGitStatusChangedPriv->gid_status = gid_status; + rdmaGitStatusChangedPriv->subnet_prefix = subnet_prefix; + rdmaGitStatusChangedPriv->interface_id = interface_id; + + if (VIR_ALLOC(processEvent) < 0) + goto out_free; + + processEvent->eventType = QEMU_PROCESS_EVENT_RDMA_GID_STATUS_CHANGED; + processEvent->vm = virObjectRef(vm); + processEvent->data = rdmaGitStatusChangedPriv; + + if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { + qemuProcessEventFree(processEvent); + virObjectUnref(vm); + goto out_free; + } + + ret = 0; + goto out_unlock; + + out_free: + qemuMonitorEventRdmaGidStatusFree(rdmaGitStatusChangedPriv); + + out_unlock: + virObjectUnlock(vm); + return ret; +} + + static qemuMonitorCallbacks monitorCallbacks = { .eofNotify = qemuProcessHandleMonitorEOF, .errorNotify = qemuProcessHandleMonitorError, @@ -1732,6 +1783,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .domainBlockThreshold = qemuProcessHandleBlockThreshold, .domainDumpCompleted = qemuProcessHandleDumpCompleted, .domainPRManagerStatusChanged = qemuProcessHandlePRManagerStatusChanged, + .domainRdmaGidStatusChanged = qemuProcessHandleRdmaGidStatusChanged, }; static void -- 2.17.2

2 3

[libvirt] [PATCH v2 0/2] Makefile.am cleanups
by Eric Blake 08 Jan '19

08 Jan '19

Since v1: - push patch 1, 2 that had successful reviews - new patch 1 - rewrite old patch 3 to remove all use of gnulib from examples/, rather than being partitioned based on what uses config.h (in part by reverting Jan's recent patch that added config.h everywhere) Eric Blake (2): examples: Drop event-test.c dependency on gnulib <verify.h> examples: Avoid gnulib, have standalone examples examples/Makefile.am | 5 ++--- examples/admin/client_close.c | 2 -- examples/admin/client_info.c | 3 +-- examples/admin/client_limits.c | 2 -- examples/admin/list_clients.c | 2 -- examples/admin/list_servers.c | 2 -- examples/admin/logging.c | 2 -- examples/admin/threadpool_params.c | 2 -- examples/dommigrate/dommigrate.c | 2 -- examples/domsuspend/suspend.c | 2 -- examples/domtop/domtop.c | 2 -- examples/hellolibvirt/hellolibvirt.c | 2 -- examples/object-events/event-test.c | 12 ++++++++---- examples/openauth/openauth.c | 2 -- examples/rename/rename.c | 2 -- 15 files changed, 11 insertions(+), 33 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH 0/2] syntax-check: Fix unmarked_diagnostics on FreeBSD
by Andrea Bolognani 08 Jan '19

08 Jan '19

... and fix some issues in the process. Andrea Bolognani (2): src: Fix a few unmarked_diagnostics issues syntax-check: Simplify and fix unmarked_diagnostics cfg.mk | 4 ++-- src/libxl/libxl_driver.c | 8 ++++---- src/openvz/openvz_driver.c | 4 ++-- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/vbox/vbox_snapshot_conf.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) -- 2.20.1

3 4