- Devel - libvirt List Archives

[libvirt] [PATCH 0/5] Additional SCSI generated device address checks
by John Ferlan 21 Jul '15

21 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1210587 These patches will resolve a couple issues with generation of the <address type='drive' .../> for a SCSI <disk> and <hostdev>. The <disk> generation algorithm 'assumes' that when presented with <target dev='sda'.../> that it can use controller=0 and unit=0 since sda would conceivably be the first device; however, a <hostdev> could attempt to assign itself to that address and it doesn't have a target device name, so it bypasses the virDomainDiskDefDstDuplicates checks that would normally 'catch' two <disk>'s attempting to use the same name. Likewise, if a <hostdev> occupies an <address> and we attempt to hotplug a <disk> without providing an address, the address generation could attempt to place the disk on the already existing host device. John Ferlan (5): conf: Enforce SCSI hostdev address type conf: Add 'bus' and 'target' to SCSI address conflict checks conf: Add SCSI hostdev check for disk drive address already in use conf: Refactor virDomainDiskDefParseXML to pass vmdef conf: Check for hostdev conflicts when assign default disk address docs/formatdomain.html.in | 4 +- src/conf/domain_conf.c | 115 ++++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 3 +- src/qemu/qemu_command.c | 4 +- src/vmx/vmx.c | 22 +++++---- src/vmx/vmx.h | 3 +- 6 files changed, 101 insertions(+), 50 deletions(-) -- 2.1.0

3 19

[libvirt] [PATCH 00/13] Improve virsh block job handling
by Peter Krempa 21 Jul '15

21 Jul '15

This series refactors the block job command code so that it is handled by separate functions rather than one mega-method. Additionally this series then fixes the routine for waiting for a block job. As it's perhaps obvious from the patches the API design for the block job APIs is rather unfortunate for users. This series contains a few patches that already were submitted and partially reviewed previously. Peter Krempa (13): virsh: blockjob: Extract block job info code into a separate function virsh: cmdBlockJob: Switch to declarative flag interlocking virsh: blockjob: Split out vshBlockJobSetSpeed from blockJobImpl virsh: block job: separate abort from blockJobImpl virsh: Split out block pull implementation from blockJobImpl virsh: Kill blockJobImpl by moving the final impl into cmdBlockCommit virsh: Refactor argument checking in cmdBlockCommit virsh: Refactor argument handling in cmdBlockCopy virsh: Refactor argument handling in cmdBlockPull qemu: Update state of block job to READY only if it actually is ready virsh: Refactor block job waiting in cmdBlockPull virsh: Refactor block job waiting in cmdBlockCommit virsh: Refactor block job waiting in cmdBlockCopy src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 7 + tools/virsh-domain.c | 962 ++++++++++++++++++++++++------------------- 4 files changed, 551 insertions(+), 429 deletions(-) -- 2.4.5

3 25

[libvirt] [libvirt-glib PATCHv5 1/7] gobject: Simplify gvir_connection_list*() implementations
by Zeeshan Ali (Khattak) 21 Jul '15

21 Jul '15

Make use of virConnectListAll* functions to avoid making 4 calls and hence avoid race conditions and complicated code. --- libvirt-gobject/libvirt-gobject-connection.c | 203 ++++----------------------- 1 file changed, 28 insertions(+), 175 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index cf073a5..e088427 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -680,48 +680,6 @@ void gvir_connection_close(GVirConnection *conn) g_signal_emit(conn, signals[VIR_CONNECTION_CLOSED], 0); } -typedef gint (* CountFunction) (virConnectPtr vconn); -typedef gint (* ListFunction) (virConnectPtr vconn, gchar **lst, gint max); - -static gchar ** fetch_list(virConnectPtr vconn, - const char *name, - CountFunction count_func, - ListFunction list_func, - GCancellable *cancellable, - gint *length, - GError **err) -{ - gchar **lst = NULL; - gint n = 0; - - if ((n = count_func(vconn)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count %s"), name); - goto error; - } - - if (n) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto error; - - lst = g_new0(gchar *, n); - if ((n = list_func(vconn, lst, n)) < 0) { - gvir_set_error(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list %s %d"), name, n); - goto error; - } - } - - *length = n; - return lst; - -error: - g_free(lst); - return NULL; -} - /** * gvir_connection_fetch_domains: * @conn: a #GVirConnection @@ -733,14 +691,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *doms; - gchar **inactive = NULL; - gint ninactive = 0; - gint *active = NULL; - gint nactive = 0; + virDomainPtr *domains = NULL; + gint ndomains = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -761,81 +716,28 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, virConnectRef(vconn); g_mutex_unlock(priv->lock); - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - if ((nactive = virConnectNumOfDomains(vconn)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to count domains")); + ndomains = virConnectListAllDomains(vconn, &domains, 0); + if (ndomains < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of domains")); goto cleanup; } - if (nactive) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - active = g_new(gint, nactive); - if ((nactive = virConnectListDomains(vconn, active, nactive)) < 0) { - gvir_set_error_literal(err, GVIR_CONNECTION_ERROR, - 0, - _("Unable to list domains")); - goto cleanup; - } - } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Domains", - virConnectNumOfDefinedDomains, - virConnectListDefinedDomains, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - doms = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByID(vconn, active[i]); + for (i = 0 ; i < ndomains; i++) { GVirDomain *dom; - if (!vdom) - continue; dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, + "handle", domains[i], NULL)); - virDomainFree(vdom); - - g_hash_table_insert(doms, - (gpointer)gvir_domain_get_uuid(dom), - dom); - } - - for (i = 0 ; i < ninactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virDomainPtr vdom = virDomainLookupByName(vconn, inactive[i]); - GVirDomain *dom; - if (!vdom) - continue; - - dom = GVIR_DOMAIN(g_object_new(GVIR_TYPE_DOMAIN, - "handle", vdom, - NULL)); - virDomainFree(vdom); g_hash_table_insert(doms, (gpointer)gvir_domain_get_uuid(dom), @@ -852,10 +754,11 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, ret = TRUE; cleanup: - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (ndomains > 0) { + for (i = 0 ; i < ndomains; i++) + virDomainFree(domains[i]); + free(domains); + } return ret; } @@ -870,14 +773,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, { GVirConnectionPrivate *priv; GHashTable *pools; - gchar **inactive = NULL; - gint ninactive = 0; - gchar **active = NULL; - gint nactive = 0; + virStoragePoolPtr *vpools = NULL; + gint npools = 0; gboolean ret = FALSE; gint i; virConnectPtr vconn = NULL; - GError *lerr = NULL; g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); g_return_val_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable), @@ -901,77 +801,31 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - active = fetch_list(vconn, - "Storage Pools", - virConnectNumOfStoragePools, - virConnectListStoragePools, - cancellable, - &nactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; + npools = virConnectListAllStoragePools(vconn, &vpools, 0); + if (npools < 0) { + gvir_set_error(err, GVIR_CONNECTION_ERROR, + 0, + _("Failed to fetch list of pools")); goto cleanup; } if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - inactive = fetch_list(vconn, - "Storage Pools", - virConnectNumOfDefinedStoragePools, - virConnectListDefinedStoragePools, - cancellable, - &ninactive, - &lerr); - if (lerr) { - g_propagate_error(err, lerr); - lerr = NULL; - goto cleanup; - } - pools = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - for (i = 0 ; i < nactive ; i++) { - if (g_cancellable_set_error_if_cancelled(cancellable, err)) - goto cleanup; - - virStoragePoolPtr vpool; + for (i = 0 ; i < npools; i++) { GVirStoragePool *pool; - vpool = virStoragePoolLookupByName(vconn, active[i]); - if (!vpool) - continue; - - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, - NULL)); - virStoragePoolFree(vpool); - - g_hash_table_insert(pools, - (gpointer)gvir_storage_pool_get_uuid(pool), - pool); - } - - for (i = 0 ; i < ninactive ; i++) { if (g_cancellable_set_error_if_cancelled(cancellable, err)) goto cleanup; - virStoragePoolPtr vpool; - GVirStoragePool *pool; - - vpool = virStoragePoolLookupByName(vconn, inactive[i]); - if (!vpool) - continue; - pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, - "handle", vpool, + "handle", vpools[i], NULL)); - virStoragePoolFree(vpool); - g_hash_table_insert(pools, (gpointer)gvir_storage_pool_get_uuid(pool), pool); @@ -987,12 +841,11 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, ret = TRUE; cleanup: - for (i = 0 ; i < nactive ; i++) - g_free(active[i]); - g_free(active); - for (i = 0 ; i < ninactive ; i++) - g_free(inactive[i]); - g_free(inactive); + if (npools > 0) { + for (i = 0 ; i < npools; i++) + virStoragePoolFree(vpools[i]); + free(vpools); + } return ret; } -- 2.4.3

3 29

[libvirt] [PATCHv2] nodedev: add RDMA and tx-udp_tnl-segmentation NIC capabilities
by Moshe Levi 21 Jul '15

21 Jul '15

Adding functionality to libvirt that will allow it query the interface for the availability of RDMA and tx-udp_tnl-segmentation Offloading NIC capabilities Here is an example of the feature XML definition: <device> <name>net_eth4_90_e2_ba_5e_a5_45</name> <path>/sys/devices/pci0000:00/0000:00:03.0/0000:08:00.1/net/eth4</path> <parent>pci_0000_08_00_1</parent> <capability type='net'> <interface>eth4</interface> <address>90:e2:ba:5e:a5:45</address> <link speed='10000' state='up'/> <feature name='rx'/> <feature name='tx'/> <feature name='sg'/> <feature name='tso'/> <feature name='gso'/> <feature name='gro'/> <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> <feature name='rdma'/> <feature name='txudptnl'/> <capability type='80203'/> </capability> </device> --- configure.ac | 2 +- docs/formatnode.html.in | 2 + src/conf/device_conf.c | 4 +- src/conf/device_conf.h | 2 + src/util/virnetdev.c | 141 +++++++++++++++++++-- src/util/virnetdev.h | 1 + tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 2 + tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 2 + 8 files changed, 144 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a7f38e8..70b3ef3 100644 --- a/configure.ac +++ b/configure.ac @@ -390,7 +390,7 @@ AC_CHECK_TYPE([struct ifreq], ]]) AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO, - ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS], + ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS, ETHTOOL_GFEATURES], [], [], [[#include <linux/ethtool.h> ]]) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 3ff1bef..ed00af5 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -199,6 +199,8 @@ <dt><code>txvlan</code></dt><dd>tx-vlan-offload</dd> <dt><code>ntuple</code></dt><dd>ntuple-filters</dd> <dt><code>rxhash</code></dt><dd>receive-hashing</dd> + <dt><code>rdma</code></dt><dd>remote-direct-memory-access</dd> + <dt><code>txudptnl</code></dt><dd>tx-udp-tunnel-segmentation</dd> </dl> </dd> <dt><code>capability</code></dt> diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 98808e2..e7b7957 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -51,7 +51,9 @@ VIR_ENUM_IMPL(virNetDevFeature, "rxvlan", "txvlan", "ntuple", - "rxhash") + "rxhash", + "rdma", + "txudptnl") int virDevicePCIAddressIsValid(virDevicePCIAddressPtr addr) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 7ea90f6..40a2b3d 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -74,6 +74,8 @@ typedef enum { VIR_NET_DEV_FEAT_TXVLAN, VIR_NET_DEV_FEAT_NTUPLE, VIR_NET_DEV_FEAT_RXHASH, + VIR_NET_DEV_FEAT_RDMA, + VIR_NET_DEV_FEAT_TXUDPTNL, VIR_NET_DEV_FEAT_LAST } virNetDevFeature; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e4fcd81..0dcb42d 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -87,6 +87,14 @@ VIR_LOG_INIT("util.netdev"); # define VIR_IFF_ALLMULTI 0 #endif +#define RESOURCE_FILE_LEN 4096 +#define TX_UDP_TNL 25 +#define GFEATURES_SIZE 2 +#define FEATURE_WORD(blocks, index, field) ((blocks)[(index) / 32U].field) +#define FEATURE_FIELD_FLAG(index) (1U << (index) % 32U) +#define FEATURE_BIT_IS_SET(blocks, index, field) \ + (FEATURE_WORD(blocks, index, field) & FEATURE_FIELD_FLAG(index)) + typedef enum { VIR_MCAST_TYPE_INDEX_TOKEN, VIR_MCAST_TYPE_NAME_TOKEN, @@ -1868,7 +1876,6 @@ virNetDevReplaceMacAddress(const char *linkdev, goto cleanup; ret = 0; - cleanup: VIR_FREE(path); return ret; @@ -2858,9 +2865,9 @@ static int virNetDevGetMulticastTable(const char *ifname, } ret = 0; + cleanup: virNetDevMcastListClear(&mcast); - return ret; } @@ -2943,11 +2950,76 @@ int virNetDevGetRxFilter(const char *ifname, return ret; } + +/** + * virNetDevRDMAFeature + * This function checks for the availability of RDMA feature + * and add it to bitmap + * + * @ifname: name of the interface + * @out: add RDMA feature if exist to bitmap + * + * Returns 0 on success, -1 on failure. + */ +static int +virNetDevRDMAFeature(const char *ifname, + virBitmapPtr *out) +{ + char *eth_devpath = NULL; + char *ib_devpath = NULL; + char *eth_res_buf = NULL; + char *ib_res_buf = NULL; + DIR *dirp = NULL; + struct dirent *dp; + int ret = -1; + + if (!(dirp = opendir(SYSFS_INFINIBAND_DIR))) { + virReportSystemError(errno, + _("Failed to opendir path '%s'"), + SYSFS_INFINIBAND_DIR); + goto cleanup; + } + + if (virAsprintf(&eth_devpath, SYSFS_NET_DIR "%s/device/resource", ifname) < 0) + goto cleanup; + if (!virFileExists(eth_devpath)) + goto cleanup; + if (virFileReadAll(eth_devpath, RESOURCE_FILE_LEN, &eth_res_buf) < 0) + goto cleanup; + + while (virDirRead(dirp, &dp, SYSFS_INFINIBAND_DIR) > 0) { + if (dp->d_name[0] == '.') + continue; + if (virAsprintf(&ib_devpath, SYSFS_INFINIBAND_DIR "%s/device/resource", dp->d_name) < 0) { + VIR_FREE(ib_devpath); + continue; + } + if (virFileReadAll(ib_devpath, RESOURCE_FILE_LEN, &ib_res_buf) < 0) { + VIR_FREE(ib_res_buf); + continue; + } + if (STREQ(eth_res_buf, ib_res_buf)) { + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_RDMA)); + break; + } + VIR_FREE(ib_res_buf); + } + ret = 0; + + cleanup: + closedir(dirp); + VIR_FREE(eth_devpath); + VIR_FREE(ib_devpath); + VIR_FREE(eth_res_buf); + VIR_FREE(ib_res_buf); + return ret; +} + #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) /** - * virNetDevFeatureAvailable - * This function checks for the availability of a network device feature + * virNetDevSendEthtoolIoctl + * This function sends ethtool ioctl request * * @ifname: name of the interface * @cmd: reference to an ethtool command structure @@ -2955,7 +3027,7 @@ int virNetDevGetRxFilter(const char *ifname, * Returns 0 on success, -1 on failure. */ static int -virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) +virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) { int ret = -1; int sock = -1; @@ -2969,9 +3041,9 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) memset(&ifr, 0, sizeof(ifr)); strcpy(ifr.ifr_name, ifname); - ifr.ifr_data = (void*) cmd; - - if (ioctl(sock, SIOCETHTOOL, &ifr) != 0) { + ifr.ifr_data = cmd; + ret = ioctl(sock, SIOCETHTOOL, &ifr); + if (ret != 0) { switch (errno) { case EPERM: VIR_DEBUG("ethtool ioctl: permission denied"); @@ -2988,11 +3060,51 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) } } - ret = cmd->data > 0 ? 1: 0; cleanup: if (sock) VIR_FORCE_CLOSE(sock); + return ret; +} + +/** +* virNetDevFeatureAvailable +* This function checks for the availability of a network device feature +* +* @ifname: name of the interface +* @cmd: reference to an ethtool command structure +* +* Returns 0 if not found, 1 on success, and -1 on failure. +*/ +static int +virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) +{ + int ret = -1; + + cmd = (void*)cmd; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = cmd->data > 0 ? 1: 0; + return ret; +} + + +/** + * virNetDevGFeatureAvailable + * This function checks for the availability of a network device gfeature + * + * @ifname: name of the interface + * @cmd: reference to a gfeatures ethtool command structure + * + * Returns 0 if not found, 1 on success, and -1 on failure. + */ +static int +virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) +{ + int ret = -1; + + cmd = (void*)cmd; + if (!virNetDevSendEthtoolIoctl(ifname, cmd)) + ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); return ret; } @@ -3013,7 +3125,7 @@ virNetDevGetFeatures(const char *ifname, { size_t i = -1; struct ethtool_value cmd = { 0 }; - + struct ethtool_gfeatures g_cmd = { 0 }; struct elem{ const int cmd; const virNetDevFeature feat; @@ -3069,6 +3181,15 @@ virNetDevGetFeatures(const char *ifname, } # endif +# if HAVE_DECL_ETHTOOL_GFEATURES + g_cmd.cmd = ETHTOOL_GFEATURES; + g_cmd.size = GFEATURES_SIZE; + if (virNetDevGFeatureAvailable(ifname, &g_cmd)) + ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_TXUDPTNL)); +# endif + + if (virNetDevRDMAFeature(ifname, out)) + return -1; return 0; } #else diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 190b70e..fff881c 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -210,6 +210,7 @@ int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; # define SYSFS_NET_DIR "/sys/class/net/" +# define SYSFS_INFINIBAND_DIR "/sys/class/infiniband/" int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml index 2a34fed..d4c96e8 100644 --- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml +++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml @@ -13,6 +13,8 @@ <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> + <feature name='rdma'/> + <feature name='txudptnl'/> <capability type='80211'/> </capability> </device> diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml index 81d398c..71bf90e 100644 --- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml +++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml @@ -13,6 +13,8 @@ <feature name='rxvlan'/> <feature name='txvlan'/> <feature name='rxhash'/> + <feature name='rdma'/> + <feature name='txudptnl'/> <capability type='80203'/> </capability> </device> -- 1.7.1

2 3

[libvirt] [PATCH v2] network: add an option to make dns public
by Cédric Bosdonnat 21 Jul '15

21 Jul '15

In some use cases we don't want the virtual network's DNS to only listen to the vnet interface. Adding a publiclyAccessible attribute to the dns element in the configuration allows the DNS to listen to all interfaces. It simply disables the bind-dynamic option of dnsmasq for the network. --- This patch is v2 for this one: https://www.redhat.com/archives/libvir-list/2015-June/msg00018.html Diff to v1: * Use bind-interface if public DNS is requested * Add more tests * Write out the public value in the format function * Fixed the rng * Renamed the attribute to public: shouldn't mislead users I tested this patch with several configurations of running networks. The only thing I noted though is that the user may need to adapt the system dnsmasq to avoid address:port conflicts... but hey, when one uses such a hacky feature of the libvirt network, he needs to take care of the rest ;) docs/formatnetwork.html.in | 9 +++++++ docs/schemas/network.rng | 5 ++++ src/conf/network_conf.c | 28 ++++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 3 ++- .../nat-network-dns-not-public.conf | 15 ++++++++++++ .../nat-network-dns-not-public.xml | 15 ++++++++++++ .../nat-network-dns-public.conf | 15 ++++++++++++ .../networkxml2confdata/nat-network-dns-public.xml | 15 ++++++++++++ tests/networkxml2xmlin/nat-network-dns-public.xml | 9 +++++++ tests/networkxml2xmlout/nat-network-dns-public.xml | 11 +++++++++ tests/networkxml2xmltest.c | 1 + 12 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-not-public.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-not-public.xml create mode 100644 tests/networkxml2confdata/nat-network-dns-public.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-public.xml create mode 100644 tests/networkxml2xmlin/nat-network-dns-public.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-public.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 6abed8f..0141d93 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -851,6 +851,15 @@ DNS server. + + The dns element + can have an optional <code>public</code> attribute + Since 1.2.17. If <code>public</code> + is "yes", then the DNS server will handle requests for all interfaces. + If <code>public</code> is not set or "no", the DNS server will + only handle requests for the interface of the virtual network. + + Currently supported sub-elements of <code><dns></code> are: <dl> <dt><code>forwarder</code></dt> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4edb6eb..f70e3dc 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -249,6 +249,11 @@ <ref name="virYesNo"/> </attribute> </optional> + <optional> + <attribute name="public"> + <ref name="virYesNo"/> + </attribute> + </optional> <interleave> <zeroOrMore> <element name="forwarder"> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 72006e9..e90c004 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1332,9 +1332,14 @@ virNetworkDNSDefParseXML(const char *networkName, size_t i; int ret = -1; xmlNodePtr save = ctxt->node; + char *public = NULL; ctxt->node = node; + public = virXPathString("string(./@public)", ctxt); + if (public) + def->public = virTristateBoolTypeFromString(public); + forwardPlainNames = virXPathString("string(./@forwardPlainNames)", ctxt); if (forwardPlainNames) { def->forwardPlainNames = virTristateBoolTypeFromString(forwardPlainNames); @@ -1433,6 +1438,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: + VIR_FREE(public); VIR_FREE(forwardPlainNames); VIR_FREE(fwdNodes); VIR_FREE(hostNodes); @@ -2416,7 +2422,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, size_t i, j; if (!(def->forwardPlainNames || def->nfwds || def->nhosts || - def->nsrvs || def->ntxts)) + def->nsrvs || def->ntxts || def->public)) return 0; virBufferAddLit(buf, "<dns"); @@ -2431,7 +2437,25 @@ virNetworkDNSDefFormat(virBufferPtr buf, return -1; } virBufferAsprintf(buf, " forwardPlainNames='%s'", fwd); - if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts || + def->public)) { + virBufferAddLit(buf, "/>\n"); + return 0; + } + } + + if (def->public) { + const char *public = virTristateBoolTypeToString(def->public); + + if (!public) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown public type %d in network"), + def->public); + return -1; + } + virBufferAsprintf(buf, " public='%s'", public); + if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts || + def->forwardPlainNames)) { virBufferAddLit(buf, "/>\n"); return 0; } diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1cd5100..ae239b8 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -136,6 +136,7 @@ struct _virNetworkDNSDef { virNetworkDNSSrvDefPtr srvs; size_t nfwds; char **forwarders; + int public; /* enum virTristateBool */ }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3d6721b..8b11b51 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -991,7 +991,8 @@ networkDnsmasqConfContents(virNetworkObjPtr network, /* dnsmasq will *always* listen on localhost unless told otherwise */ virBufferAddLit(&configbuf, "except-interface=lo\n"); - if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { + if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) && + network->def->dns.public != VIR_TRISTATE_BOOL_YES) { /* using --bind-dynamic with only --interface (no * --listen-address) prevents dnsmasq from responding to dns * queries that arrive on some interface other than our bridge diff --git a/tests/networkxml2confdata/nat-network-dns-not-public.conf b/tests/networkxml2confdata/nat-network-dns-not-public.conf new file mode 100644 index 0000000..021316f --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-not-public.conf @@ -0,0 +1,15 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain=example.com +expand-hosts +domain-needed +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-not-public.xml b/tests/networkxml2confdata/nat-network-dns-not-public.xml new file mode 100644 index 0000000..cc78f34 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-not-public.xml @@ -0,0 +1,15 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <domain name="example.com"/> + <dns forwardPlainNames='no' public='no'> + <host ip='192.168.122.1'> + <hostname>host</hostname> + <hostname>gateway</hostname> + </host> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2confdata/nat-network-dns-public.conf b/tests/networkxml2confdata/nat-network-dns-public.conf new file mode 100644 index 0000000..05cbf43 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-public.conf @@ -0,0 +1,15 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain=example.com +expand-hosts +domain-needed +local=// +except-interface=lo +bind-interfaces +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-public.xml b/tests/networkxml2confdata/nat-network-dns-public.xml new file mode 100644 index 0000000..9c59c7b --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-public.xml @@ -0,0 +1,15 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <domain name="example.com"/> + <dns forwardPlainNames='no' public='yes'> + <host ip='192.168.122.1'> + <hostname>host</hostname> + <hostname>gateway</hostname> + </host> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmlin/nat-network-dns-public.xml b/tests/networkxml2xmlin/nat-network-dns-public.xml new file mode 100644 index 0000000..0765a83 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-dns-public.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns public='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-public.xml b/tests/networkxml2xmlout/nat-network-dns-public.xml new file mode 100644 index 0000000..66caacd --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-dns-public.xml @@ -0,0 +1,11 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'> + <interface dev='eth0'/> + </forward> + <bridge name='virbr0' stp='on' delay='0'/> + <dns public='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 290336e..ba565bc 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -97,6 +97,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record-minimal"); DO_TEST("nat-network-dns-hosts"); DO_TEST("nat-network-dns-forward-plain"); + DO_TEST("nat-network-dns-public"); DO_TEST("nat-network-dns-forwarders"); DO_TEST("nat-network-forward-nat-address"); DO_TEST("8021Qbh-net"); -- 2.1.4

3 3

[libvirt] [PATCH v6 0/5] nodeinfo: Add support for subcores
by Andrea Bolognani 20 Jul '15

20 Jul '15

Changes from v5 to v6: * updated to work on top of [PATCH v2 00/10] nodeinfo: Various cleanups I'm only sending patch 1/5 to the list, because all the other commits haven't changed since v5 and because this way there's no need to perform moderation due to the message size. For the same reason, I've heavily edited the following summary by cutting out everything that belonged to a test case. Cheers. Andrea Bolognani (3): tests: Add subcores-default nodeinfo test tests: Add subcores-partial nodeinfo test tests: Add subcores-invalid nodeinfo test Shivaprasad G Bhat (2): nodeinfo: Fix output on PPC64 KVM hosts tests: Prepare for subcore tests src/libvirt_private.syms | 1 + src/nodeinfo.c | 144 ++++++++++++++++++++- src/nodeinfo.h | 1 + tests/Makefile.am | 6 + [...] tests/nodeinfomock.c | 35 +++++ tests/nodeinfotest.c | 5 +- 1348 files changed, 2122 insertions(+), 6 deletions(-) [...] create mode 100644 tests/nodeinfomock.c -- 2.4.3

1 1

[libvirt] [PATCH 00/10] nodeinfo: Various cleanups
by Andrea Bolognani 20 Jul '15

20 Jul '15

Note: this series is to be applied on top of the [PATCH 00/03] nodeinfo: Various fixes series I've posted at the same time. A bunch of improvements and cleanups that make the nodeinfo code a bit nicer, more streamlined and less redundant, hopefully not just to my eyes. Andrea Bolognani (10): nodeinfo: Introduce linuxGetCPUGlobalPath() nodeinfo: Introduce linuxGetCPUOnlinePath() nodeinfo: Rename linuxParseCPUmax() to linuxParseCPUCount() nodeinfo: Add old kernel compatibility to nodeGetPresentCPUBitmap() nodeinfo: Add out parameter to nodeGetPresentCPUBitmap() nodeinfo: Rename nodeGetCPUBitmap() to nodeGetOnlineCPUBitmap() nodeinfo: Phase out cpu_set_t usage nodeinfo: Use nodeGetOnlineCPUBitmap() when parsing node nodeinfo: Use a bitmap to keep track of node CPUs nodeinfo: Calculate present and online CPUs only once src/libvirt_private.syms | 2 +- src/nodeinfo.c | 211 +++++++++++++++++++++++++++++------------------ src/nodeinfo.h | 6 +- src/util/vircgroup.c | 4 +- 4 files changed, 139 insertions(+), 84 deletions(-) -- 2.4.3

2 28

[libvirt] [PATCH 0/3] nodeinfo: Various fixes
by Andrea Bolognani 20 Jul '15

20 Jul '15

This series fixes a bunch of issues currently affecting nodeinfo and related tests. Andrea Bolognani (3): tests: Restore links in deconfigured-cpus nodeinfo test nodeinfo: Add nodeGetPresentCPUBitmap() to libvirt_private.syms nodeinfo: Fix nodeGetCPUBitmap()'s fallback code path src/libvirt_private.syms | 1 + src/nodeinfo.c | 8 ++++- .../cpu/cpu128/topology/core_id | 2 +- .../cpu/cpu16/topology/core_id | 2 +- .../cpu/cpu24/topology/core_id | 2 +- .../cpu/cpu48/topology/core_id | 2 +- .../cpu/cpu72/topology/core_id | 2 +- .../linux-deconfigured-cpus/node/node0/cpu0 | 1 + .../linux-deconfigured-cpus/node/node0/cpu1 | 1 + .../linux-deconfigured-cpus/node/node0/cpu10 | 1 + .../linux-deconfigured-cpus/node/node0/cpu100 | 1 + .../linux-deconfigured-cpus/node/node0/cpu101 | 1 + .../linux-deconfigured-cpus/node/node0/cpu102 | 1 + .../linux-deconfigured-cpus/node/node0/cpu103 | 1 + .../linux-deconfigured-cpus/node/node0/cpu11 | 1 + .../linux-deconfigured-cpus/node/node0/cpu12 | 1 + .../linux-deconfigured-cpus/node/node0/cpu13 | 1 + .../linux-deconfigured-cpus/node/node0/cpu14 | 1 + .../linux-deconfigured-cpus/node/node0/cpu144 | 1 + .../linux-deconfigured-cpus/node/node0/cpu145 | 1 + .../linux-deconfigured-cpus/node/node0/cpu146 | 1 + .../linux-deconfigured-cpus/node/node0/cpu147 | 1 + .../linux-deconfigured-cpus/node/node0/cpu148 | 1 + .../linux-deconfigured-cpus/node/node0/cpu149 | 1 + .../linux-deconfigured-cpus/node/node0/cpu15 | 1 + .../linux-deconfigured-cpus/node/node0/cpu150 | 1 + .../linux-deconfigured-cpus/node/node0/cpu151 | 1 + .../linux-deconfigured-cpus/node/node0/cpu152 | 1 + .../linux-deconfigured-cpus/node/node0/cpu153 | 1 + .../linux-deconfigured-cpus/node/node0/cpu154 | 1 + .../linux-deconfigured-cpus/node/node0/cpu155 | 1 + .../linux-deconfigured-cpus/node/node0/cpu156 | 1 + .../linux-deconfigured-cpus/node/node0/cpu157 | 1 + .../linux-deconfigured-cpus/node/node0/cpu158 | 1 + .../linux-deconfigured-cpus/node/node0/cpu159 | 1 + .../linux-deconfigured-cpus/node/node0/cpu16 | 1 + .../linux-deconfigured-cpus/node/node0/cpu17 | 1 + .../linux-deconfigured-cpus/node/node0/cpu18 | 1 + .../linux-deconfigured-cpus/node/node0/cpu19 | 1 + .../linux-deconfigured-cpus/node/node0/cpu2 | 1 + .../linux-deconfigured-cpus/node/node0/cpu20 | 1 + .../linux-deconfigured-cpus/node/node0/cpu21 | 1 + .../linux-deconfigured-cpus/node/node0/cpu22 | 1 + .../linux-deconfigured-cpus/node/node0/cpu23 | 1 + .../linux-deconfigured-cpus/node/node0/cpu24 | 1 + .../linux-deconfigured-cpus/node/node0/cpu25 | 1 + .../linux-deconfigured-cpus/node/node0/cpu26 | 1 + .../linux-deconfigured-cpus/node/node0/cpu27 | 1 + .../linux-deconfigured-cpus/node/node0/cpu28 | 1 + .../linux-deconfigured-cpus/node/node0/cpu29 | 1 + .../linux-deconfigured-cpus/node/node0/cpu3 | 1 + .../linux-deconfigured-cpus/node/node0/cpu30 | 1 + .../linux-deconfigured-cpus/node/node0/cpu31 | 1 + .../linux-deconfigured-cpus/node/node0/cpu32 | 1 + .../linux-deconfigured-cpus/node/node0/cpu33 | 1 + .../linux-deconfigured-cpus/node/node0/cpu34 | 1 + .../linux-deconfigured-cpus/node/node0/cpu35 | 1 + .../linux-deconfigured-cpus/node/node0/cpu36 | 1 + .../linux-deconfigured-cpus/node/node0/cpu37 | 1 + .../linux-deconfigured-cpus/node/node0/cpu38 | 1 + .../linux-deconfigured-cpus/node/node0/cpu39 | 1 + .../linux-deconfigured-cpus/node/node0/cpu4 | 1 + .../linux-deconfigured-cpus/node/node0/cpu5 | 1 + .../linux-deconfigured-cpus/node/node0/cpu56 | 1 + .../linux-deconfigured-cpus/node/node0/cpu57 | 1 + .../linux-deconfigured-cpus/node/node0/cpu58 | 1 + .../linux-deconfigured-cpus/node/node0/cpu59 | 1 + .../linux-deconfigured-cpus/node/node0/cpu6 | 1 + .../linux-deconfigured-cpus/node/node0/cpu60 | 1 + .../linux-deconfigured-cpus/node/node0/cpu61 | 1 + .../linux-deconfigured-cpus/node/node0/cpu62 | 1 + .../linux-deconfigured-cpus/node/node0/cpu63 | 1 + .../linux-deconfigured-cpus/node/node0/cpu64 | 1 + .../linux-deconfigured-cpus/node/node0/cpu65 | 1 + .../linux-deconfigured-cpus/node/node0/cpu66 | 1 + .../linux-deconfigured-cpus/node/node0/cpu67 | 1 + .../linux-deconfigured-cpus/node/node0/cpu68 | 1 + .../linux-deconfigured-cpus/node/node0/cpu69 | 1 + .../linux-deconfigured-cpus/node/node0/cpu7 | 1 + .../linux-deconfigured-cpus/node/node0/cpu70 | 1 + .../linux-deconfigured-cpus/node/node0/cpu71 | 1 + .../linux-deconfigured-cpus/node/node0/cpu8 | 1 + .../linux-deconfigured-cpus/node/node0/cpu80 | 1 + .../linux-deconfigured-cpus/node/node0/cpu81 | 1 + .../linux-deconfigured-cpus/node/node0/cpu82 | 1 + .../linux-deconfigured-cpus/node/node0/cpu83 | 1 + .../linux-deconfigured-cpus/node/node0/cpu84 | 1 + .../linux-deconfigured-cpus/node/node0/cpu85 | 1 + .../linux-deconfigured-cpus/node/node0/cpu86 | 1 + .../linux-deconfigured-cpus/node/node0/cpu87 | 1 + .../linux-deconfigured-cpus/node/node0/cpu88 | 1 + .../linux-deconfigured-cpus/node/node0/cpu89 | 1 + .../linux-deconfigured-cpus/node/node0/cpu9 | 1 + .../linux-deconfigured-cpus/node/node0/cpu90 | 1 + .../linux-deconfigured-cpus/node/node0/cpu91 | 1 + .../linux-deconfigured-cpus/node/node0/cpu92 | 1 + .../linux-deconfigured-cpus/node/node0/cpu93 | 1 + .../linux-deconfigured-cpus/node/node0/cpu94 | 1 + .../linux-deconfigured-cpus/node/node0/cpu95 | 1 + .../linux-deconfigured-cpus/node/node0/cpu96 | 1 + .../linux-deconfigured-cpus/node/node0/cpu97 | 1 + .../linux-deconfigured-cpus/node/node0/cpu98 | 1 + .../linux-deconfigured-cpus/node/node0/cpu99 | 1 + .../linux-deconfigured-cpus/node/node0/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node1/cpu40 | 1 + .../linux-deconfigured-cpus/node/node1/cpu41 | 1 + .../linux-deconfigured-cpus/node/node1/cpu42 | 1 + .../linux-deconfigured-cpus/node/node1/cpu43 | 1 + .../linux-deconfigured-cpus/node/node1/cpu44 | 1 + .../linux-deconfigured-cpus/node/node1/cpu45 | 1 + .../linux-deconfigured-cpus/node/node1/cpu46 | 1 + .../linux-deconfigured-cpus/node/node1/cpu47 | 1 + .../linux-deconfigured-cpus/node/node1/cpu48 | 1 + .../linux-deconfigured-cpus/node/node1/cpu49 | 1 + .../linux-deconfigured-cpus/node/node1/cpu50 | 1 + .../linux-deconfigured-cpus/node/node1/cpu51 | 1 + .../linux-deconfigured-cpus/node/node1/cpu52 | 1 + .../linux-deconfigured-cpus/node/node1/cpu53 | 1 + .../linux-deconfigured-cpus/node/node1/cpu54 | 1 + .../linux-deconfigured-cpus/node/node1/cpu55 | 1 + .../linux-deconfigured-cpus/node/node1/cpu72 | 1 + .../linux-deconfigured-cpus/node/node1/cpu73 | 1 + .../linux-deconfigured-cpus/node/node1/cpu74 | 1 + .../linux-deconfigured-cpus/node/node1/cpu75 | 1 + .../linux-deconfigured-cpus/node/node1/cpu76 | 1 + .../linux-deconfigured-cpus/node/node1/cpu77 | 1 + .../linux-deconfigured-cpus/node/node1/cpu78 | 1 + .../linux-deconfigured-cpus/node/node1/cpu79 | 1 + .../linux-deconfigured-cpus/node/node1/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node16/cpu104 | 1 + .../linux-deconfigured-cpus/node/node16/cpu105 | 1 + .../linux-deconfigured-cpus/node/node16/cpu106 | 1 + .../linux-deconfigured-cpus/node/node16/cpu107 | 1 + .../linux-deconfigured-cpus/node/node16/cpu108 | 1 + .../linux-deconfigured-cpus/node/node16/cpu109 | 1 + .../linux-deconfigured-cpus/node/node16/cpu110 | 1 + .../linux-deconfigured-cpus/node/node16/cpu111 | 1 + .../linux-deconfigured-cpus/node/node16/cpu112 | 1 + .../linux-deconfigured-cpus/node/node16/cpu113 | 1 + .../linux-deconfigured-cpus/node/node16/cpu114 | 1 + .../linux-deconfigured-cpus/node/node16/cpu115 | 1 + .../linux-deconfigured-cpus/node/node16/cpu116 | 1 + .../linux-deconfigured-cpus/node/node16/cpu117 | 1 + .../linux-deconfigured-cpus/node/node16/cpu118 | 1 + .../linux-deconfigured-cpus/node/node16/cpu119 | 1 + .../linux-deconfigured-cpus/node/node16/meminfo | 36 ++++++++++---------- .../linux-deconfigured-cpus/node/node17/cpu120 | 1 + .../linux-deconfigured-cpus/node/node17/cpu121 | 1 + .../linux-deconfigured-cpus/node/node17/cpu122 | 1 + .../linux-deconfigured-cpus/node/node17/cpu123 | 1 + .../linux-deconfigured-cpus/node/node17/cpu124 | 1 + .../linux-deconfigured-cpus/node/node17/cpu125 | 1 + .../linux-deconfigured-cpus/node/node17/cpu126 | 1 + .../linux-deconfigured-cpus/node/node17/cpu127 | 1 + .../linux-deconfigured-cpus/node/node17/cpu128 | 1 + .../linux-deconfigured-cpus/node/node17/cpu129 | 1 + .../linux-deconfigured-cpus/node/node17/cpu130 | 1 + .../linux-deconfigured-cpus/node/node17/cpu131 | 1 + .../linux-deconfigured-cpus/node/node17/cpu132 | 1 + .../linux-deconfigured-cpus/node/node17/cpu133 | 1 + .../linux-deconfigured-cpus/node/node17/cpu134 | 1 + .../linux-deconfigured-cpus/node/node17/cpu135 | 1 + .../linux-deconfigured-cpus/node/node17/cpu136 | 1 + .../linux-deconfigured-cpus/node/node17/cpu137 | 1 + .../linux-deconfigured-cpus/node/node17/cpu138 | 1 + .../linux-deconfigured-cpus/node/node17/cpu139 | 1 + .../linux-deconfigured-cpus/node/node17/cpu140 | 1 + .../linux-deconfigured-cpus/node/node17/cpu141 | 1 + .../linux-deconfigured-cpus/node/node17/cpu142 | 1 + .../linux-deconfigured-cpus/node/node17/cpu143 | 1 + .../linux-deconfigured-cpus/node/node17/meminfo | 38 +++++++++++----------- 171 files changed, 246 insertions(+), 79 deletions(-) create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu10 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu100 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu101 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu102 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu103 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu11 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu12 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu13 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu14 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu144 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu145 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu146 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu147 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu148 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu149 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu15 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu150 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu151 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu152 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu153 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu154 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu155 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu156 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu157 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu158 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu159 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu16 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu17 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu18 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu19 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu20 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu21 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu22 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu23 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu24 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu25 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu26 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu27 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu28 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu29 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu30 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu31 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu32 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu33 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu34 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu35 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu36 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu37 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu38 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu39 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu56 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu57 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu58 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu59 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu60 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu61 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu62 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu63 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu64 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu65 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu66 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu67 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu68 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu69 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu7 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu70 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu71 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu8 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu80 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu81 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu82 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu83 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu84 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu85 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu86 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu87 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu88 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu89 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu9 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu90 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu91 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu92 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu93 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu94 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu95 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu96 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu97 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu98 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node0/cpu99 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu40 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu41 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu42 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu43 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu44 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu45 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu46 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu47 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu48 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu49 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu50 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu51 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu52 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu53 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu54 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu55 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu72 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu73 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu74 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu75 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu76 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu77 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu78 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node1/cpu79 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu104 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu105 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu106 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu107 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu108 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu109 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu110 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu111 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu112 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu113 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu114 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu115 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu116 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu117 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu118 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node16/cpu119 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu120 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu121 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu122 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu123 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu124 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu125 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu126 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu127 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu128 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu129 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu130 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu131 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu132 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu133 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu134 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu135 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu136 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu137 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu138 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu139 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu140 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu141 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu142 create mode 120000 tests/nodeinfodata/linux-deconfigured-cpus/node/node17/cpu143 -- 2.4.3

2 4

[libvirt] [PATCH] rpc: Remove keepalive_required option
by Martin Kletzander 20 Jul '15

20 Jul '15

Since its introduction in 2011 (particularly in commit f4324e329275), the option doesn't work. It just effectively disables all incoming connections. That's because the client private data that contain the 'keepalive_supported' boolean, are initialized to zeroes so the bool is false and the only other place where the bool is used is when checking whether the client supports keepalive. Thus, according to the server, no client supports keepalive. Removing this instead of fixing it is better because a) apparently nobody ever tried it since 2011 (4 years without one month) and b) we cannot know whether the client supports keepalive until we get a ping or pong keepalive packet. And that won't happen untile after we dispatched the ConnectOpen call. Another two reasons would be c) the keepalive_required was tracked on the server level, but keepalive_supported was in private data of the client as well as the check that was made in the remote layer, thus making all other instances of virNetServer miss this feature unless they all implemented it for themselves and d) we can always add it back in case there is a request and a use-case for it. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- daemon/libvirtd-config.c | 4 ---- daemon/libvirtd-config.h | 2 -- daemon/libvirtd.aug | 2 -- daemon/libvirtd.c | 2 -- daemon/libvirtd.conf | 7 ------ daemon/libvirtd.h | 1 - daemon/remote.c | 8 +------ daemon/test_libvirtd.aug.in | 2 -- src/libvirt_remote.syms | 1 - src/locking/lock_daemon.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetserver.c | 25 +--------------------- src/rpc/virnetserver.h | 3 --- .../virnetdaemondata/output-data-admin-nomdns.json | 2 -- .../virnetdaemondata/output-data-anon-clients.json | 1 - .../output-data-initial-nomdns.json | 1 - tests/virnetdaemondata/output-data-initial.json | 1 - tests/virnetdaemontest.c | 2 +- 18 files changed, 5 insertions(+), 63 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 10dcc423d2db..c31c8b2e9ab5 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -292,7 +292,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->keepalive_interval = 5; data->keepalive_count = 5; - data->keepalive_required = 0; data->admin_min_workers = 5; data->admin_max_workers = 20; @@ -302,7 +301,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->admin_keepalive_interval = 5; data->admin_keepalive_count = 5; - data->admin_keepalive_required = 0; localhost = virGetHostname(); if (localhost == NULL) { @@ -471,11 +469,9 @@ daemonConfigLoadOptions(struct daemonConfig *data, GET_CONF_INT(conf, filename, keepalive_interval); GET_CONF_UINT(conf, filename, keepalive_count); - GET_CONF_UINT(conf, filename, keepalive_required); GET_CONF_INT(conf, filename, admin_keepalive_interval); GET_CONF_UINT(conf, filename, admin_keepalive_count); - GET_CONF_UINT(conf, filename, admin_keepalive_required); return 0; diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 9cdae1a0cb59..3e1971d67f05 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -81,7 +81,6 @@ struct daemonConfig { int keepalive_interval; unsigned int keepalive_count; - int keepalive_required; int admin_min_workers; int admin_max_workers; @@ -91,7 +90,6 @@ struct daemonConfig { int admin_keepalive_interval; unsigned int admin_keepalive_count; - int admin_keepalive_required; }; diff --git a/daemon/libvirtd.aug b/daemon/libvirtd.aug index a70aa1dddf90..7c7992dd0568 100644 --- a/daemon/libvirtd.aug +++ b/daemon/libvirtd.aug @@ -79,11 +79,9 @@ module Libvirtd = let keepalive_entry = int_entry "keepalive_interval" | int_entry "keepalive_count" - | bool_entry "keepalive_required" let admin_keepalive_entry = int_entry "admin_keepalive_interval" | int_entry "admin_keepalive_count" - | bool_entry "admin_keepalive_required" let misc_entry = str_entry "host_uuid" diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 71db4a042c7f..250094bd21dd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1389,7 +1389,6 @@ int main(int argc, char **argv) { config->max_anonymous_clients, config->keepalive_interval, config->keepalive_count, - !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, remoteClientInitHook, NULL, @@ -1464,7 +1463,6 @@ int main(int argc, char **argv) { 0, config->admin_keepalive_interval, config->admin_keepalive_count, - !!config->admin_keepalive_required, NULL, remoteAdmClientInitHook, NULL, diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf index ac06cdd79103..cd990b28f744 100644 --- a/daemon/libvirtd.conf +++ b/daemon/libvirtd.conf @@ -440,14 +440,7 @@ # #keepalive_interval = 5 #keepalive_count = 5 -# -# If set to 1, libvirtd will refuse to talk to clients that do not -# support keepalive protocol. Defaults to 0. -# -#keepalive_required = 1 # Keepalive settings for the admin interface #admin_keepalive_interval = 5 #admin_keepalive_count = 5 -# -#admin_keepalive_required = 1 diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 8c1a904893ab..efd4823ae18e 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -72,7 +72,6 @@ struct daemonClientPrivate { virConnectPtr conn; daemonClientStreamPtr streams; - bool keepalive_supported; }; /* Separate private data for admin connection */ diff --git a/daemon/remote.c b/daemon/remote.c index e9e2dcae80e0..3a3eb0913088 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1290,7 +1290,7 @@ void *remoteClientInitHook(virNetServerClientPtr client, /*----- Functions. -----*/ static int -remoteDispatchConnectOpen(virNetServerPtr server, +remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg ATTRIBUTE_UNUSED, virNetMessageErrorPtr rerr, @@ -1309,12 +1309,6 @@ remoteDispatchConnectOpen(virNetServerPtr server, goto cleanup; } - if (virNetServerKeepAliveRequired(server) && !priv->keepalive_supported) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("keepalive support is required to connect")); - goto cleanup; - } - name = args->name ? *args->name : NULL; /* If this connection arrived on a readonly socket, force diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in index 4921cbfb86b3..3c29aac9747f 100644 --- a/daemon/test_libvirtd.aug.in +++ b/daemon/test_libvirtd.aug.in @@ -57,7 +57,5 @@ module Test_libvirtd = { "host_uuid" = "00000000-0000-0000-0000-000000000000" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } - { "keepalive_required" = "1" } { "admin_keepalive_interval" = "5" } { "admin_keepalive_count" = "5" } - { "admin_keepalive_required" = "1" } diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 6bfdcfa819bf..90a453c8be9c 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -101,7 +101,6 @@ virNetServerAddProgram; virNetServerAddService; virNetServerClose; virNetServerHasClients; -virNetServerKeepAliveRequired; virNetServerNew; virNetServerNewPostExecRestart; virNetServerPreExecRestart; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ecbe03a4c154..c03502459acd 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -151,7 +151,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged) if (!(lockd->srv = virNetServerNew(1, 1, 0, config->max_clients, config->max_clients, -1, 0, - false, NULL, + NULL, virLockDaemonClientNew, virLockDaemonClientPreExecRestart, virLockDaemonClientFree, diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 110a55662be0..48a3597ed274 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -925,7 +925,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) return -1; if (!(srv = virNetServerNew(0, 0, 0, 1, - 0, -1, 0, false, + 0, -1, 0, NULL, virLXCControllerClientPrivateNew, NULL, diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 60a9714f6096..80b5588bf3c9 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -69,7 +69,6 @@ struct _virNetServer { int keepaliveInterval; unsigned int keepaliveCount; - bool keepaliveRequired; #ifdef WITH_GNUTLS virNetTLSContextPtr tls; @@ -312,7 +311,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - bool keepaliveRequired, const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, @@ -338,7 +336,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, srv->nclients_unauth_max = max_anonymous_clients; srv->keepaliveInterval = keepaliveInterval; srv->keepaliveCount = keepaliveCount; - srv->keepaliveRequired = keepaliveRequired; srv->clientPrivNew = clientPrivNew; srv->clientPrivPreExecRestart = clientPrivPreExecRestart; srv->clientPrivFree = clientPrivFree; @@ -380,7 +377,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, unsigned int max_anonymous_clients; unsigned int keepaliveInterval; unsigned int keepaliveCount; - bool keepaliveRequired; const char *mdnsGroupName = NULL; if (virJSONValueObjectGetNumberUint(object, "min_workers", &min_workers) < 0) { @@ -423,11 +419,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, _("Missing keepaliveCount data in JSON document")); goto error; } - if (virJSONValueObjectGetBoolean(object, "keepaliveRequired", &keepaliveRequired) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing keepaliveRequired data in JSON document")); - goto error; - } if (virJSONValueObjectHasKey(object, "mdnsGroupName") && (!(mdnsGroupName = virJSONValueObjectGetString(object, "mdnsGroupName")))) { @@ -440,7 +431,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, priority_workers, max_clients, max_anonymous_clients, keepaliveInterval, keepaliveCount, - keepaliveRequired, mdnsGroupName, + mdnsGroupName, clientPrivNew, clientPrivPreExecRestart, clientPrivFree, clientPrivOpaque))) goto error; @@ -573,11 +564,6 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) _("Cannot set keepaliveCount data in JSON document")); goto error; } - if (virJSONValueObjectAppendBoolean(object, "keepaliveRequired", srv->keepaliveRequired) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot set keepaliveRequired data in JSON document")); - goto error; - } if (srv->mdnsGroupName && virJSONValueObjectAppendString(object, "mdnsGroupName", srv->mdnsGroupName) < 0) { @@ -786,15 +772,6 @@ void virNetServerClose(virNetServerPtr srv) virObjectUnlock(srv); } -bool virNetServerKeepAliveRequired(virNetServerPtr srv) -{ - bool required; - virObjectLock(srv); - required = srv->keepaliveRequired; - virObjectUnlock(srv); - return required; -} - static inline size_t virNetServerTrackPendingAuthLocked(virNetServerPtr srv) { diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 0e16e8fb1bf0..89d8db9b9ee4 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -41,7 +41,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - bool keepaliveRequired, const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, @@ -74,8 +73,6 @@ int virNetServerSetTLSContext(virNetServerPtr srv, virNetTLSContextPtr tls); # endif -bool virNetServerKeepAliveRequired(virNetServerPtr srv); - size_t virNetServerTrackPendingAuth(virNetServerPtr srv); size_t virNetServerTrackCompletedAuth(virNetServerPtr srv); diff --git a/tests/virnetdaemondata/output-data-admin-nomdns.json b/tests/virnetdaemondata/output-data-admin-nomdns.json index 5df71a0d88c8..a814aeb80614 100644 --- a/tests/virnetdaemondata/output-data-admin-nomdns.json +++ b/tests/virnetdaemondata/output-data-admin-nomdns.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, @@ -70,7 +69,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-anon-clients.json b/tests/virnetdaemondata/output-data-anon-clients.json index 4e4332691aa7..05fc0ae00d3f 100644 --- a/tests/virnetdaemondata/output-data-anon-clients.json +++ b/tests/virnetdaemondata/output-data-anon-clients.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 10, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-initial-nomdns.json b/tests/virnetdaemondata/output-data-initial-nomdns.json index bef54bf94ad5..400e47bc9463 100644 --- a/tests/virnetdaemondata/output-data-initial-nomdns.json +++ b/tests/virnetdaemondata/output-data-initial-nomdns.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-initial.json b/tests/virnetdaemondata/output-data-initial.json index 9afa791d91fc..e875cffe5c01 100644 --- a/tests/virnetdaemondata/output-data-initial.json +++ b/tests/virnetdaemondata/output-data-initial.json @@ -8,7 +8,6 @@ "max_anonymous_clients": 100, "keepaliveInterval": 120, "keepaliveCount": 5, - "keepaliveRequired": true, "mdnsGroupName": "libvirtTest", "services": [ { diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index ef45018f5873..fb8a6c0c0ec5 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -50,7 +50,7 @@ testCreateServer(const char *host, int family) } if (!(srv = virNetServerNew(10, 50, 5, 100, 10, - 120, 5, true, + 120, 5, mdns_group, NULL, NULL, -- 2.4.6

1 0

[libvirt] [PATCH] nodeinfo: fix build on FreeBSD
by Roman Bogorodskiy 20 Jul '15

20 Jul '15

Currently, build fails on FreeBSD with: CC libvirt_driver_la-nodeinfo.lo nodeinfo.c:1941:56: error: use of undeclared identifier 'SYSFS_SYSTEM_PATH' const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH; ^ 1 error generated. This is caused by commit b97b3048 that added sysfs_prefix to nodeCapsInitNUMA and used SYSFS_CPU_PATH. Fix it by unconditionally defining SYSFS_CPU_PATH instead of defining it under #ifdef __linux__. --- src/nodeinfo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c874fa6..d7d0223 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -59,6 +59,8 @@ VIR_LOG_INIT("nodeinfo"); +#define SYSFS_SYSTEM_PATH "/sys/devices/system" + #if defined(__FreeBSD__) || defined(__APPLE__) static int appleFreebsdNodeGetCPUCount(void) @@ -283,7 +285,6 @@ freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, #ifdef __linux__ # define CPUINFO_PATH "/proc/cpuinfo" -# define SYSFS_SYSTEM_PATH "/sys/devices/system" # define PROCSTAT_PATH "/proc/stat" # define MEMINFO_PATH "/proc/meminfo" # define SYSFS_MEMORY_SHARED_PATH "/sys/kernel/mm/ksm" -- 2.4.5

2 2