- Devel - libvirt List Archives

[libvirt] [PATCH] phyp: Fix memory leak in phypUUIDTable_Push
by ZhiPeng Lu 17 Jul '17

17 Jul '17

@remote_file, allocated by virAsprintf, was not freed and leaked. Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn> --- src/phyp/phyp_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 9121581..662e2f7 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -568,6 +568,7 @@ phypUUIDTable_Push(virConnectPtr conn) ret = 0; cleanup: + VIR_FREE(remote_file); if (channel) { libssh2_channel_send_eof(channel); libssh2_channel_wait_eof(channel); -- 1.8.3.1

1 0

[libvirt] [PATCH 0/3] exposing busy polling support for vhost-net
by sferdjao＠redhat.com 17 Jul '17

17 Jul '17

From: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)redhat.com> In version 2.7.0, QEMU introduced support of busy polling for vhost-net [0]. To avoid paraphrasing original authors of that feature and the purpose it I prefer to share a pointer [1]. This patch serie exposes throught the NIC driver-specific element a new option 'poll_us'. That option is only available with the backend driver 'vhost'. The option 'poll_us' takes a positive number. 0 means that the option is not going to be exposed. [0] 69e87b32680a41d9761191443587c595b6f5fc3f [1] https://lists.gnu.org/archive/html/qemu-devel/2016-11/msg04595.html Sahid Orentino Ferdjaoui (3): qemu: add capability for vhost-net busy polling conf: introduce 'poll_us' attribute for domain interface qemu: add busy polling support docs/formatdomain.html.in | 12 ++++++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 +++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 ++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++++++++++++++++ src/qemu/qemu_hotplug.c | 12 +++++++++++ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-net-virtio-netdev-pollus-fail.xml | 23 ++++++++++++++++++++++ ...xml2argv-net-virtio-netdev-pollus-qemu-fail.xml | 23 ++++++++++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.args | 23 ++++++++++++++++++++++ .../qemuxml2argv-net-virtio-netdev-pollus.xml | 23 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 9 +++++++++ 18 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus-qemu-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev-pollus.xml -- 2.9.4

6 11

[libvirt] [PATCH v4 00/14] Make virNodeDeviceObj and virNodeDeviceObjList private
by John Ferlan 17 Jul '17

17 Jul '17

v3 here: https://www.redhat.com/archives/libvir-list/2017-June/msg00155.html Most patches were ACK'd in v3 (some with conditions). Changes this time around are: -> Patch1: Make the call to virNodeDeviceObjFree in dev_refresh() prior to dev_create Move the virNodeDeviceObjFree in device_removed() to after the Unlock as it avoids the need for { } else { } (besides the *ObjFree checks for !dev anyway). -> Patch2: Change as requested to remove the unnecessary obj = NULL in testDestroyVport Change as requested to goto cleanup in testStoragePoolDestroy -> Patch3: Fixed the comments to have the right variable name -> Patch4: Use "if ((obj = ...))) {" type syntax as suggested. -> Patch5-9: No change -> Patch10: Fix commit description -> Patch11: No change -> Patch 12: Fix the testNodeDeviceDestroy logic -> Patch 13-14 New patches that take the next two logical steps - objectifying the virNodeDeviceObjList and using a HashTable for access (along with all those bells and whistles). Finally remove the need for driver level locks when accessing the @devs ObjList. John Ferlan (14): nodedev: Alter virNodeDeviceObjRemove test: Adjust cleanup/error paths for nodedev test APIs nodedev: Use common naming for virnodedeviceobj nodedev: Use consistent names for driver variables nodedev: Introduce virNodeDeviceObjNew nodedev: Introduce virNodeDeviceObjListNew nodedev: Alter node device obj list function names nodedev: Dereference the obj/def in virNodeDeviceObjListFind* APIs nodedev: Introduce virNodeDeviceGetSCSIHostCaps nodedev: Introduce virNodeDeviceObjListFindSCSIHostByWWNs nodedev: Privatize _virNodeDeviceObj and _virNodeDeviceObjList nodedev: Convert virNodeDeviceObj to use virObjectLockable nodedev: Convert virNodeDeviceObjListPtr to use hash tables nodedev: Remove driver locks around object list mgmt code src/conf/node_device_conf.c | 82 +++ src/conf/node_device_conf.h | 20 +- src/conf/virnodedeviceobj.c | 846 ++++++++++++++++++++---------- src/conf/virnodedeviceobj.h | 67 +-- src/libvirt_private.syms | 20 +- src/node_device/node_device_driver.c | 201 +++---- src/node_device/node_device_hal.c | 51 +- src/node_device/node_device_linux_sysfs.c | 77 +-- src/node_device/node_device_udev.c | 63 +-- src/test/test_driver.c | 133 +++-- 10 files changed, 895 insertions(+), 665 deletions(-) -- 2.9.4

2 28

[libvirt] [PATCH RESEND] virpcimock: Fix memory leak in pci_driver_new
by ZhiPeng Lu 16 Jul '17

16 Jul '17

@driverpath, allocated by virAsprintfQuiet, was not freed and leaked. Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn> --- tests/virpcimock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index e9408aa..dec9e01 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -480,6 +480,7 @@ pci_driver_new(const char *name, int fail, ...) if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) ABORT_OOM(); + VIR_FREE(driverpath); } static struct pciDriver * -- 1.8.3.1

2 1

[libvirt] [PATCH] util: increase libnl buffer size to 1M
by ZhiPeng Lu 16 Jul '17

16 Jul '17

nl_recv() returns the error "No buffer space available" when using virsh destroy domain with 240 or more passhthrough network interfaces. The patch increases libnl sock receive buffer size to 1M, and nl_recv() doesn't return error when destroying domain with 512 network interfaces. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/util/virnetlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 92ecf77..bb56c54 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -189,10 +189,10 @@ virNetlinkCreateSocket(int protocol) goto error; } - if (virNetlinkSetBufferSize(nlhandle, 131702, 0) < 0) { + if (virNetlinkSetBufferSize(nlhandle, 1048576, 0) < 0) { virReportSystemError(errno, "%s", _("cannot set netlink socket buffer " - "size to 128k")); + "size to 1M")); goto error; } nl_socket_enable_msg_peek(nlhandle); -- 1.8.3.1

5 4

[libvirt] [PATCH 00/17] nwfilter adjustments for common object
by John Ferlan 16 Jul '17

16 Jul '17

As noted in the recently posted virObject changes: https://www.redhat.com/archives/libvir-list/2017-June/msg00070.html I believe I've found a way to handle the recursive lock situation that made it "difficult" (at best) to convert the nwfilter to the common object model. It does involve a bit of a circuitous route to "temporarily implement" the refcnt in nwfilter, but that gets removed rather quickly. Beyond that there's a bit of setup, the first few patches deal with issues seen while working through this code and then more setup for getting things to be more common with other drivers (so when they disappear a bit further into the future) into some new object it'll be obvious where/why they're there. The middle few patches deal with an insane naming scheme for a single function that seemed to keep prefixing "_" as a new function was created. So it's a bit of name change, but makes it easier to think about. The last 4 patches deal with the conversion to use a @ref, a change to a list locking hash table model, the modificiation of the recursive instantiation to use @refs rather than @locks, and finally the change to use the existing lockable object. I have run these through the various avacodo nwfilter tests that I could find, but perhaps if someone that had a more "robust configuration" and wants to be a bit adventurous and also give the patches a whirl - that would be appreciated. John Ferlan (17): nwfilter: Fix return value comparison for virNWFilterTriggerVMFilterRebuild nwfilter: Fix possible corruption on failure path during LoadConfig nwfilter: Fix possible locking problem in LoadConfig error path nwfilter: Remove need for virNWFilterSaveXML nwfilter: Move virNWFilterSaveConfig virnwfilterobj nwfilter: Add configFile into virNWFilterObj nwfilter: Add @def into virNWFilterObjNew nwfilter: Clean up a couple nwfilter_driver error paths nwfilter: Consistently name virNWFilterPtr in driver nwfilter: Rename virNWFilterInstantiate nwfilter: Rename __virNWFilterInstantiateFilter nwfilter: Rename _virNWFilterInstantiateFilter nwfilter: Introduce virNWFilterObjListFindInstantiateFilter nwfilter: Add @refs logic to __virNWFilterObj nwfilter: Convert _virNWFilterObjList to be a virObjectLockable nwfilter: Remove recursive locking for nwfilter instantiation nwfilter: Convert virNWFilterObj to use virObjectLockable src/conf/nwfilter_conf.c | 43 --- src/conf/nwfilter_conf.h | 9 - src/conf/virnwfilterobj.c | 550 +++++++++++++++++++++++---------- src/conf/virnwfilterobj.h | 19 +- src/libvirt_private.syms | 6 +- src/nwfilter/nwfilter_driver.c | 51 ++- src/nwfilter/nwfilter_gentech_driver.c | 276 +++++++---------- 7 files changed, 542 insertions(+), 412 deletions(-) -- 2.9.4

2 50

[libvirt] [PATCH] docs: formatdomain: Tweak disk discard= docs
by Cole Robinson 15 Jul '17

15 Jul '17

Change from 'controls whether to discard ... requests are ignored' to 'controls whether discard requests ... are ignored' Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- Pushed as trivial docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 01c6fce23..c12efcf78 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3002,7 +3002,7 @@ </li> <li> The optional <code>discard</code> attribute controls whether - to discard (also known as "trim" or "unmap") requests are + discard requests (also known as "trim" or "unmap") are ignored or passed to the filesystem. The value can be either "unmap" (allow the discard request to be passed) or "ignore" (ignore the discard request). -- 2.13.0

1 0

[libvirt] [PATCH v2] qemu: Default hwclock source for sPAPR to RTC
by Kothapally Madhu Pavan 14 Jul '17

14 Jul '17

QEMU fails to launch a sPAPR guest with clock sources other that RTC. Internally qemu only uses RTC timer for hwclock. This patch reports the right error message instead of qemu erroring out when any other timer other than RTC is used. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8e7404d..b74800d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3025,6 +3025,7 @@ qemuDomainDefValidate(const virDomainDef *def, virQEMUCapsPtr qemuCaps = NULL; unsigned int topologycpus; int ret = -1; + size_t i; if (!(qemuCaps = virQEMUCapsCacheLookup(caps, driver->qemuCapsCache, @@ -3037,6 +3038,18 @@ qemuDomainDefValidate(const virDomainDef *def, goto cleanup; } + /* Only RTC timer is supported as hwclock for sPAPR machines */ + for (i = 0; i < def->clock.ntimers; i++) { + virDomainTimerDefPtr timer = def->clock.timers[i]; + if (ARCH_IS_PPC64(def->os.arch) && timer->name != VIR_DOMAIN_TIMER_NAME_RTC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for %s architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + goto cleanup; + } + } + /* On x86, UEFI requires ACPI */ if (def->os.loader && def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH && -- 1.8.3.1

2 1

[libvirt] qemu: hotplug virtio_scsi over lsilogic when sicsi controller is not present?
by Liang Yan 14 Jul '17

14 Jul '17

Hi, We hit some problems when we attached some lun devices in our vm, turns out that libvirt created lsilogic scsi controller automatically for these scsi devices, however these device works well under virtio_scsi controller. the current code logic is check lsilogic first, if qemu could not support it, then check virtio_scsi, however is it better to check virtio_scsi earlier? since it is supported better in qemu level? I am wondering which solution is better? 1. simple switch sequence and check virtio_scsi first 2. add extra option for "virsh attach-disk" to choose specific controller type Thanks, Liang ==================================== Code part is like below qemu_hotplug.c qemuDomainFindOrCreateSCSIDiskController /* No SCSI controller present, for backward compatibility we * now hotplug a controller */ if (VIR_ALLOC(cont) < 0) return NULL; cont->type = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; cont->idx = controller; cont->model = -1; VIR_INFO("No SCSI controller present, hotplugging one"); if (qemuDomainAttachControllerDevice(driver, qemu_domain_address.c qemuDomainSetSCSIControllerModel if (qemuDomainIsPSeries(def)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to determine model for scsi controller")); return -1;

3 4

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

14 Jul '17

A couple I forgot from earlier series, but a few things found since then along with some clarifications to make the ObjAdd processing a bit more like I've found for nwfilter, nodedev, and interface as well as making the ObjListRemove processing a bit clearer and more consistent. Along with the other series and the virObject v2 adjustments - this brings everything close enough to start sending the patches that will tie all this stuff together to create/use a common object model. John Ferlan (8): secret: Whitespace modification for secret_driver secret: Alter FindByUUID to expect the formatted uuidstr secret: Rename variable in virSecretObjListAdd secret: Clean up virSecretObjListAdd processing secret: Remove need for local configFile and base64File in ObjectAdd secret: Have virSecretObjNew consume newdef secret: Properly handle @def after virSecretObjAdd in driver secret: Handle object list removal and deletion properly src/conf/virsecretobj.c | 125 +++++++++++++++++++++------------------------ src/conf/virsecretobj.h | 2 +- src/secret/secret_driver.c | 50 ++++++++++++------ 3 files changed, 94 insertions(+), 83 deletions(-) -- 2.9.4

2 31

[libvirt] [PATCH 00/10] qemu: clean up formatting of networked disk sources
by Peter Krempa 14 Jul '17

14 Jul '17

Few cleanups I made to cleanup the def->JSON generator for qemu disk sources. Peter Krempa (10): qemu: command: Set port number only for TCP transport util: Extract helper to retrieve default port for network protocol util: storage: Fill in default ports for gluster and iscsi conf: Pre-fill default ports when parsing network disk sources qemu: command: Remove default port numbers for NBD and GLUSTER qemu: command: Call qemuGetDriveSourceProps only if necessary qemu: Move qemuGetDriveSourceProps to qemu_block qemu: block: Refactor and rename qemuGetDriveSourceProps qemu: block: refactor and rename qemuBuildGlusterDriveJSONHosts qemu: block: rename and refactor qemuBuildGlusterDriveJSON po/POTFILES.in | 1 + src/conf/domain_conf.c | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_block.c | 156 ++++++++++++++ src/qemu/qemu_block.h | 3 + src/qemu/qemu_command.c | 229 ++++----------------- src/util/virstoragefile.c | 65 ++++++ src/util/virstoragefile.h | 4 + .../generic-disk-network-http.xml | 4 +- .../qemuxml2xmlout-disk-drive-network-gluster.xml | 2 +- 10 files changed, 273 insertions(+), 195 deletions(-) -- 2.12.2

2 11

[libvirt] [PATCH 0/2] qemu: Add AAVMF32 to the list of known UEFIs
by dann frazier 13 Jul '17

13 Jul '17

v2: Add a virt-aa-helper-test case. dann frazier (2): qemu: Add AAVMF32 to the list of known UEFIs virt-aa-helper-test: Add test for aarch32 UEFI image path src/qemu/qemu_conf.c | 12 ++++++++---- tests/virt-aa-helper-test | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) -- 2.13.2

2 4

[libvirt] [PATCH 1/3] leasetime support for <dhcp> globally
by aruiz＠gnome.org 13 Jul '17

13 Jul '17

From: Alberto Ruiz <aruiz(a)gnome.org> --- docs/schemas/basictypes.rng | 16 +++++ docs/schemas/network.rng | 8 +++ src/conf/network_conf.c | 78 ++++++++++++++++++++++- src/conf/network_conf.h | 3 +- src/network/bridge_driver.c | 49 +++++++++++++- tests/networkxml2confdata/leasetime-days.conf | 17 +++++ tests/networkxml2confdata/leasetime-days.xml | 18 ++++++ tests/networkxml2confdata/leasetime-hours.conf | 17 +++++ tests/networkxml2confdata/leasetime-hours.xml | 18 ++++++ tests/networkxml2confdata/leasetime-infinite.conf | 17 +++++ tests/networkxml2confdata/leasetime-infinite.xml | 18 ++++++ tests/networkxml2confdata/leasetime-minutes.conf | 17 +++++ tests/networkxml2confdata/leasetime-minutes.xml | 18 ++++++ tests/networkxml2confdata/leasetime-seconds.conf | 17 +++++ tests/networkxml2confdata/leasetime-seconds.xml | 18 ++++++ tests/networkxml2confdata/leasetime.conf | 17 +++++ tests/networkxml2confdata/leasetime.xml | 18 ++++++ tests/networkxml2conftest.c | 7 ++ 18 files changed, 368 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/leasetime-days.conf create mode 100644 tests/networkxml2confdata/leasetime-days.xml create mode 100644 tests/networkxml2confdata/leasetime-hours.conf create mode 100644 tests/networkxml2confdata/leasetime-hours.xml create mode 100644 tests/networkxml2confdata/leasetime-infinite.conf create mode 100644 tests/networkxml2confdata/leasetime-infinite.xml create mode 100644 tests/networkxml2confdata/leasetime-minutes.conf create mode 100644 tests/networkxml2confdata/leasetime-minutes.xml create mode 100644 tests/networkxml2confdata/leasetime-seconds.conf create mode 100644 tests/networkxml2confdata/leasetime-seconds.xml create mode 100644 tests/networkxml2confdata/leasetime.conf create mode 100644 tests/networkxml2confdata/leasetime.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 1b4f980e7..8a76c235a 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -518,4 +518,20 @@ </element> </define> + <define name="leaseTimeUnit"> + <choice> + <value>seconds</value> + <value>minutes</value> + <value>hours</value> + <value>days</value> + </choice> + </define> + + <define name="leaseTime"> + <data type="long"> + <param name="minInclusive">-1</param> + <param name="maxInclusive">4294967295</param> + </data> + </define> + </grammar> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 1a18e64b2..4b8056ab6 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -340,6 +340,14 @@  <element name="dhcp"> + <optional> + <element name="leasetime"> + <optional> + <attribute name="unit"><ref name="leaseTimeUnit"/></attribute> + </optional> + <ref name="leaseTime"/> + </element> + </optional> <zeroOrMore> <element name="range"> <attribute name="start"><ref name="ipAddr"/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index aa397768c..6f051493f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -30,6 +30,8 @@ #include <fcntl.h> #include <string.h> #include <dirent.h> +#include <stdlib.h> +#include <inttypes.h> #include "virerror.h" #include "datatypes.h" @@ -1031,12 +1033,82 @@ virNetworkDHCPHostDefParseXML(const char *networkName, return ret; } +static int64_t +virNetworkDHCPDefGetLeaseTime (xmlNodePtr node, + xmlXPathContextPtr ctxt, + bool *error) +{ + int64_t multiplier, result = -1; + char *leaseString, *leaseUnit; + xmlNodePtr save; + + *error = 0; + + save = ctxt->node; + ctxt->node = node; + + leaseString = virXPathString ("string(./leasetime/text())", ctxt); + leaseUnit = virXPathString ("string(./leasetime/@unit)", ctxt); + + /* If value is not present we set the value to -2 */ + if (leaseString == NULL) { + result = -2; + goto cleanup; + } + + if (leaseUnit == NULL || strcmp (leaseUnit, "seconds") == 0) + multiplier = 1; + else if (strcmp (leaseUnit, "minutes") == 0) + multiplier = 60; + else if (strcmp (leaseUnit, "hours") == 0) + multiplier = 60 * 60; + else if (strcmp (leaseUnit, "days") == 0) + multiplier = 60 * 60 * 24; + else { + virReportError(VIR_ERR_XML_ERROR, + _("invalid value for unit parameter in <leasetime> element found in <dhcp> network, " + "only 'seconds', 'minutes', 'hours' or 'days' are valid: %s"), + leaseUnit); + *error = 1; + goto cleanup; + } + + errno = 0; + result = (int64_t) strtoll((const char*)leaseString, NULL, 10); + + /* Report any errors parsing the string */ + if (errno != 0) { + virReportError(VIR_ERR_XML_ERROR, + _("<leasetime> value could not be converted to a signed integer: %s"), + leaseString); + *error = 1; + goto cleanup; + } + + result = result * multiplier; + + if (result > UINT32_MAX) { + virReportError(VIR_ERR_XML_ERROR, + _("<leasetime> value cannot be greater than the equivalent of %" PRIo32 " seconds : %" PRId64), + UINT32_MAX, result); + *error = 1; + } + +cleanup: + VIR_FREE(leaseString); + VIR_FREE(leaseUnit); + ctxt->node = save; + return result; +} + static int virNetworkDHCPDefParseXML(const char *networkName, xmlNodePtr node, + xmlXPathContextPtr ctxt, virNetworkIPDefPtr def) { int ret = -1; + bool error; xmlNodePtr cur; virSocketAddrRange range; virNetworkDHCPHostDef host; @@ -1044,6 +1116,10 @@ virNetworkDHCPDefParseXML(const char *networkName, memset(&range, 0, sizeof(range)); memset(&host, 0, sizeof(host)); + def->leasetime = virNetworkDHCPDefGetLeaseTime (node, ctxt, &error); + if (error) + goto cleanup; + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && @@ -1607,7 +1683,7 @@ virNetworkIPDefParseXML(const char *networkName, while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "dhcp")) { - if (virNetworkDHCPDefParseXML(networkName, cur, def) < 0) + if (virNetworkDHCPDefParseXML(networkName, cur, ctxt, def) < 0) goto cleanup; } else if (cur->type == XML_ELEMENT_NODE && xmlStrEqual(cur->name, BAD_CAST "tftp")) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 3b227db6f..f7557f581 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -170,7 +170,8 @@ struct _virNetworkIPDef { char *tftproot; char *bootfile; virSocketAddr bootserver; - }; + int64_t leasetime; +}; typedef struct _virNetworkForwardIfDef virNetworkForwardIfDef; typedef virNetworkForwardIfDef *virNetworkForwardIfDefPtr; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7b99acafa..e51e469c8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -41,6 +41,8 @@ #include <sys/ioctl.h> #include <net/if.h> #include <dirent.h> +#include <inttypes.h> +#include <stdint.h> #if HAVE_SYS_SYSCTL_H # include <sys/sysctl.h> #endif @@ -903,6 +905,40 @@ networkBuildDnsmasqHostsList(dnsmasqContext *dctx, return 0; } +/* translates the leasetime value into a dnsmasq configuration string for dhcp-range/host */ +static char * +networkDnsmasqConfLeaseValueToString (int64_t leasetime) +{ + char *result = NULL; + virBuffer leasebuf = VIR_BUFFER_INITIALIZER; + + /* Leasetime parameter set on the XML */ + /* Less than -1 means there was no value set */ + if (leasetime < -1) { + virBufferAsprintf(&leasebuf, "%s", ""); + } + /* -1 means no expiration */ + else if (leasetime == -1) + virBufferAsprintf(&leasebuf, ",infinite"); + /* Minimum expiry value is 120 */ + /* TODO: Discuss if we should up as we do here or just forward whatever value to dnsmasq */ + else if (leasetime < 120) + virBufferAsprintf(&leasebuf, ",120"); + /* DHCP value for lease time is a unsigned four octect integer */ + else if (leasetime <= UINT32_MAX) + virBufferAsprintf(&leasebuf, ",%" PRId64, leasetime); + /* TODO: Discuss the use of "deprecated" for ipv6*/ + /* TODO: Discuss what is the default value that we want as dnsmasq's is 1 hour */ + /* TODO: Discuss what to do if value exceeds maximum, use default value for now */ + else { + virBufferAsprintf(&leasebuf, "%s", ""); + } + + result = virBufferContentAndReset(&leasebuf); + virBufferFreeAndReset (&leasebuf); + + return result; +} int networkDnsmasqConfContents(virNetworkObjPtr network, @@ -1213,6 +1249,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } for (r = 0; r < ipdef->nranges; r++) { int thisRange; + char *leasestr; if (!(saddr = virSocketAddrFormat(&ipdef->ranges[r].start)) || !(eaddr = virSocketAddrFormat(&ipdef->ranges[r].end))) @@ -1220,12 +1257,22 @@ networkDnsmasqConfContents(virNetworkObjPtr network, virBufferAsprintf(&configbuf, "dhcp-range=%s,%s", saddr, eaddr); - if (VIR_SOCKET_ADDR_IS_FAMILY(&ipdef->address, AF_INET6)) + + /* Add ipv6 prefix length parameter if needed */ + if (ipdef == ipv6def) virBufferAsprintf(&configbuf, ",%d", prefix); + + leasestr = networkDnsmasqConfLeaseValueToString (ipdef->leasetime); + if (!leasestr) + goto cleanup; + virBufferAsprintf(&configbuf, "%s", leasestr); + + /* Add the newline */ virBufferAddLit(&configbuf, "\n"); VIR_FREE(saddr); VIR_FREE(eaddr); + VIR_FREE(leasestr); thisRange = virSocketAddrGetRange(&ipdef->ranges[r].start, &ipdef->ranges[r].end, &ipdef->address, diff --git a/tests/networkxml2confdata/leasetime-days.conf b/tests/networkxml2confdata/leasetime-days.conf new file mode 100644 index 000000000..9501e2f8a --- /dev/null +++ b/tests/networkxml2confdata/leasetime-days.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,86400 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,86400 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime-days.xml b/tests/networkxml2confdata/leasetime-days.xml new file mode 100644 index 000000000..b990b4d68 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-days.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="days">1</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime unit="days">1</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2confdata/leasetime-hours.conf b/tests/networkxml2confdata/leasetime-hours.conf new file mode 100644 index 000000000..021a769bc --- /dev/null +++ b/tests/networkxml2confdata/leasetime-hours.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,3600 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,3600 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime-hours.xml b/tests/networkxml2confdata/leasetime-hours.xml new file mode 100644 index 000000000..3b9609601 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-hours.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="hours">1</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime unit="hours">1</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2confdata/leasetime-infinite.conf b/tests/networkxml2confdata/leasetime-infinite.conf new file mode 100644 index 000000000..cc21135de --- /dev/null +++ b/tests/networkxml2confdata/leasetime-infinite.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,infinite +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,infinite +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime-infinite.xml b/tests/networkxml2confdata/leasetime-infinite.xml new file mode 100644 index 000000000..bc8740ee6 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-infinite.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime>-1</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime>-1</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2confdata/leasetime-minutes.conf b/tests/networkxml2confdata/leasetime-minutes.conf new file mode 100644 index 000000000..db688951b --- /dev/null +++ b/tests/networkxml2confdata/leasetime-minutes.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,300 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,300 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime-minutes.xml b/tests/networkxml2confdata/leasetime-minutes.xml new file mode 100644 index 000000000..e7a27afe6 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-minutes.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="minutes">5</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime unit="minutes">5</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2confdata/leasetime-seconds.conf b/tests/networkxml2confdata/leasetime-seconds.conf new file mode 100644 index 000000000..635896b29 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-seconds.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,125 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,125 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime-seconds.xml b/tests/networkxml2confdata/leasetime-seconds.xml new file mode 100644 index 000000000..56b07f8ae --- /dev/null +++ b/tests/networkxml2confdata/leasetime-seconds.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime unit="seconds">125</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime unit="seconds">125</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2confdata/leasetime.conf b/tests/networkxml2confdata/leasetime.conf new file mode 100644 index 000000000..72a2f6926 --- /dev/null +++ b/tests/networkxml2confdata/leasetime.conf @@ -0,0 +1,17 @@ +##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 +except-interface=lo +bind-dynamic +interface=virbr0 +dhcp-range=192.168.122.2,192.168.122.254,122 +dhcp-no-override +dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64,121 +dhcp-lease-max=493 +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts +enable-ra diff --git a/tests/networkxml2confdata/leasetime.xml b/tests/networkxml2confdata/leasetime.xml new file mode 100644 index 000000000..fdbb15fc0 --- /dev/null +++ b/tests/networkxml2confdata/leasetime.xml @@ -0,0 +1,18 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <leasetime>122</leasetime> + <range start='192.168.122.2' end='192.168.122.254'/> + </dhcp> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + <dhcp> + <leasetime>121</leasetime> + <range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 65a0e3218..223a56f54 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -129,6 +129,13 @@ mymain(void) DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); + DO_TEST("leasetime", dhcpv6); + DO_TEST("leasetime-seconds", dhcpv6); + DO_TEST("leasetime-hours", dhcpv6); + DO_TEST("leasetime-minutes", dhcpv6); + DO_TEST("leasetime-hours", dhcpv6); + DO_TEST("leasetime-days", dhcpv6); + DO_TEST("leasetime-infinite", dhcpv6); virObjectUnref(dhcpv6); virObjectUnref(full); -- 2.13.0

5 16

[libvirt] Regarding docs for Adding new Hypervisor support
by Rohit Sakala 13 Jul '17

13 Jul '17

Hello all, I would start to work on adding z/vm hypervisor to libvirt. I am currently going through libvirt source code and found that I need to add a new driver implementation for z/VM hypervisor. Can you please let me know the best way to add a driver to libvirt. Basically looking for a head start on which part of the code look for ? and any related docs ? Regards, *Venkata Krishna Rohit Sakala* B.Tech 4th Year, International Institute of Information Technology Hyderabad, India. Mobile: *+91-9666255517* Website: https://researchweb.iiit.ac.in/~rohit.sakala/ ᐧ

1 0

[libvirt] [PATCH] qemu: Default hwclock source for sPAPR to RTC
by Kothapally Madhu Pavan 13 Jul '17

13 Jul '17

QEMU fails to launch a sPAPR guest with clock sources other that RTC. Internally qemu only uses RTC timer for hwclock. This patch reports the right error message instead of qemu erroring out when any other timer other than RTC is used. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97..31561ce 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6440,6 +6440,15 @@ qemuBuildClockCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_PIT: + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + switch (def->clock.timers[i]->tickpolicy) { case -1: case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: @@ -6483,13 +6492,21 @@ qemuBuildClockCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_TIMER_NAME_HPET: + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + /* the only meaningful attribute for hpet is "present". If * present is -1, that means it wasn't specified, and * should be left at the default for the * hypervisor. "default" when -no-hpet exists is "yes", * and when -no-hpet doesn't exist is "no". "confusing"? * "yes"! */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_HPET)) { if (def->clock.timers[i]->present == 0) virCommandAddArg(cmd, "-no-hpet"); @@ -7047,6 +7064,15 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, for (i = 0; i < def->clock.ntimers; i++) { virDomainTimerDefPtr timer = def->clock.timers[i]; + /* Only RTC timer is supported as hwclock for sPAPR machines */ + if (ARCH_IS_PPC64(def->os.arch) && timer->name != VIR_DOMAIN_TIMER_NAME_RTC) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock timer '%s' for '%s' architecture"), + virDomainTimerNameTypeToString(def->clock.timers[i]->name), + virArchToString(def->os.arch)); + return -1; + } + if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK && timer->present != -1) { virBufferAsprintf(&buf, "%s,%ckvmclock", -- 1.8.3.1

3 3

[libvirt] [PATCH] Rewrite the way mockable functions are handled.
by Daniel P. Berrange 13 Jul '17

13 Jul '17

Currently any mockable functions are marked with attributes noinline, noclone and weak. This prevents the compiler from optimizing away the impl of these functions. It has an unfortunate side effect with the libtool convenience libraries, if executables directly link to them. For example virlockd, virlogd both link to libvirt_util.la When this is done, the linker does not consider weak symbols as being undefined, so it never copies them into the final executable. In this new approach, we stop annotating the headers entirely. Instead we create a weak function alias in the source. int fooImpl(void) { ..the real code.. } int foo(void) __attribute__((noinline, noclone, weak, alias("fooImpl")) If any functions in the same file call "foo", this prevents the optimizer from inlining any part of fooImpl. When linking to the libtool convenience static library, we also get all the symbols present. Finally the test suite can just directly define a 'foo' function in its source, removing the need to use LD_PRELOAD (though removal of LD_PRELOADS is left for a future patch). Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- build-aux/mock-noinline.pl | 35 ++++++------- src/internal.h | 59 +++++++++++---------- src/qemu/qemu_capabilities.c | 9 ++-- src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsocket.c | 48 ++++++++++------- src/rpc/virnetsocket.h | 6 +-- src/util/vircommand.c | 6 ++- src/util/vircommand.h | 2 +- src/util/vircrypto.c | 5 +- src/util/vircrypto.h | 2 +- src/util/virfile.c | 5 +- src/util/virfile.h | 2 +- src/util/virhostcpu.c | 10 ++-- src/util/virhostcpu.h | 4 +- src/util/virmacaddr.c | 6 ++- src/util/virmacaddr.h | 2 +- src/util/virnetdev.c | 23 +++++---- src/util/virnetdev.h | 9 ++-- src/util/virnetdevip.c | 9 ++-- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.c | 8 +-- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.c | 45 ++++++++-------- src/util/virnetdevtap.h | 6 +-- src/util/virnuma.c | 111 +++++++++++++++++++++++----------------- src/util/virnuma.h | 16 +++--- src/util/virrandom.c | 18 ++++--- src/util/virrandom.h | 6 +-- src/util/virscsi.c | 13 ++--- src/util/virscsi.h | 2 +- src/util/virscsivhost.c | 5 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.c | 5 +- src/util/virtpm.h | 2 +- src/util/virutil.c | 33 +++++++----- src/util/virutil.h | 10 ++-- src/util/viruuid.c | 5 +- src/util/viruuid.h | 2 +- 38 files changed, 296 insertions(+), 241 deletions(-) diff --git a/build-aux/mock-noinline.pl b/build-aux/mock-noinline.pl index 2745d4b..1d39300 100644 --- a/build-aux/mock-noinline.pl +++ b/build-aux/mock-noinline.pl @@ -1,28 +1,28 @@ #!/usr/bin/perl -my %noninlined; +my %mockable; my %mocked; # Functions in public header don't get the noinline annotation # so whitelist them here -$noninlined{"virEventAddTimeout"} = 1; +$mockable{"virEventAddTimeout"} = 1; foreach my $arg (@ARGV) { - if ($arg =~ /\.h$/) { - #print "Scan header $arg\n"; - &scan_annotations($arg); - } elsif ($arg =~ /mock\.c$/) { + if ($arg =~ /mock\.c$/) { #print "Scan mock $arg\n"; &scan_overrides($arg); + } elsif ($arg =~ /\.c$/) { + #print "Scan source $arg\n"; + &scan_annotations($arg); } } my $warned = 0; foreach my $func (keys %mocked) { - next if exists $noninlined{$func}; + next if exists $mockable{$func}; $warned++; - print STDERR "$func is mocked at $mocked{$func} but missing noinline annotation\n"; + print STDERR "$func is mocked at $mocked{$func} but missing VIR_MOCKABLE impl\n"; } exit $warned ? 1 : 0; @@ -34,19 +34,16 @@ sub scan_annotations { open FH, $file or die "cannot read $file: $!"; my $func; + my $mockable = 0; while (<FH>) { - if (/^\s*(\w+)\(/ || /^(?:\w+\*?\s+)+(?:\*\s*)?(\w+)\(/) { - my $name = $1; - if ($name !~ /ATTRIBUTE/) { - $func = $name; - } - } elsif (/^\s*$/) { - $func = undef; - } - if (/ATTRIBUTE_MOCKABLE/) { - if (defined $func) { - $noninlined{$func} = 1; + if (/^VIR_MOCKABLE/) { + $mockable = 1; + } elsif ($mockable) { + if (/^\s*(\w+),$/) { + my $func = $1; + $mockable{$func} = 1; } + $mockable = 0; } } diff --git a/src/internal.h b/src/internal.h index edc3587..e34338e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -113,33 +113,6 @@ # endif /** - * ATTRIBUTE_MOCKABLE: - * - * Ensure that the symbol can be overridden in a mock - * library preload. This implies a number of attributes - * - * - noinline: prevents the body being inlined to - * callers, - * - noclone: prevents specialized copies of the - * function body being created for different - * callers - * - weak: prevents the compiler making optimizations - * such as constant return value propagation - * - */ -# ifndef ATTRIBUTE_MOCKABLE -# if defined(WIN32) -# define ATTRIBUTE_MOCKABLE -# else -# if __GNUC_PREREQ(4, 5) -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __noclone__, __weak__)) -# else -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __weak__)) -# endif -# endif -# endif - -/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling @@ -251,6 +224,38 @@ /* + * VIR_MOCKABLE(return type, func name, args...) + * + * Defines a function implementation that can be later overriden in + * the test suite + * + * NB, Win32 can't use 'weak' attribute because such symbols + * can't be marked exported in DLLs + * + * NB, the ${name}Impl function ought to be static, but that + * causes CLang to throw bogus errors about unused functions, + * despite there being an alias to it + */ +# ifdef WIN32 +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, noclone, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# else +# if __GNUC_PREREQ(4, 5) +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, noclone, weak, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# else +# define VIR_MOCKABLE(ret, name, ...) \ + ret name(__VA_ARGS__) __attribute__((noinline, weak, __alias__(#name "Impl"))); \ + ret name ## Impl (__VA_ARGS__); \ + ret name ## Impl (__VA_ARGS__) +# endif +# endif + +/* * Use this when passing possibly-NULL strings to printf-a-likes. */ # define NULLSTR(s) ((s) ? (s) : "<null>") diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db9f9b8..d4316bc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1148,10 +1148,11 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps, } -virCPUDefPtr -virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, - virQEMUCapsPtr qemuCaps, - virDomainVirtType type) +VIR_MOCKABLE(virCPUDefPtr, + virQEMUCapsProbeHostCPUForEmulator, + virCapsPtr caps, + virQEMUCapsPtr qemuCaps, + virDomainVirtType type) { size_t nmodels; char **models; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 6cc189e..a7c92fd 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -95,7 +95,7 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps, virCPUDefPtr virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps, virQEMUCapsPtr qemuCaps, - virDomainVirtType type) ATTRIBUTE_MOCKABLE; + virDomainVirtType type); void virQEMUCapsSetGICCapabilities(virQEMUCapsPtr qemuCaps, diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d228c8a..db872bb 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1425,11 +1425,13 @@ int virNetSocketGetPort(virNetSocketPtr sock) #if defined(SO_PEERCRED) -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { # if defined(HAVE_STRUCT_SOCKPEERCRED) struct sockpeercred cr; @@ -1482,11 +1484,13 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, # define VIR_SOL_PEERCRED 0 # endif -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, - uid_t *uid, - gid_t *gid, - pid_t *pid, - unsigned long long *timestamp) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock, + uid_t *uid, + gid_t *gid, + pid_t *pid, + unsigned long long *timestamp) { struct xucred cr; socklen_t cr_len = sizeof(cr); @@ -1550,11 +1554,13 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, - uid_t *uid ATTRIBUTE_UNUSED, - gid_t *gid ATTRIBUTE_UNUSED, - pid_t *pid ATTRIBUTE_UNUSED, - unsigned long long *timestamp ATTRIBUTE_UNUSED) +VIR_MOCKABLE(int, + virNetSocketGetUNIXIdentity, + virNetSocketPtr sock ATTRIBUTE_UNUSED, + uid_t *uid ATTRIBUTE_UNUSED, + gid_t *gid ATTRIBUTE_UNUSED, + pid_t *pid ATTRIBUTE_UNUSED, + unsigned long long *timestamp ATTRIBUTE_UNUSED) { /* XXX Many more OS support UNIX socket credentials we could port to. See dbus ....*/ virReportSystemError(ENOSYS, "%s", @@ -1564,8 +1570,10 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, #endif #ifdef WITH_SELINUX -int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) +VIR_MOCKABLE(int, + virNetSocketGetSELinuxContext, + virNetSocketPtr sock, + char **context) { security_context_t seccon = NULL; int ret = -1; @@ -1593,8 +1601,10 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr sock, return ret; } #else -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, - char **context) +VIR_MOCKABLE(int, + virNetSocketGetSELinuxContext, + virNetSocketPtr sock ATTRIBUTE_UNUSED, + char **context) { *context = NULL; return 0; diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 3c2945e..1e75ee6 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -136,11 +136,9 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, uid_t *uid, gid_t *gid, pid_t *pid, - unsigned long long *timestamp) - ATTRIBUTE_MOCKABLE; + unsigned long long *timestamp); int virNetSocketGetSELinuxContext(virNetSocketPtr sock, - char **context) - ATTRIBUTE_MOCKABLE; + char **context); int virNetSocketSetBlocking(virNetSocketPtr sock, bool blocking); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 60c1121..4ac0aa9 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -985,8 +985,9 @@ virCommandNewVAList(const char *binary, va_list list) * be closed in the parent no later than Run/RunAsync/Free. The parent * should cease using the @fd when this call completes */ -void -virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) +VIR_MOCKABLE(void, + virCommandPassFD, + virCommandPtr cmd, int fd, unsigned int flags) { int ret = 0; @@ -1012,6 +1013,7 @@ virCommandPassFD(virCommandPtr cmd, int fd, unsigned int flags) } } + /** * virCommandPassListenFDs: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index c042a53..99dcdeb 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -58,7 +58,7 @@ enum { void virCommandPassFD(virCommandPtr cmd, int fd, - unsigned int flags) ATTRIBUTE_MOCKABLE; + unsigned int flags); void virCommandPassListenFDs(virCommandPtr cmd); diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 48b04fc..13cacfb 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -300,8 +300,9 @@ virCryptoEncryptData(virCryptoCipher algorithm, * * Returns pointer memory containing byte stream on success, NULL on failure */ -uint8_t * -virCryptoGenerateRandom(size_t nbytes) +VIR_MOCKABLE(uint8_t *, + virCryptoGenerateRandom, + size_t nbytes) { uint8_t *buf; int ret; diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h index 50400c6..52ba3b3 100644 --- a/src/util/vircrypto.h +++ b/src/util/vircrypto.h @@ -55,6 +55,6 @@ int virCryptoEncryptData(virCryptoCipher algorithm, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK; -uint8_t *virCryptoGenerateRandom(size_t nbytes) ATTRIBUTE_MOCKABLE; +uint8_t *virCryptoGenerateRandom(size_t nbytes); #endif /* __VIR_CRYPTO_H__ */ diff --git a/src/util/virfile.c b/src/util/virfile.c index d444b32..b612ad5 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1824,8 +1824,9 @@ virFileIsDir(const char *path) * Returns true if the file exists, false if it doesn't, setting errno * appropriately. */ -bool -virFileExists(const char *path) +VIR_MOCKABLE(bool, + virFileExists, + const char *path) { return access(path, F_OK) == 0; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 32c9115..40034f0 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -188,7 +188,7 @@ void virFileActivateDirOverride(const char *argv0) off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); -bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_MOCKABLE; +bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1); bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1); enum { diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index c485a97..4d63842 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1112,8 +1112,9 @@ virHostCPUGetMap(unsigned char **cpumap, * * Returns the number of threads per subcore if subcores are in use, zero * if subcores are not in use, and a negative value on error */ -int -virHostCPUGetThreadsPerSubcore(virArch arch) +VIR_MOCKABLE(int, + virHostCPUGetThreadsPerSubcore, + virArch arch) { int threads_per_subcore = 0; int kvmfd; @@ -1167,8 +1168,9 @@ virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED) #endif /* HAVE_LINUX_KVM_H && defined(KVM_CAP_PPC_SMT) */ #if HAVE_LINUX_KVM_H -int -virHostCPUGetKVMMaxVCPUs(void) +VIR_MOCKABLE(int, + virHostCPUGetKVMMaxVCPUs, + void) { int fd; int ret; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 3b30a0d..e9c22ee 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -38,7 +38,7 @@ bool virHostCPUHasBitmap(void); virBitmapPtr virHostCPUGetPresentBitmap(void); virBitmapPtr virHostCPUGetOnlineBitmap(void); int virHostCPUGetCount(void); -int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_MOCKABLE; +int virHostCPUGetThreadsPerSubcore(virArch arch); int virHostCPUGetMap(unsigned char **cpumap, unsigned int *online, @@ -51,7 +51,7 @@ int virHostCPUGetInfo(virArch hostarch, unsigned int *cores, unsigned int *threads); -int virHostCPUGetKVMMaxVCPUs(void) ATTRIBUTE_MOCKABLE; +int virHostCPUGetKVMMaxVCPUs(void); int virHostCPUStatsAssign(virNodeCPUStatsPtr param, const char *name, diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 7afe032..29d6980 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -223,8 +223,10 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr) return 0; } -void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) +VIR_MOCKABLE(void, + virMacAddrGenerate, + const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], + virMacAddrPtr addr) { addr->addr[0] = prefix[0]; addr->addr[1] = prefix[1]; diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 79492cd..ae26867 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -48,7 +48,7 @@ void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]); const char *virMacAddrFormat(const virMacAddr *addr, char *str); void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], - virMacAddrPtr addr) ATTRIBUTE_MOCKABLE; + virMacAddrPtr addr); int virMacAddrParse(const char* str, virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK; int virMacAddrParseHex(const char* str, diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 90b7bee..7c1ec5c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -346,9 +346,9 @@ virNetDevSetMACInternal(const char *ifname, #endif -int -virNetDevSetMAC(const char *ifname, - const virMacAddr *macaddr) +VIR_MOCKABLE(int, + virNetDevSetMAC, + const char *ifname, const virMacAddr *macaddr) { return virNetDevSetMACInternal(ifname, macaddr, false); } @@ -686,9 +686,9 @@ virNetDevSetIFFlag(const char *ifname, * * Returns 0 in case of success or -1 on error. */ -int -virNetDevSetOnline(const char *ifname, - bool online) +VIR_MOCKABLE(int, + virNetDevSetOnline, + const char *ifname, bool online) { return virNetDevSetIFFlag(ifname, VIR_IFF_UP, online); @@ -1122,9 +1122,9 @@ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, #ifdef __linux__ -int -virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, - const char *file) +VIR_MOCKABLE(int, + virNetDevSysfsFile, + char **pf_sysfs_device_link, const char *ifname, const char *file) { if (virAsprintf(pf_sysfs_device_link, SYSFS_NET_DIR "%s/%s", ifname, file) < 0) @@ -3268,8 +3268,9 @@ int virNetDevSetCoalesce(const char *ifname, * This function executes script for new tap device created by libvirt. * Returns 0 in case of success or -1 on failure */ -int -virNetDevRunEthernetScript(const char *ifname, const char *script) +VIR_MOCKABLE(int, + virNetDevRunEthernetScript, + const char *ifname, const char *script) { virCommandPtr cmd; int ret; diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 2e9a9c4..c2c09af 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -156,7 +156,7 @@ int virNetDevExists(const char *brname) int virNetDevSetOnline(const char *ifname, bool online) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevGetOnline(const char *ifname, bool *online) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -164,7 +164,7 @@ int virNetDevGetOnline(const char *ifname, int virNetDevSetMAC(const char *ifname, const virMacAddr *macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevGetMAC(const char *ifname, virMacAddrPtr macaddr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; @@ -303,8 +303,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_RETURN_CHECK; -int virNetDevRunEthernetScript(const char *ifname, const char *script) - ATTRIBUTE_MOCKABLE; +int virNetDevRunEthernetScript(const char *ifname, const char *script); #endif /* __VIR_NETDEV_H__ */ diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bf98ed8..6dcd2e8 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -163,11 +163,10 @@ virNetDevCreateNetlinkAddressMessage(int messageType, * * Returns 0 in case of success or -1 in case of error. */ -int -virNetDevIPAddrAdd(const char *ifname, - virSocketAddr *addr, - virSocketAddr *peer, - unsigned int prefix) +VIR_MOCKABLE(int, + virNetDevIPAddrAdd, + const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virSocketAddr *broadcast = NULL; int ret = -1; diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 972a49a..cc466ca 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -67,7 +67,7 @@ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, virSocketAddr *peer, unsigned int prefix) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr addr, unsigned int prefix, diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index a5ecfb6..ab292a4 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -382,7 +382,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, } /** - * virNetDevOpenvswitchVhostuserGetIfname: + * virNetDevOpenvswitchGetVhostuserIfname: * @path: the path of the unix socket * @ifname: the retrieved name of the interface * @@ -392,9 +392,9 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, * 0 if it is not, but no other error occurred, * -1 otherwise. */ -int -virNetDevOpenvswitchGetVhostuserIfname(const char *path, - char **ifname) +VIR_MOCKABLE(int, + virNetDevOpenvswitchGetVhostuserIfname, + const char *path, char **ifname) { virCommandPtr cmd = NULL; char *tmpIfname = NULL; diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index dc677ca..7380a2d 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -59,6 +59,6 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, int virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; #endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 175dc2b..93cb65d 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -98,8 +98,9 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED) * Returns the proper interface name or NULL if no corresponding interface * found. */ -char* -virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virNetDevTapGetRealDeviceName, + char *ifname ATTRIBUTE_UNUSED) { #ifdef TAPGIFNAME char *ret = NULL; @@ -238,11 +239,13 @@ virNetDevProbeVnetHdr(int tapfd) * * Returns 0 in case of success or -1 on failure. */ -int virNetDevTapCreate(char **ifname, - const char *tunpath, - int *tapfd, - size_t tapfdSize, - unsigned int flags) +VIR_MOCKABLE(int, + virNetDevTapCreate, + char **ifname, + const char *tunpath, + int *tapfd, + size_t tapfdSize, + unsigned int flags) { size_t i; struct ifreq ifr; @@ -608,19 +611,21 @@ virNetDevTapAttachBridge(const char *tapname, * * Returns 0 in case of success or -1 on failure */ -int virNetDevTapCreateInBridgePort(const char *brname, - char **ifname, - const virMacAddr *macaddr, - const unsigned char *vmuuid, - const char *tunpath, - int *tapfd, - size_t tapfdSize, - virNetDevVPortProfilePtr virtPortProfile, - virNetDevVlanPtr virtVlan, - virNetDevCoalescePtr coalesce, - unsigned int mtu, - unsigned int *actualMTU, - unsigned int flags) +VIR_MOCKABLE(int, + virNetDevTapCreateInBridgePort, + const char *brname, + char **ifname, + const virMacAddr *macaddr, + const unsigned char *vmuuid, + const char *tunpath, + int *tapfd, + size_t tapfdSize, + virNetDevVPortProfilePtr virtPortProfile, + virNetDevVlanPtr virtVlan, + virNetDevCoalescePtr coalesce, + unsigned int mtu, + unsigned int *actualMTU, + unsigned int flags) { virMacAddr tapmac; char macaddrstr[VIR_MAC_STRING_BUFLEN]; diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index 1c4343e..bd5ec14 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -39,7 +39,7 @@ int virNetDevTapCreate(char **ifname, int *tapfd, size_t tapfdSize, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; int virNetDevTapDelete(const char *ifname, const char *tunpath) @@ -49,7 +49,7 @@ int virNetDevTapGetName(int tapfd, char **ifname) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; char* virNetDevTapGetRealDeviceName(char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; typedef enum { VIR_NETDEV_TAP_CREATE_NONE = 0, @@ -89,7 +89,7 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int *actualMTU, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; + ATTRIBUTE_RETURN_CHECK; int virNetDevTapInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index bebe301..6300bc1 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -160,8 +160,9 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, return ret; } -bool -virNumaIsAvailable(void) +VIR_MOCKABLE(bool, + virNumaIsAvailable, + void) { return numa_available() != -1; } @@ -174,8 +175,9 @@ virNumaIsAvailable(void) * * Returns the highest NUMA node id on success, -1 on error. */ -int -virNumaGetMaxNode(void) +VIR_MOCKABLE(int, + virNumaGetMaxNode, + void) { int ret; @@ -207,10 +209,11 @@ virNumaGetMaxNode(void) * * Returns 0 on success, -1 on error. Does not report errors. */ -int -virNumaGetNodeMemory(int node, - unsigned long long *memsize, - unsigned long long *memfree) +VIR_MOCKABLE(int, + virNumaGetNodeMemory, + int node, + unsigned long long *memsize, + unsigned long long *memfree) { long long node_size; long long node_free; @@ -248,9 +251,10 @@ virNumaGetNodeMemory(int node, # define n_bits(var) (8 * sizeof(var)) # define MASK_CPU_ISSET(mask, cpu) \ (((mask)[((cpu) / n_bits(*(mask)))] >> ((cpu) % n_bits(*(mask)))) & 1) -int -virNumaGetNodeCPUs(int node, - virBitmapPtr *cpus) +VIR_MOCKABLE(int, + virNumaGetNodeCPUs, + int node, + virBitmapPtr *cpus) { unsigned long *mask = NULL; unsigned long *allonesmask = NULL; @@ -321,15 +325,17 @@ virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode ATTRIBUTE_UNUSED, return 0; } -bool -virNumaIsAvailable(void) +VIR_MOCKABLE(bool, + virNumaIsAvailable, + void) { return false; } -int -virNumaGetMaxNode(void) +VIR_MOCKABLE(int, + virNumaGetMaxNode, + void) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("NUMA isn't available on this host")); @@ -337,10 +343,11 @@ virNumaGetMaxNode(void) } -int -virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, - unsigned long long *memsize, - unsigned long long *memfree) +VIR_MOCKABLE(int, + virNumaGetNodeMemory, + int node ATTRIBUTE_UNUSED, + unsigned long long *memsize, + unsigned long long *memfree) { if (memsize) *memsize = 0; @@ -353,9 +360,10 @@ virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, } -int -virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, - virBitmapPtr *cpus) +VIR_MOCKABLE(int, + virNumaGetNodeCPUs, + int node ATTRIBUTE_UNUSED, + virBitmapPtr *cpus) { *cpus = NULL; @@ -390,8 +398,9 @@ virNumaGetMaxCPUs(void) * Returns: true if @node is available, * false if @node doesn't exist */ -bool -virNumaNodeIsAvailable(int node) +VIR_MOCKABLE(bool, + virNumaNodeIsAvailable, + int node) { return numa_bitmask_isbitset(numa_nodes_ptr, node); } @@ -416,10 +425,11 @@ virNumaNodeIsAvailable(int node) * * Returns 0 on success, -1 otherwise. */ -int -virNumaGetDistances(int node, - int **distances, - int *ndistances) +VIR_MOCKABLE(int, + virNumaGetDistances, + int node, + int **distances, + int *ndistances) { int ret = -1; int max_node; @@ -454,8 +464,9 @@ virNumaGetDistances(int node, #else /* !(WITH_NUMACTL && HAVE_NUMA_BITMASK_ISBITSET) */ -bool -virNumaNodeIsAvailable(int node) +VIR_MOCKABLE(bool, + virNumaNodeIsAvailable, + int node) { int max_node = virNumaGetMaxNode(); @@ -467,10 +478,11 @@ virNumaNodeIsAvailable(int node) } -int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, - int **distances, - int *ndistances) +VIR_MOCKABLE(int, + virNumaGetDistances, + int node ATTRIBUTE_UNUSED, + int **distances, + int *ndistances) { *distances = NULL; *ndistances = 0; @@ -706,12 +718,13 @@ virNumaGetPageInfo(int node, * * Returns 0 on success, -1 otherwise. */ -int -virNumaGetPages(int node, - unsigned int **pages_size, - unsigned int **pages_avail, - unsigned int **pages_free, - size_t *npages) +VIR_MOCKABLE(int, + virNumaGetPages, + int node, + unsigned int **pages_size, + unsigned int **pages_avail, + unsigned int **pages_free, + size_t *npages) { int ret = -1; char *path = NULL; @@ -943,12 +956,13 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, } -int -virNumaGetPages(int node ATTRIBUTE_UNUSED, - unsigned int **pages_size ATTRIBUTE_UNUSED, - unsigned int **pages_avail ATTRIBUTE_UNUSED, - unsigned int **pages_free ATTRIBUTE_UNUSED, - size_t *npages ATTRIBUTE_UNUSED) +VIR_MOCKABLE(int, + virNumaGetPages, + int node ATTRIBUTE_UNUSED, + unsigned int **pages_size ATTRIBUTE_UNUSED, + unsigned int **pages_avail ATTRIBUTE_UNUSED, + unsigned int **pages_free ATTRIBUTE_UNUSED, + size_t *npages ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page info is not supported on this platform")); @@ -968,8 +982,9 @@ virNumaSetPagePoolSize(int node ATTRIBUTE_UNUSED, } #endif /* #ifdef __linux__ */ -bool -virNumaNodesetIsAvailable(virBitmapPtr nodeset) +VIR_MOCKABLE(bool, + virNumaNodesetIsAvailable, + virBitmapPtr nodeset) { ssize_t bit = -1; diff --git a/src/util/virnuma.h b/src/util/virnuma.h index 62b89e9..f3eef32 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -34,20 +34,20 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode, virBitmapPtr nodeset); virBitmapPtr virNumaGetHostMemoryNodeset(void); -bool virNumaNodesetIsAvailable(virBitmapPtr nodeset) ATTRIBUTE_MOCKABLE; -bool virNumaIsAvailable(void) ATTRIBUTE_MOCKABLE; -int virNumaGetMaxNode(void) ATTRIBUTE_MOCKABLE; -bool virNumaNodeIsAvailable(int node) ATTRIBUTE_MOCKABLE; +bool virNumaNodesetIsAvailable(virBitmapPtr nodeset); +bool virNumaIsAvailable(void); +int virNumaGetMaxNode(void); +bool virNumaNodeIsAvailable(int node); int virNumaGetDistances(int node, int **distances, - int *ndistances) ATTRIBUTE_MOCKABLE; + int *ndistances); int virNumaGetNodeMemory(int node, unsigned long long *memsize, - unsigned long long *memfree) ATTRIBUTE_MOCKABLE; + unsigned long long *memfree); unsigned int virNumaGetMaxCPUs(void); -int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus) ATTRIBUTE_MOCKABLE; +int virNumaGetNodeCPUs(int node, virBitmapPtr *cpus); int virNumaGetPageInfo(int node, unsigned int page_size, @@ -59,7 +59,7 @@ int virNumaGetPages(int node, unsigned int **pages_avail, unsigned int **pages_free, size_t *npages) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(5); int virNumaSetPagePoolSize(int node, unsigned int page_size, unsigned long long page_count, diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 41daa40..90d6905 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -99,7 +99,9 @@ VIR_ONCE_GLOBAL_INIT(virRandom) * * Return: a random number with @nbits entropy */ -uint64_t virRandomBits(int nbits) +VIR_MOCKABLE(uint64_t, + virRandomBits, + int nbits) { uint64_t ret = 0; int32_t bits; @@ -170,9 +172,10 @@ uint32_t virRandomInt(uint32_t max) * * Returns 0 on success or an errno on failure */ -int -virRandomBytes(unsigned char *buf, - size_t buflen) +VIR_MOCKABLE(int, + virRandomBytes, + unsigned char *buf, + size_t buflen) { int fd; @@ -205,9 +208,10 @@ virRandomBytes(unsigned char *buf, #define XEN_OUI "00163e" -int -virRandomGenerateWWN(char **wwn, - const char *virt_type) +VIR_MOCKABLE(int, + virRandomGenerateWWN, + char **wwn, + const char *virt_type) { const char *oui = NULL; diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 990a456..f457d2d 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -24,11 +24,11 @@ # include "internal.h" -uint64_t virRandomBits(int nbits) ATTRIBUTE_MOCKABLE; +uint64_t virRandomBits(int nbits); double virRandom(void); uint32_t virRandomInt(uint32_t max); int virRandomBytes(unsigned char *buf, size_t buflen) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_MOCKABLE; -int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_MOCKABLE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +int virRandomGenerateWWN(char **wwn, const char *virt_type); #endif /* __VIR_RANDOM_H__ */ diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 22f2677..d6fe4b7 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -109,12 +109,13 @@ virSCSIDeviceGetAdapterId(const char *adapter, return -1; } -char * -virSCSIDeviceGetSgName(const char *sysfs_prefix, - const char *adapter, - unsigned int bus, - unsigned int target, - unsigned long long unit) +VIR_MOCKABLE(char *, + virSCSIDeviceGetSgName, + const char *sysfs_prefix, + const char *adapter, + unsigned int bus, + unsigned int target, + unsigned long long unit) { DIR *dir = NULL; struct dirent *entry; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index eed563d..7d88d4e 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -37,7 +37,7 @@ char *virSCSIDeviceGetSgName(const char *sysfs_prefix, const char *adapter, unsigned int bus, unsigned int target, - unsigned long long unit) ATTRIBUTE_MOCKABLE; + unsigned long long unit); char *virSCSIDeviceGetDevName(const char *sysfs_prefix, const char *adapter, unsigned int bus, diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index dc7df75..32828f7 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -83,8 +83,9 @@ virSCSIVHostOnceInit(void) VIR_ONCE_GLOBAL_INIT(virSCSIVHost) -int -virSCSIVHostOpenVhostSCSI(int *vhostfd) +VIR_MOCKABLE(int, + virSCSIVHostOpenVhostSCSI, + int *vhostfd) { if (!virFileExists(VHOST_SCSI_DEVICE)) goto error; diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index f9272a6..6018b83 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -61,6 +61,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevicePtr dev, const char **drv_name, const char **dom_name); void virSCSIVHostDeviceFree(virSCSIVHostDevicePtr dev); -int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_MOCKABLE; +int virSCSIVHostOpenVhostSCSI(int *vhostfd); #endif /* __VIR_SCSIHOST_H__ */ diff --git a/src/util/virtpm.c b/src/util/virtpm.c index 6d9b065..07db753 100644 --- a/src/util/virtpm.c +++ b/src/util/virtpm.c @@ -38,8 +38,9 @@ * * Create the cancel path given the path to the TPM device */ -char * -virTPMCreateCancelPath(const char *devpath) +VIR_MOCKABLE(char *, + virTPMCreateCancelPath, + const char *devpath) { char *path = NULL; const char *dev; diff --git a/src/util/virtpm.h b/src/util/virtpm.h index 7067bb5..fe71307 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -22,6 +22,6 @@ #ifndef __VIR_TPM_H__ # define __VIR_TPM_H__ -char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_MOCKABLE; +char *virTPMCreateCancelPath(const char *devpath); #endif /* __VIR_TPM_H__ */ diff --git a/src/util/virutil.c b/src/util/virutil.c index e08f9fa..81bfba7 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -884,14 +884,18 @@ char *virGetUserRuntimeDirectory(void) } } -char *virGetUserName(uid_t uid) +VIR_MOCKABLE(char *, + virGetUserName, + uid_t uid) { char *ret; virGetUserEnt(uid, &ret, NULL, NULL, NULL, false); return ret; } -char *virGetGroupName(gid_t gid) +VIR_MOCKABLE(char *, + virGetGroupName, + gid_t gid) { return virGetGroupEnt(gid); } @@ -1340,8 +1344,9 @@ virGetUserRuntimeDirectory(void) } # endif /* ! HAVE_GETPWUID_R && ! WIN32 */ -char * -virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virGetUserName, + uid_t uid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserName is not available")); @@ -1379,8 +1384,9 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, return -1; } -char * -virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +VIR_MOCKABLE(char *, + virGetGroupName, + gid_t gid ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetGroupName is not available")); @@ -1908,12 +1914,16 @@ virGetListenFDs(void) #endif /* WIN32 */ #ifndef WIN32 -long virGetSystemPageSize(void) +VIR_MOCKABLE(long, + virGetSystemPageSize, + void) { return sysconf(_SC_PAGESIZE); } #else /* WIN32 */ -long virGetSystemPageSize(void) +VIR_MOCKABLE(long, + virGetSystemPageSize, + void) { errno = ENOSYS; return -1; @@ -1959,12 +1969,11 @@ virMemoryLimitIsSet(unsigned long long value) * @capped: whether the value must fit into unsigned long * (long long is assumed otherwise) * - * Note: This function is mocked in tests/qemuxml2argvmock.c for test stability - * * Returns the maximum possible memory value in bytes. */ -unsigned long long -virMemoryMaxValue(bool capped) +VIR_MOCKABLE(unsigned long long, + virMemoryMaxValue, + bool capped) { /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ diff --git a/src/util/virutil.h b/src/util/virutil.h index 35e5ca3..3bbe29e 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -139,8 +139,8 @@ char *virGetUserConfigDirectory(void); char *virGetUserCacheDirectory(void); char *virGetUserRuntimeDirectory(void); char *virGetUserShell(uid_t uid); -char *virGetUserName(uid_t uid) ATTRIBUTE_MOCKABLE; -char *virGetGroupName(gid_t gid) ATTRIBUTE_MOCKABLE; +char *virGetUserName(uid_t uid); +char *virGetGroupName(gid_t gid); int virGetGroupList(uid_t uid, gid_t group, gid_t **groups) ATTRIBUTE_NONNULL(3); int virGetUserID(const char *name, @@ -201,12 +201,12 @@ verify((int)VIR_TRISTATE_BOOL_ABSENT == (int)VIR_TRISTATE_SWITCH_ABSENT); unsigned int virGetListenFDs(void); -long virGetSystemPageSize(void) ATTRIBUTE_MOCKABLE; -long virGetSystemPageSizeKB(void) ATTRIBUTE_MOCKABLE; +long virGetSystemPageSize(void); +long virGetSystemPageSizeKB(void); unsigned long long virMemoryLimitTruncate(unsigned long long value); bool virMemoryLimitIsSet(unsigned long long value); -unsigned long long virMemoryMaxValue(bool ulong) ATTRIBUTE_MOCKABLE; +unsigned long long virMemoryMaxValue(bool ulong); /** * VIR_ASSIGN_IS_OVERFLOW: diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 3cbaae0..30de6f5 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -68,8 +68,9 @@ virUUIDGeneratePseudoRandomBytes(unsigned char *buf, * * Returns 0 in case of success and -1 in case of failure */ -int -virUUIDGenerate(unsigned char *uuid) +VIR_MOCKABLE(int, + virUUIDGenerate, + unsigned char *uuid) { int err; diff --git a/src/util/viruuid.h b/src/util/viruuid.h index 3b41b42..5790a17 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -49,7 +49,7 @@ int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); int virUUIDIsValid(unsigned char *uuid); -int virUUIDGenerate(unsigned char *uuid) ATTRIBUTE_MOCKABLE; +int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, unsigned char *uuid) -- 2.9.4

2 4

[libvirt] [PATCH 0/2] Revert use of weak symbols
by Daniel P. Berrange 13 Jul '17

13 Jul '17

This series reverts the use of the __weak__ attribute which we did to fix the test suite with CLang. It cause unintended problems elsewhere which are not practical to fix. See the second patch for details. Daniel P. Berrange (2): Revert "internal: don't use weak symbols for Win32 platform" Revert "Prevent more compiler optimization of mockable functions" build-aux/mock-noinline.pl | 2 +- src/check-symfile.pl | 2 +- src/internal.h | 27 +++++---------------------- src/qemu/qemu_capspriv.h | 2 +- src/rpc/virnetsocket.h | 4 ++-- src/util/vircommand.h | 2 +- src/util/vircrypto.h | 2 +- src/util/virfile.h | 2 +- src/util/virhostcpu.h | 4 ++-- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 8 ++++---- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 +++--- src/util/virnuma.h | 16 ++++++++-------- src/util/virrandom.h | 6 +++--- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virtpm.h | 2 +- src/util/virutil.h | 10 +++++----- src/util/viruuid.h | 2 +- 21 files changed, 45 insertions(+), 62 deletions(-) -- 2.9.4

4 15

[libvirt] [PATCH] tests: add virjsondata to EXTRA_DIST
by Daniel P. Berrange 13 Jul '17

13 Jul '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for RPM builds tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3596b5ff1..efc1a310d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -148,6 +148,7 @@ EXTRA_DIST = \ vircgroupdata \ virconfdata \ virfiledata \ + virjsondata \ virmacmaptestdata \ virmock.h \ virnetdaemondata \ -- 2.13.0

1 0

[libvirt] [PATCH] util: Don't leak linksrc in vircgroup
by Martin Kletzander 13 Jul '17

13 Jul '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/vircgroup.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a53908fc9246..2912fc9be539 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -382,6 +382,8 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, FILE *mounts = NULL; struct mntent entry; char buf[CGROUP_MAX_VAL]; + char *linksrc = NULL; + int ret = -1; mounts = fopen(path, "r"); if (mounts == NULL) { @@ -409,7 +411,6 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } if (typelen == len && STREQLEN(typestr, tmp, len)) { - char *linksrc; struct stat sb; char *tmp2; @@ -423,35 +424,35 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, VIR_FREE(controller->mountPoint); VIR_FREE(controller->linkPoint); if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0) - goto error; + goto cleanup; tmp2 = strrchr(entry.mnt_dir, '/'); if (!tmp2) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Missing '/' separator in cgroup mount '%s'"), entry.mnt_dir); - goto error; + goto cleanup; } /* If it is a co-mount it has a filename like "cpu,cpuacct" * and we must identify the symlink path */ if (checkLinks && strchr(tmp2 + 1, ',')) { *tmp2 = '\0'; + VIR_FREE(linksrc); if (virAsprintf(&linksrc, "%s/%s", entry.mnt_dir, typestr) < 0) - goto error; + goto cleanup; *tmp2 = '/'; if (lstat(linksrc, &sb) < 0) { if (errno == ENOENT) { VIR_WARN("Controller %s co-mounted at %s is missing symlink at %s", typestr, entry.mnt_dir, linksrc); - VIR_FREE(linksrc); } else { virReportSystemError(errno, _("Cannot stat %s"), linksrc); - goto error; + goto cleanup; } } else { if (!S_ISLNK(sb.st_mode)) { @@ -459,6 +460,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, linksrc, typestr); } else { controller->linkPoint = linksrc; + linksrc = NULL; } } } @@ -468,13 +470,11 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } } + ret = 0; + cleanup: + VIR_FREE(linksrc); VIR_FORCE_FCLOSE(mounts); - - return 0; - - error: - VIR_FORCE_FCLOSE(mounts); - return -1; + return ret; } static int -- 2.13.2

2 1

[libvirt] [PATCH 0/7] qemu: Update host-model CPUs on reconnect
by Jiri Denemark 13 Jul '17

13 Jul '17

This series fixes migration of a domain with a host-model CPU started by an old libvirt (< 2.3). https://bugzilla.redhat.com/show_bug.cgi?id=1463957 Jiri Denemark (7): qemu: Add qemuProcessFetchGuestCPU qemu: Add qemuProcessVerifyCPU qemu: Rename qemuProcessUpdateLiveGuestCPU qemu: Add qemuProcessUpdateLiveGuestCPU qemu: Export virQEMUCapsGuestIsNative qemu: Move qemuProcessReconnect to the end of qemu_process.c qemu: Update host-model CPUs on reconnect src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_process.c | 856 ++++++++++++++++++++++++------------------- 3 files changed, 489 insertions(+), 372 deletions(-) -- 2.13.2

2 17

[libvirt] [PATCH] Add support for virtio-net.tx_queue_size
by Michal Privoznik 13 Jul '17

13 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1460323 Just like I've added support for setting rx_queue_size (in c56cdf259 and friends), qemu just gained support for setting tx ring size. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 16 +++++++++++++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++++++ src/qemu/qemu_domain.c | 16 +++++++++++----- ...e.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} | 4 ++-- ...ize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2argvtest.c | 5 +++-- ...e.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} | 2 +- tests/qemuxml2xmltest.c | 2 +- 13 files changed, 67 insertions(+), 13 deletions(-) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.args => qemuxml2argv-net-virtio-rxtxqueuesize.args} (85%) rename tests/qemuxml2argvdata/{qemuxml2argv-net-virtio-rxqueuesize.xml => qemuxml2argv-net-virtio-rxtxqueuesize.xml} (93%) rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-net-virtio-rxqueuesize.xml => qemuxml2xmlout-net-virtio-rxtxqueuesize.xml} (96%) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7f4bc1d21..d37c89eff 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5065,7 +5065,7 @@ qemu-kvm -net nic,model=? /dev/null <source network='default'/> <target dev='vnet1'/> <model type='virtio'/> - <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256'> + <b><driver name='vhost' txmode='iothread' ioeventfd='on' event_idx='off' queues='5' rx_queue_size='256' tx_queue_size='256'> <host csum='off' gso='off' tso4='off' tso6='off' ecn='off' ufo='off' mrg_rxbuf='off'/> <guest csum='off' tso4='off' tso6='off' ecn='off' ufo='off'/> </driver> @@ -5195,6 +5195,20 @@ qemu-kvm -net nic,model=? /dev/null <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> </dd> + <dt><code>tx_queue_size</code></dt> + <dd> + The optional <code>tx_queue_size</code> attribute controls + the size of virtio ring for each queue as described above. + The default value is hypervisor dependent and may change + across its releases. Moreover, some hypervisors may pose + some restrictions on actual value. For instance, latest + QEMU (as of 2017-07-13) requires value to be a power of two + from [256, 1024] range. + <span class="since">Since 3.6.0 (QEMU and KVM only)</span><br/><br/> + + <b>In general you should leave this option alone, unless you + are very certain you know what you are doing.</b> + </dd> <dt>virtio options</dt> <dd> For virtio interfaces, diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 77136108a..7e133a8c1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2702,6 +2702,11 @@ <ref name='positiveInteger'/> </attribute> </optional> + <optional> + <attribute name='tx_queue_size'> + <ref name='positiveInteger'/> + </attribute> + </optional> <optional> <attribute name="txmode"> <choice> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 570cc5c93..7cf638da4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9863,6 +9863,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *event_idx = NULL; char *queues = NULL; char *rx_queue_size = NULL; + char *tx_queue_size = NULL; char *str = NULL; char *filter = NULL; char *internal = NULL; @@ -10036,6 +10037,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, event_idx = virXMLPropString(cur, "event_idx"); queues = virXMLPropString(cur, "queues"); rx_queue_size = virXMLPropString(cur, "rx_queue_size"); + tx_queue_size = virXMLPropString(cur, "tx_queue_size"); } else if (xmlStrEqual(cur->name, BAD_CAST "filterref")) { if (filter) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -10433,6 +10435,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } def->driver.virtio.rx_queue_size = q; } + if (tx_queue_size) { + unsigned int q; + if (virStrToLong_uip(tx_queue_size, NULL, 10, &q) < 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("'tx_queue_size' attribute must be positive number: %s"), + tx_queue_size); + goto error; + } + def->driver.virtio.tx_queue_size = q; + } if ((str = virXPathString("string(./driver/host/@csum)", ctxt))) { if ((val = virTristateSwitchTypeFromString(str)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -10630,6 +10642,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(event_idx); VIR_FREE(queues); VIR_FREE(rx_queue_size); + VIR_FREE(tx_queue_size); VIR_FREE(str); VIR_FREE(filter); VIR_FREE(type); @@ -22497,6 +22510,9 @@ virDomainVirtioNetDriverFormat(char **outstr, if (def->driver.virtio.rx_queue_size) virBufferAsprintf(&buf, " rx_queue_size='%u'", def->driver.virtio.rx_queue_size); + if (def->driver.virtio.tx_queue_size) + virBufferAsprintf(&buf, " tx_queue_size='%u'", + def->driver.virtio.tx_queue_size); virDomainVirtioOptionsFormat(&buf, def->virtio); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1baf85453..1cb8b802c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -967,6 +967,7 @@ struct _virDomainNetDef { virTristateSwitch event_idx; unsigned int queues; /* Multiqueue virtio-net */ unsigned int rx_queue_size; + unsigned int tx_queue_size; struct { virTristateSwitch csum; virTristateSwitch gso; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db9f9b8b1..f502dd464 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -430,6 +430,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio.iommu_platform", "virtio.ats", "loadparm", + "virtio-net.tx_queue_size", ); @@ -1695,6 +1696,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioNet[] = { { "tx", QEMU_CAPS_VIRTIO_TX_ALG }, { "event_idx", QEMU_CAPS_VIRTIO_NET_EVENT_IDX }, { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE }, + { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fb22815e9..63e792a19 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -416,6 +416,7 @@ typedef enum { QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, /* virtio-*-pci.iommu_platform */ QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ QEMU_CAPS_LOADPARM, /* -machine loadparm */ + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e290abff6..43fba3b0a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3790,6 +3790,14 @@ qemuBuildNicDevStr(virDomainDefPtr def, } virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } + if (usingVirtio && net->driver.virtio.tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is not supported with this QEMU binary")); + goto error; + } + virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); + } if (usingVirtio && net->mtu) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ae260de00..b17727811 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3169,11 +3169,17 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, goto cleanup; } - if (STREQ_NULLABLE(net->model, "virtio") && - net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("rx_queue_size has to be a power of two")); - goto cleanup; + if (STREQ_NULLABLE(net->model, "virtio")) { + if (net->driver.virtio.rx_queue_size & (net->driver.virtio.rx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("rx_queue_size has to be a power of two")); + goto cleanup; + } + if (net->driver.virtio.tx_queue_size & (net->driver.virtio.tx_queue_size - 1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("tx_queue_size has to be a power of two")); + goto cleanup; + } } if (net->mtu && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args similarity index 85% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args index 07c358a02..c78da3d17 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.args @@ -21,7 +21,7 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --device virtio-net-pci,rx_queue_size=512,vlan=0,id=net0,mac=00:11:22:33:44:55,\ -bus=pci.0,addr=0x3 \ +-device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,vlan=0,id=net0,\ +mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml similarity index 93% rename from tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml rename to tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml index d64e31df2..b51931d52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-rxtxqueuesize.xml @@ -22,7 +22,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> </interface> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 302c9c892..8ad2ca71b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1146,8 +1146,9 @@ mymain(void) QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST("net-virtio-rxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE); + DO_TEST("net-virtio-rxtxqueuesize", + QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, + QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", NONE); DO_TEST("net-eth", NONE); DO_TEST("net-eth-ifname", NONE); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml similarity index 96% rename from tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml rename to tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml index 78433026c..5c33a58ad 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxqueuesize.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-rxtxqueuesize.xml @@ -29,7 +29,7 @@ <interface type='user'> <mac address='00:11:22:33:44:55'/> <model type='virtio'/> - <driver rx_queue_size='512'/> + <driver rx_queue_size='512' tx_queue_size='1024'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 79347671f..578b07a95 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -523,7 +523,7 @@ mymain(void) DO_TEST("net-eth-ifname", NONE); DO_TEST("net-eth-hostip", NONE); DO_TEST("net-virtio-network-portgroup", NONE); - DO_TEST("net-virtio-rxqueuesize", NONE); + DO_TEST("net-virtio-rxtxqueuesize", NONE); DO_TEST("net-hostdev", NONE); DO_TEST("net-hostdev-vfio", NONE); DO_TEST("net-midonet", NONE); -- 2.13.0

1 0

[libvirt] [PATCH] cpu_x86: Properly disable unknown CPU features
by Jiri Denemark 13 Jul '17

13 Jul '17

CPU features unknown to a hypervisor will not be present in dataDisabled even though the feature won't naturally be enabled because it is unknown. Thus any features we asked for which are not in dataEnabled should be considered disabled. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 9 +- tests/cputest.c | 1 + .../x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 5 + .../x86_64-cpuid-Core-i7-5600U-arat-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml | 29 +++ .../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 30 +++ .../x86_64-cpuid-Core-i7-5600U-arat-json.xml | 14 ++ .../x86_64-cpuid-Core-i7-5600U-arat.json | 202 +++++++++++++++++++++ .../x86_64-cpuid-Core-i7-5600U-arat.xml | 41 +++++ 9 files changed, 335 insertions(+), 4 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 53359ff9b..286445421 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2664,12 +2664,11 @@ virCPUx86UpdateLive(virCPUDefPtr cpu, x86DataCopy(&disabled, &dataDisabled->data.x86) < 0) goto cleanup; - x86DataSubtract(&enabled, &model->data); - for (i = 0; i < map->nfeatures; i++) { virCPUx86FeaturePtr feature = map->features[i]; - if (x86DataIsSubset(&enabled, &feature->data)) { + if (x86DataIsSubset(&enabled, &feature->data) && + !x86DataIsSubset(&model->data, &feature->data)) { VIR_DEBUG("Feature '%s' enabled by the hypervisor", feature->name); if (cpu->check == VIR_CPU_CHECK_FULL) virBufferAsprintf(&bufAdded, "%s,", feature->name); @@ -2678,7 +2677,9 @@ virCPUx86UpdateLive(virCPUDefPtr cpu, goto cleanup; } - if (x86DataIsSubset(&disabled, &feature->data)) { + if (x86DataIsSubset(&disabled, &feature->data) || + (x86DataIsSubset(&model->data, &feature->data) && + !x86DataIsSubset(&enabled, &feature->data))) { VIR_DEBUG("Feature '%s' disabled by the hypervisor", feature->name); if (cpu->check == VIR_CPU_CHECK_FULL) virBufferAsprintf(&bufRemoved, "%s,", feature->name); diff --git a/tests/cputest.c b/tests/cputest.c index 89c645e64..ebcade6be 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -991,6 +991,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-4600U", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-4510U", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U", true); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Core-i7-5600U-arat", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-E6850", true); DO_TEST_CPUID(VIR_ARCH_X86_64, "Core2-Q9500", false); DO_TEST_CPUID(VIR_ARCH_X86_64, "FX-8150", false); diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml new file mode 100644 index 000000000..4a0477f78 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml @@ -0,0 +1,5 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1dc' edx='0xb0600000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml new file mode 100644 index 000000000..5cffacef5 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-enabled.xml @@ -0,0 +1,8 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x001c0fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x40000001' ecx_in='0x00' eax='0x010000fa' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml new file mode 100644 index 000000000..877895cf1 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml @@ -0,0 +1,29 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>Broadwell</model> + <vendor>Intel</vendor> + <feature policy='require' name='vme'/> + <feature policy='require' name='ds'/> + <feature policy='require' name='acpi'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='ht'/> + <feature policy='require' name='tm'/> + <feature policy='require' name='pbe'/> + <feature policy='require' name='dtes64'/> + <feature policy='require' name='monitor'/> + <feature policy='require' name='ds_cpl'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='smx'/> + <feature policy='require' name='est'/> + <feature policy='require' name='tm2'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='pdcm'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='arat'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> + <feature policy='require' name='invtsc'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml new file mode 100644 index 000000000..9b24941e0 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml @@ -0,0 +1,30 @@ +<cpu> + <arch>x86_64</arch> + <model>Broadwell</model> + <vendor>Intel</vendor> + <feature name='vme'/> + <feature name='ds'/> + <feature name='acpi'/> + <feature name='ss'/> + <feature name='ht'/> + <feature name='tm'/> + <feature name='pbe'/> + <feature name='dtes64'/> + <feature name='monitor'/> + <feature name='ds_cpl'/> + <feature name='vmx'/> + <feature name='smx'/> + <feature name='est'/> + <feature name='tm2'/> + <feature name='xtpr'/> + <feature name='pdcm'/> + <feature name='osxsave'/> + <feature name='f16c'/> + <feature name='rdrand'/> + <feature name='arat'/> + <feature name='tsc_adjust'/> + <feature name='xsaveopt'/> + <feature name='pdpe1gb'/> + <feature name='abm'/> + <feature name='invtsc'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml new file mode 100644 index 000000000..4f253fc08 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml @@ -0,0 +1,14 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>Broadwell</model> + <vendor>Intel</vendor> + <feature policy='require' name='vme'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='vmx'/> + <feature policy='require' name='f16c'/> + <feature policy='require' name='rdrand'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='xsaveopt'/> + <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='abm'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json new file mode 100644 index 000000000..f2aa7f318 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.json @@ -0,0 +1,202 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "pfthreshold": false, + "pku": false, + "rtm": true, + "tsc_adjust": true, + "tsc-deadline": true, + "xstore-en": false, + "tsc-scale": false, + "sse": true, + "smap": true, + "stepping": 4, + "tce": false, + "kvm_steal_time": true, + "smep": true, + "rdpid": false, + "xcrypt": false, + "sse4_2": true, + "monitor": false, + "sse4_1": true, + "kvm-mmu": false, + "flushbyasid": false, + "kvm-steal-time": true, + "lm": true, + "tsc": true, + "adx": true, + "fxsr": true, + "sha-ni": false, + "tm": false, + "pclmuldq": true, + "xgetbv1": false, + "xstore": false, + "vmcb_clean": false, + "vme": true, + "vendor": "GenuineIntel", + "ffxsr": false, + "de": true, + "avx512f": false, + "pse": true, + "ds-cpl": false, + "tbm": false, + "ia64": false, + "phe-en": false, + "f16c": true, + "ds": false, + "mpx": false, + "tsc-adjust": true, + "aes": true, + "avx2": true, + "pbe": false, + "cx16": true, + "ds_cpl": false, + "movbe": true, + "perfctr-nb": false, + "nrip_save": false, + "kvm_mmu": false, + "ospke": false, + "avx512ifma": false, + "vmx": true, + "sep": true, + "xsaveopt": true, + "sse4a": false, + "avx512dq": false, + "i64": true, + "avx512-4vnniw": false, + "xsave": true, + "erms": true, + "hle": true, + "nodeid_msr": false, + "est": false, + "svm_lock": false, + "xop": false, + "model-id": "Intel(R) Core(TM) i7-5600U CPU @ 2.60GHz", + "abm": true, + "avx512er": false, + "sse4.1": true, + "sse4.2": true, + "pause-filter": false, + "lahf-lm": true, + "kvm-nopiodelay": true, + "cmp_legacy": false, + "acpi": false, + "fma4": false, + "popcnt": true, + "mmx": true, + "osxsave": false, + "pcommit": false, + "avx512pf": false, + "clwb": false, + "dca": false, + "pdcm": false, + "xcrypt-en": false, + "3dnow": false, + "invtsc": false, + "tm2": false, + "hypervisor": true, + "kvmclock-stable-bit": true, + "fxsr-opt": false, + "pcid": true, + "sse4-1": true, + "sse4-2": true, + "avx512-vpopcntdq": false, + "avx512-4fmaps": false, + "pause_filter": false, + "svm-lock": false, + "rdrand": true, + "nrip-save": false, + "avx512vl": false, + "x2apic": true, + "kvmclock": true, + "pge": true, + "family": 6, + "dtes64": false, + "xd": true, + "kvm_pv_eoi": true, + "ace2": false, + "kvm_pv_unhalt": true, + "xtpr": false, + "perfctr_nb": false, + "avx512bw": false, + "nx": true, + "lwp": false, + "msr": true, + "ace2-en": false, + "decodeassists": false, + "perfctr-core": false, + "pn": false, + "fma": true, + "nodeid-msr": false, + "kvm_asyncpf": true, + "clflush": true, + "cx8": true, + "mce": true, + "avx512cd": false, + "cr8legacy": false, + "mca": true, + "pni": true, + "rdseed": true, + "apic": true, + "fsgsbase": true, + "cmp-legacy": false, + "kvm-pv-unhalt": true, + "rdtscp": true, + "mmxext": false, + "cid": false, + "ssse3": true, + "extapic": false, + "pse36": true, + "mtrr": true, + "ibs": false, + "la57": false, + "avx": true, + "syscall": true, + "umip": false, + "invpcid": true, + "avx512vbmi": false, + "kvm-asyncpf": true, + "vmcb-clean": false, + "pmm": false, + "cmov": true, + "perfctr_core": false, + "misalignsse": false, + "clflushopt": false, + "pat": true, + "lbrv": false, + "3dnowprefetch": true, + "fpu": true, + "pae": true, + "wdt": false, + "tsc_scale": false, + "skinit": false, + "fxsr_opt": false, + "kvm_nopiodelay": true, + "pmm-en": false, + "phe": false, + "3dnowext": false, + "osvw": false, + "ht": false, + "pdpe1gb": true, + "kvm-pv-eoi": true, + "npt": false, + "xsavec": false, + "lahf_lm": true, + "pclmulqdq": true, + "svm": false, + "sse3": true, + "sse2": true, + "ss": true, + "topoext": false, + "smx": false, + "bmi1": true, + "bmi2": true, + "xsaves": false, + "model": 61 + } + } + }, + "id": "model-expansion" +} diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml new file mode 100644 index 000000000..ecb4a6e15 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat.xml @@ -0,0 +1,41 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000014' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000306d4' ebx='0x00100800' ecx='0x7ffafbff' edx='0xbfebfbff'/> + <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff' ecx='0x00000000' edx='0x00c30000'/> + <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f' ecx='0x000001ff' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000006'/> + <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x11142120'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x021c2fbb' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/> + <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000000'/> + <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000000'/> + <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340' ecx='0x00000340' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/> + <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/> + <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036352d' ecx='0x43205530' edx='0x40205550'/> + <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x362e3220' ebx='0x7a484730' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000001' ecx='0x00000001' edx='0x00000000'/> +</cpudata> -- 2.13.1

2 2

[libvirt] [PATCH] virpcimock: Fix memory leak in pci_driver_new
by ZhiPeng Lu 13 Jul '17

13 Jul '17

@driverpath, allocated by virAsprintfQuiet, was not freed and leaked. Signed-off-by: Zhipeng Lu <lu.zhipeng(a)zte.com.cn> --- tests/virpcimock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index e9408aa..dec9e01 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -480,6 +480,7 @@ pci_driver_new(const char *name, int fail, ...) if (VIR_APPEND_ELEMENT_QUIET(pciDrivers, nPCIDrivers, driver) < 0) ABORT_OOM(); + VIR_FREE(driverpath); } static struct pciDriver * -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu: hotplug virtio_scsi over lsilogic when sicsi controller is not present
by Liang Yan 13 Jul '17

13 Jul '17

It may be better to check virtio-scsi controller first since it is supported better in qemu level. Signed-off-by: Liang Yan<lyan(a)suse.com> --- src/qemu/qemu_domain_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b5b863fe4..9bec0790f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -90,10 +90,10 @@ qemuDomainSetSCSIControllerModel(const virDomainDef *def, } else { if (qemuDomainIsPSeries(def)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI; - } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { - *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) { *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; + } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) { + *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to determine model for scsi controller")); -- 2.13.2

2 3

[libvirt] [PATCH] qemu: shared disks with cache=directsync should be safe for migration
by Peng Hao 12 Jul '17

12 Jul '17

From: Hao Peng <peng.hao2(a)zte.com.cn> At present shared disks can be migrated with either readonly or cache=none. But cache=directsync should be safe for migration, because both cache=directsync and cache=none don't use the host page cache, and cache=direct write through qemu block layer cache. Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> Reviewed-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/qemu/qemu_migration.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c23fffe..9d509dd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1160,11 +1160,12 @@ qemuMigrationIsSafe(virDomainDefPtr def, const char *src = virDomainDiskGetSource(disk); /* Our code elsewhere guarantees shared disks are either readonly (in - * which case cache mode doesn't matter) or used with cache=none */ + * which case cache mode doesn't matter) or used with cache=none or used with cache=directsync */ if (virStorageSourceIsEmpty(disk->src) || disk->src->readonly || disk->src->shared || - disk->cachemode == VIR_DOMAIN_DISK_CACHE_DISABLE) + disk->cachemode == VIR_DOMAIN_DISK_CACHE_DISABLE || + disk->cachemode == VIR_DOMAIN_DISK_CACHE_DIRECTSYNC) continue; /* disks which are migrated by qemu are safe too */ @@ -1188,7 +1189,7 @@ qemuMigrationIsSafe(virDomainDefPtr def, virReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", _("Migration may lead to data corruption if disks" - " use cache != none")); + " use cache != none or cache != directsync")); return false; } -- 1.8.3.1

1 0

[libvirt] Trouble with /var/lib/libvirt/qemu/save mount
by Orion Poplawski 12 Jul '17

12 Jul '17

I'm trying to get libvirt-guests ON_SHUTDOWN=suspend to work on EL7 with a separate mount point for /var/lib/libvirt/qemu/save. It appears that during host shutdown that /var/lib/libvirt/qemu/save gets unmounted before libvirt-guests gets run, resulting in the save images running out of space on my system and being mounted over on boot. I've tried adding: RequiresMountsFor=/var/lib/libvirt/qemu/save to /usr/lib/systemd/system/libvirt-guests.service, but that does not appear to help. Any other ideas? Thanks. -- Orion Poplawski Technical Manager 720-772-5637 NWRA, Boulder/CoRA Office FAX: 303-415-9702 3380 Mitchell Lane orion(a)nwra.com Boulder, CO 80301 http://www.nwra.com

2 2

Re: [libvirt] [Qemu-devel] change x86 default machine type to Q35?
by Eduardo Habkost 12 Jul '17

12 Jul '17

(CCing libvir-list) On Mon, Jul 10, 2017 at 07:45:54PM +0300, Michael S. Tsirkin wrote: > On Mon, Jul 10, 2017 at 10:59:43AM -0300, Eduardo Habkost wrote: > > On Mon, Jul 10, 2017 at 10:42:26AM +0300, Marcel Apfelbaum wrote: > > > On 07/07/2017 21:03, Eduardo Habkost wrote: > > > > On Fri, Jul 07, 2017 at 06:17:57PM +0300, Michael S. Tsirkin wrote: > > > > > On Fri, Jul 07, 2017 at 10:39:49AM -0300, Eduardo Habkost wrote: > > > > > > On Wed, Jul 05, 2017 at 12:32:10PM +0300, Marcel Apfelbaum wrote: > > [...] > > > > > > > > > > > > > > The upper layers should manage the defaults by themselves so > > > > > > > are not supposed to be affected. > > > > > > > > > > > > But they would be. libvirt uses the default machine-type from > > > > > > QEMU. > > > > > > > > > > How about extending the command for supported machines with a > > > > > recommended machine type, and teaching libvirt to use that? > > > > > > > > I don't think QEMU has enough information to decide if it should > > > > recommend "q35" or "pc". > > > > > > We don't really need a complicated rule set, we would just recommend q35 > > > by default. Libvirt will try to create the default machine and if fails > > > for some reason (what would it be?) it can switch to PC. > > > > > > The advanced logic would be "old systems should use PC", where old > > > means Windows XP and before and so on. But this logic should appear > > > in management layers above. > > > > In this case, is there any difference between "changing the > > default to q35" and "recommending q35", for libvirt users? > > > > -- > > Eduardo > > No but libvirt users do not manage e.g. pci slots manually. > They do not use the -cdrom flag. > Etc. > So changing the default is unlikely to break things for them. > I see. If this part is really true (can libvirt developers confirm that?), then the proposed end result makes sense (not having a default for running QEMU directly, but changing default to "q35" for people using libvirt). But I don't see why we would need a new mechanism to make QEMU recommend a machine-type for libvirt, if libvirt could simply choose its own default (or maybe also refuse to pick a default, if libvirt developers decide that's the best solution). > People not using libvirt use some or all of this > and other such functionality, > and changing the default might break things for them. -- Eduardo

6 11

[libvirt] [PATCH] qemu: process: Remove unused qemuCaps
by Cole Robinson 12 Jul '17

12 Jul '17

After 405c0f07f5 qemuCaps is unused here, remove it from the call stack Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_process.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e6522a294..34974c6e5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1877,9 +1877,7 @@ qemuProcessMonitorReportLogError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int -qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, - virDomainChrDefPtr *devices, +qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { @@ -1927,24 +1925,18 @@ qemuProcessLookupPTYs(virDomainDefPtr def ATTRIBUTE_UNUSED, static int qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, - virQEMUCapsPtr qemuCaps, virHashTablePtr info) { size_t i = 0; - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->serials, vm->def->nserials, - info) < 0) + if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, info) < 0) return -1; - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->parallels, vm->def->nparallels, + if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels, info) < 0) return -1; - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->channels, vm->def->nchannels, - info) < 0) + if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, info) < 0) return -1; /* For historical reasons, console[0] can be just an alias * for serial[0]. That's why we need to update it as well. */ @@ -1962,8 +1954,7 @@ qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, } } - if (qemuProcessLookupPTYs(vm->def, qemuCaps, - vm->def->consoles + i, vm->def->nconsoles - i, + if (qemuProcessLookupPTYs(vm->def->consoles + i, vm->def->nconsoles - i, info) < 0) return -1; @@ -2111,7 +2102,6 @@ static int qemuProcessWaitForMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob, - virQEMUCapsPtr qemuCaps, qemuDomainLogContextPtr logCtxt) { int ret = -1; @@ -2135,8 +2125,7 @@ qemuProcessWaitForMonitor(virQEMUDriverPtr driver, ret = -1; if (ret == 0) { - if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, qemuCaps, - info)) < 0) + if ((ret = qemuProcessFindCharDevicePTYsMonitor(vm, info)) < 0) goto cleanup; if ((ret = qemuProcessRefreshChannelVirtioState(driver, vm, info, @@ -5870,7 +5859,7 @@ qemuProcessLaunch(virConnectPtr conn, goto cleanup; VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, logCtxt) < 0) + if (qemuProcessWaitForMonitor(driver, vm, asyncJob, logCtxt) < 0) goto cleanup; if (qemuConnectAgent(driver, vm) < 0) @@ -6724,7 +6713,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, logCtxt); VIR_DEBUG("Waiting for monitor to show up"); - if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->qemuCaps, NULL) < 0) + if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, NULL) < 0) goto error; if (qemuConnectAgent(driver, vm) < 0) -- 2.13.0

2 2

[libvirt] [PATCH] news: qemu platform serial devices now use -chardev
by Cole Robinson 12 Jul '17

12 Jul '17

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/news.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index f44d676c1..10faad673 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -42,6 +42,17 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + qemu: arm/aarch64 serial devices can now use chardev features + </summary> + <description> + qemu VMs that depend on platform serial devices can now use + qemu's -chardev option, which enables access to advanced features + like log file configuration. This applies to the default serial + devices for arm, aarch64, and some ppc configurations. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.13.0

2 2

[libvirt] [PATCH] Avoid hidden cgroup mount points
by Juan Hernandez 12 Jul '17

12 Jul '17

Currently the scan of the /proc/mounts file used to find cgroup mount points doesn't take into account that mount points may hidden by other mount points. For, example in certain Kubernetes environments the /proc/mounts contains the following lines: cgroup /sys/fs/cgroup/net_prio,net_cls cgroup ... tmpfs /sys/fs/cgroup tmpfs ... cgroup /sys/fs/cgroup/net_cls,net_prio cgroup ... In this particular environment the first mount point is hidden by the second one. The correct mount point is the third one, but libvirt will never process it because it only checks the first mount point for each controller (net_cls in this case). So libvirt will try to use the first mount point, which doesn't actually exist, and the complete detection process will fail. To avoid that issue this patch changes the virCgroupDetectMountsFromFile function so that when there are duplicates it takes the information from the last line in /proc/mounts. This requires removing the previous explicit condition to skip duplicates, and adding code to free the memory used by the processing of duplicated lines. Related-To: https://bugzilla.redhat.com/1468214 Related-To: https://github.com/kubevirt/libvirt/issues/4 Signed-off-by: Juan Hernandez <jhernand(a)redhat.com> --- src/util/vircgroup.c | 23 ++++++++++++++--------- tests/vircgroupdata/kubevirt.mounts | 36 ++++++++++++++++++++++++++++++++++++ tests/vircgroupdata/kubevirt.parsed | 10 ++++++++++ tests/vircgrouptest.c | 1 + 4 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 tests/vircgroupdata/kubevirt.mounts create mode 100644 tests/vircgroupdata/kubevirt.parsed diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 5aa1db5..41d90e7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -397,6 +397,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, const char *typestr = virCgroupControllerTypeToString(i); int typelen = strlen(typestr); char *tmp = entry.mnt_opts; + struct virCgroupController *controller = &group->controllers[i]; while (tmp) { char *next = strchr(tmp, ','); int len; @@ -406,18 +407,21 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, } else { len = strlen(tmp); } - /* NB, the same controller can appear >1 time in mount list - * due to bind mounts from one location to another. Pick the - * first entry only - */ - if (typelen == len && STREQLEN(typestr, tmp, len) && - !group->controllers[i].mountPoint) { + + if (typelen == len && STREQLEN(typestr, tmp, len)) { char *linksrc; struct stat sb; char *tmp2; - if (VIR_STRDUP(group->controllers[i].mountPoint, - entry.mnt_dir) < 0) + /* Note that the lines in /proc/mounts have the same + * order than the mount operations, and that there may + * be duplicates due to bind mounts. This means + * that the same mount point may be processed more than + * once. We need to save the results of the last one, + * and we need to be careful to release the memory used + * by previous processing. */ + VIR_FREE(controller->mountPoint); + if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0) goto error; tmp2 = strrchr(entry.mnt_dir, '/'); @@ -453,7 +457,8 @@ virCgroupDetectMountsFromFile(virCgroupPtr group, VIR_WARN("Expecting a symlink at %s for controller %s", linksrc, typestr); } else { - group->controllers[i].linkPoint = linksrc; + VIR_FREE(controller->linkPoint); + controller->linkPoint = linksrc; } } } diff --git a/tests/vircgroupdata/kubevirt.mounts b/tests/vircgroupdata/kubevirt.mounts new file mode 100644 index 0000000..b0d31bb --- /dev/null +++ b/tests/vircgroupdata/kubevirt.mounts @@ -0,0 +1,36 @@ +tmpfs /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +cgroup /sys/fs/cgroup/cpuacct,cpu cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /sys/fs/cgroup/net_prio,net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_prio,net_cls 0 0 +tmpfs /host-sys/fs/cgroup tmpfs ro,nosuid,nodev,noexec,relatime,mode=755 0 0 +cgroup /host-sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +cgroup /host-sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /host-sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0 +cgroup /host-sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /host-sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /host-sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /host-sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +cgroup /host-sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /host-sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /host-sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /host-sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio,net_cls 0 0 +tmpfs /sys/fs/cgroup tmpfs ro,nosuid,nodev,noexec,relatime,mode=755 0 0 +cgroup /sys/fs/cgroup/systemd cgroup rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd 0 0 +cgroup /sys/fs/cgroup/cpu,cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct,cpu 0 0 +cgroup /sys/fs/cgroup/pids cgroup rw,nosuid,nodev,noexec,relatime,pids 0 0 +cgroup /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0 +cgroup /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0 +cgroup /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0 +cgroup /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0 +cgroup /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0 +cgroup /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0 +cgroup /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0 +cgroup /sys/fs/cgroup/net_cls,net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio,net_cls 0 0 diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed new file mode 100644 index 0000000..3377af0 --- /dev/null +++ b/tests/vircgroupdata/kubevirt.parsed @@ -0,0 +1,10 @@ +cpu /sys/fs/cgroup/cpu,cpuacct +cpuacct /sys/fs/cgroup/cpu,cpuacct +cpuset /sys/fs/cgroup/cpuset +memory /sys/fs/cgroup/memory +devices /sys/fs/cgroup/devices +freezer /sys/fs/cgroup/freezer +blkio /sys/fs/cgroup/blkio +net_cls /sys/fs/cgroup/net_cls,net_prio +perf_event /sys/fs/cgroup/perf_event +name=systemd /sys/fs/cgroup/systemd diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 8af5e2c..b932b1a 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -885,6 +885,7 @@ mymain(void) DETECT_MOUNTS("cgroups3"); DETECT_MOUNTS("all-in-one"); DETECT_MOUNTS("no-cgroups"); + DETECT_MOUNTS("kubevirt"); if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0) ret = -1; -- 2.9.4

3 2

[libvirt] [PATCH v2 0/5] Misc cleanups for internal.h & fix tests with CLang
by Daniel P. Berrange 12 Jul '17

12 Jul '17

When writing the fix for test suite mocking under CLang I found a bunch of cruft in internal.h The first four patches thus cleanup up internal.h. We then add the extra annotations requird to prevent CLang optimizer breaking mock overrides. Changed in v2: - Fixed version check to find clang - Use 'printf' instead of 'gnu_printf' on clang still - Addd fix for mock functions under clang Daniel P. Berrange (5): Remove duplicate define of __GNUC_PREREQ Require use of GCC 4.4 or CLang compilers Remove network constants out of internal.h Remove incorrectly used TODO macro Prevent more compiler optimization of mockable functions build-aux/mock-noinline.pl | 2 +- config-post.h | 24 ++--- src/check-symfile.pl | 2 +- src/internal.h | 173 ++++++++++----------------------- src/libxl/libxl_conf.c | 1 + src/nwfilter/nwfilter_dhcpsnoop.c | 1 + src/nwfilter/nwfilter_gentech_driver.c | 1 + src/qemu/qemu_capspriv.h | 2 +- src/qemu/qemu_conf.c | 1 + src/rpc/virnetsocket.h | 4 +- src/util/vircommand.h | 2 +- src/util/vircrypto.h | 2 +- src/util/virfile.h | 2 +- src/util/virhostcpu.h | 4 +- src/util/virmacaddr.h | 2 +- src/util/virnetdev.h | 8 +- src/util/virnetdevip.h | 2 +- src/util/virnetdevopenvswitch.h | 2 +- src/util/virnetdevtap.h | 6 +- src/util/virnuma.h | 16 +-- src/util/virrandom.h | 6 +- src/util/virscsi.h | 2 +- src/util/virscsivhost.h | 2 +- src/util/virsocketaddr.h | 16 +++ src/util/virtpm.h | 2 +- src/util/virutil.c | 1 + src/util/virutil.h | 10 +- src/util/viruuid.h | 2 +- src/vz/vz_sdk.c | 1 + src/xen/xen_hypervisor.c | 6 +- src/xen/xend_internal.c | 6 +- 31 files changed, 135 insertions(+), 176 deletions(-) -- 2.9.4

6 19

[libvirt] [PATCH] qemuDomainGetPreservedMountPath: rename @mount
by Michal Privoznik 12 Jul '17

12 Jul '17

Obviously, old gcc-s ale sad when a variable shares the name with a function. And we do have such variable (added in 4d8a914be0): @mount. Rename it to @mountpoint so that compiler's happy again. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker and trivial rules. src/qemu/qemu_domain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e146bc88a..ae260de00 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7578,9 +7578,9 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, * qemuDomainGetPreservedMountPath: * @cfg: driver configuration data * @vm: domain object - * @mount: mount point path to convert + * @mountpoint: mount point path to convert * - * For given @mount point return new path where the mount point + * For given @mountpoint return new path where the mount point * should be moved temporarily whilst building the namespace. * * Returns: allocated string on success which the caller must free, @@ -7589,21 +7589,21 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, static char * qemuDomainGetPreservedMountPath(virQEMUDriverConfigPtr cfg, virDomainObjPtr vm, - const char *mount) + const char *mountpoint) { char *path = NULL; char *tmp; - const char *suffix = mount + strlen(DEVPREFIX); + const char *suffix = mountpoint + strlen(DEVPREFIX); size_t off; - if (STREQ(mount, "/dev")) + if (STREQ(mountpoint, "/dev")) suffix = "dev"; if (virAsprintf(&path, "%s/%s.%s", cfg->stateDir, vm->def->name, suffix) < 0) return NULL; - /* Now consider that @mount is "/dev/blah/blah2". + /* Now consider that @mountpoint is "/dev/blah/blah2". * @suffix then points to "blah/blah2". However, caller * expects all the @paths to be the same depth. The * caller doesn't always do `mkdir -p` but sometimes bare -- 2.13.0

1 0

[libvirt] [PATCH] qemu: Provide non-linux stub for qemuDomainAttachDeviceMknodRecursive
by Michal Privoznik 11 Jul '17

11 Jul '17

The way we create devices under /dev is highly linux specific. For instance we do mknod(), mount(), umount(), etc. Some platforms are even missing some of these functions. Then again, as declared in qemuDomainNamespaceAvailable(): namespaces are linux only. Therefore, to avoid obfuscating the code by trying to make it compile on weird platforms, just provide a non-linux stub for qemuDomainAttachDeviceMknodRecursive(). At the same time, qemuDomainAttachDeviceMknodHelper() which actually calls the non-existent functions is moved under ifdef __linux__ block since its only caller is in that block too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 080ff336e..eb1a9794b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8541,6 +8541,8 @@ struct qemuDomainAttachDeviceMknodData { }; +/* Our way of creating devices is highly linux specific */ +#if defined(__linux__) static int qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, void *opaque) @@ -8638,7 +8640,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, goto cleanup; } -#ifdef WITH_SELINUX +# ifdef WITH_SELINUX if (data->tcon && lsetfilecon_raw(data->file, (VIR_SELINUX_CTX_CONST char *) data->tcon) < 0) { VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR @@ -8650,7 +8652,7 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, goto cleanup; } } -#endif +# endif /* Finish mount process started earlier. */ if (isReg && @@ -8661,9 +8663,9 @@ qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, cleanup: if (ret < 0 && delDevice) unlink(data->file); -#ifdef WITH_SELINUX +# ifdef WITH_SELINUX freecon(data->tcon); -#endif +# endif virFileFreeACLs(&data->acl); return ret; } @@ -8754,14 +8756,14 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, goto cleanup; } -#ifdef WITH_SELINUX +# ifdef WITH_SELINUX if (lgetfilecon_raw(file, &data.tcon) < 0 && (errno != ENOTSUP && errno != ENODATA)) { virReportSystemError(errno, _("Unable to get SELinux label from %s"), file); goto cleanup; } -#endif +# endif if (STRPREFIX(file, DEVPREFIX)) { size_t i; @@ -8798,9 +8800,9 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, ret = 0; cleanup: -#ifdef WITH_SELINUX +# ifdef WITH_SELINUX freecon(data.tcon); -#endif +# endif virFileFreeACLs(&data.acl); if (isReg && target) umount(target); @@ -8810,6 +8812,26 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, } +#else /* !defined(__linux__) */ + + +static int +qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm ATTRIBUTE_UNUSED, + const char *file ATTRIBUTE_UNUSED, + char * const *devMountsPath ATTRIBUTE_UNUSED, + size_t ndevMountsPath ATTRIBUTE_UNUSED, + unsigned int ttl ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Namespaces are not supported on this platform.")); + return -1; +} + + +#endif /* !defined(__linux__) */ + + static int qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.13.0

2 1

[libvirt] [PATCH 0/6] qemu: Clean up storage file access
by Peter Krempa 11 Jul '17

11 Jul '17

A collection of few cleanups and bugfixes. Peter Krempa (6): lib: Remove misplaced and redundant comments tests: storage: Fully register storage driver storage: Split out virStorageSource accessors to separate file storage: Make virStorageFileReadHeader more universal qemu: Use storage driver APIs in qemuDomainBlockPeek qemu: Support only raw volumes in qemuDomainBlockPeek po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt-domain.c | 4 +- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 35 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.h | 9 +- src/storage/storage_backend_fs.c | 20 +- src/storage/storage_backend_gluster.c | 37 ++- src/storage/storage_driver.c | 551 +------------------------------ src/storage/storage_driver.h | 28 -- src/storage/storage_source.c | 587 ++++++++++++++++++++++++++++++++++ src/storage/storage_source.h | 54 ++++ tests/virstoragetest.c | 6 +- 14 files changed, 709 insertions(+), 627 deletions(-) create mode 100644 src/storage/storage_source.c create mode 100644 src/storage/storage_source.h -- 2.12.2

2 16

[libvirt] [PATCH] internal: don't use weak symbols for Win32 platform
by Daniel P. Berrange 11 Jul '17

11 Jul '17

The Win32 platform will fail to link if you use weak symbols because it is incompatible with exporting symbols in a DLL: Cannot export virRandomGenerateWWN: symbol wrong type (2 vs 3) We only need weak symbols for our test suite to do LD_PRELOAD and this doesn't work on Win32, so we can just drop the hack for Win32 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for Win32 src/internal.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/internal.h b/src/internal.h index 00edd4f..edc3587 100644 --- a/src/internal.h +++ b/src/internal.h @@ -128,10 +128,14 @@ * */ # ifndef ATTRIBUTE_MOCKABLE -# if __GNUC_PREREQ(4, 5) -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __noclone__, __weak__)) +# if defined(WIN32) +# define ATTRIBUTE_MOCKABLE # else -# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __weak__)) +# if __GNUC_PREREQ(4, 5) +# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __noclone__, __weak__)) +# else +# define ATTRIBUTE_MOCKABLE __attribute__((__noinline__, __weak__)) +# endif # endif # endif -- 2.9.4

1 0

[libvirt] [PATCH] qemu: handle missing bind host/service on chardev hotplug
by Ján Tomko 11 Jul '17

11 Jul '17

On domain startup, bind host or bind service can be omitted and we will format a working command line. Extend this to hotplug as well and specify the service to QEMU even if the host is missing. https://bugzilla.redhat.com/show_bug.cgi?id=1452441 --- src/qemu/qemu_monitor_json.c | 13 ++++++++++--- tests/qemumonitorjsontest.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0837290..ca9bb14 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6429,6 +6429,8 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, virJSONValuePtr data = NULL; virJSONValuePtr addr = NULL; const char *backend_type = NULL; + const char *host; + const char *port; char *tlsalias = NULL; bool telnet; @@ -6492,9 +6494,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, virJSONValueObjectAppend(data, "remote", addr) < 0) goto error; - if (chr->data.udp.bindHost) { - addr = qemuMonitorJSONBuildInetSocketAddress(chr->data.udp.bindHost, - chr->data.udp.bindService); + host = chr->data.udp.bindHost; + port = chr->data.udp.bindService; + if (host || port) { + if (!host) + host = ""; + if (!port) + port = ""; + addr = qemuMonitorJSONBuildInetSocketAddress(host, port); if (!addr || virJSONValueObjectAppend(data, "local", addr) < 0) goto error; diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index e9f9d47..3de901c 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -895,6 +895,17 @@ qemuMonitorJSONTestAttachChardev(virDomainXMLOptionPtr xmlopt) "'data':{'host':'localhost'," "'port':'4321'}}}}}"); + chr.data.udp.bindHost = NULL; + chr.data.udp.bindService = (char *) "4321"; + CHECK("udp", false, + "{'id':'alias'," + "'backend':{'type':'udp'," + "'data':{'remote':{'type':'inet'," + "'data':{'host':'example.com'," + "'port':'1234'}}," + "'local':{'type':'inet'," + "'data':{'host':''," + "'port':'4321'}}}}}"); memset(&chr, 0, sizeof(chr)); chr.type = VIR_DOMAIN_CHR_TYPE_UNIX; chr.data.nix.path = (char *) "/path/to/socket"; -- 2.10.2

2 2

[libvirt] [PATCH] tests: add further XML namespace test
by Daniel P. Berrange 11 Jul '17

11 Jul '17

Validate that we can pass QEMU command line options using a default namespace, instead of a prefixed namespace Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .../qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args | 25 ++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml | 30 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 56 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args new file mode 100644 index 0000000..562b562 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +NS=ns \ +BAR='' \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-unknown parameter diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml new file mode 100644 index 0000000..491fc2d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-alt.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + </devices> + <commandline xmlns='http://libvirt.org/schemas/domain/qemu/1.0'> + <arg value='-unknown'/> + <arg value='parameter'/> + <env name='NS' value='ns'/> + <env name='BAR'/> + </commandline> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 27eea70..be2a9bc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1505,6 +1505,7 @@ mymain(void) DO_TEST("qemu-ns", NONE); DO_TEST("qemu-ns-no-env", NONE); + DO_TEST("qemu-ns-alt", NONE); DO_TEST("smp", NONE); -- 2.9.4

2 3

[libvirt] [PATCH] qemu: Fix qemuDomainGetBlockInfo allocation value setting
by John Ferlan 11 Jul '17

11 Jul '17

https://bugzilla.redhat.com/show_bug.cgi?id=1467826 Commit id 'b9b1aa639' was supposed to add logic to set the allocation for sparse files when wr_highest_offset was zero; however, an unconditional setting was done just prior. For block devices, this means allocation is always returning 0 since 'actual-size' will be zero. Remove the unconditional setting and add the note about it being possible to still be zero for block devices. As soon as the guest starts writing to the volume, the allocation value will then be obtainable from qemu via the wr_highest_offset. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cdb727b..66fb80a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11711,10 +11711,9 @@ qemuDomainGetBlockInfo(virDomainPtr dom, * Additionally, if qemu hasn't written to the file yet, then set the * allocation to whatever qemu returned for physical (e.g. the "actual- * size" from the json query) as that will match the expected allocation - * value for this API. */ + * value for this API. NB: May still be 0 for block. */ if (entry->physical == 0 || info->allocation == 0 || info->allocation == entry->physical) { - info->allocation = entry->physical; if (info->allocation == 0) info->allocation = entry->physical; -- 2.9.4

2 1

[libvirt] How to make gic_version=3 as defailt to qemu on arm64
by Vishnu Pajjuri 11 Jul '17

11 Jul '17

Hi I'm running Openstack which is installed by using devstack. But it is not launching VMs. >From command line with gic_version=3 option it is running. But openstack glance doesn't have any privilege to specify gic version. On my ARM64 board gicv2 is not supported, so i want to make gicv3 as default one to pass to qemu. Kindly suggest any specific version of vibvirt or patch such that libvirt should pass gicv3 as default one. Thanks in Advance -Vishnu.

2 1

[libvirt] [PATCH] tests: virjson: Reuse VIR_TEST_VERBOSE in testJSONCopy
by Peter Krempa 11 Jul '17

11 Jul '17

Use VIR_TEST_VERBOSE instead of calling virTestGetVerbose and conditionally fprintf. Additionally remove redundant setting of 'ret' to -1. --- Pushed as trivial. tests/virjsontest.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/virjsontest.c b/tests/virjsontest.c index b3a230a02..b9c210620 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -240,40 +240,31 @@ testJSONCopy(const void *data) json = virJSONValueFromString(info->doc); if (!json) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to parse %s\n", info->doc); - ret = -1; + VIR_TEST_VERBOSE("Failed to parse %s\n", info->doc); goto cleanup; } jsonCopy = virJSONValueCopy(json); if (!jsonCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to copy JSON data\n"); - ret = -1; + VIR_TEST_VERBOSE("Failed to copy JSON data\n"); goto cleanup; } result = virJSONValueToString(json, false); if (!result) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format original JSON data\n"); - ret = -1; + VIR_TEST_VERBOSE("Failed to format original JSON data\n"); goto cleanup; } resultCopy = virJSONValueToString(json, false); if (!resultCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format copied JSON data\n"); - ret = -1; + VIR_TEST_VERBOSE("Failed to format copied JSON data\n"); goto cleanup; } if (STRNEQ(result, resultCopy)) { if (virTestGetVerbose()) virTestDifference(stderr, result, resultCopy); - ret = -1; goto cleanup; } @@ -282,24 +273,19 @@ testJSONCopy(const void *data) result = virJSONValueToString(json, true); if (!result) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format original JSON data\n"); - ret = -1; + VIR_TEST_VERBOSE("Failed to format original JSON data\n"); goto cleanup; } resultCopy = virJSONValueToString(json, true); if (!resultCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format copied JSON data\n"); - ret = -1; + VIR_TEST_VERBOSE("Failed to format copied JSON data\n"); goto cleanup; } if (STRNEQ(result, resultCopy)) { if (virTestGetVerbose()) virTestDifference(stderr, result, resultCopy); - ret = -1; goto cleanup; } -- 2.12.2

1 0

[libvirt] [PATCH 0/9] Properly implement json pseudo-protocol string deflattening
by Peter Krempa 11 Jul '17

11 Jul '17

In qemu's new syntax starting from 2.9 it's possible to have nested objects in the json pseudo protocol string specifying a backing store for an image. Libvirt would not be able to handle some of them, since the json deflattener was meant to deflatten only 1 layer. Peter Krempa (9): tests: Rename jsontest to virjsontest util: json: Add virJSONValueIsObject util: Move JSON object deflattening code to json utility file util: json: Don't remove the 'file' subobject when deflattening tests: json: Add test for the deflattening function util: json: Properly implement JSON deflattening util: json: Recursively deflatten objects virJSONValueObjectDeflatten util: storage: Always deflatten JSON pseudo-protocol objects tests: Validate that JSON deflattening fixed nested json pseudo-protocol strings src/libvirt_private.syms | 2 + src/util/virjson.c | 115 +++++++++++++++++++++ src/util/virjson.h | 4 + src/util/virstoragefile.c | 79 ++------------ tests/Makefile.am | 8 +- tests/virjsondata/deflatten-basic-file-in.json | 8 ++ tests/virjsondata/deflatten-basic-file-out.json | 10 ++ tests/virjsondata/deflatten-basic-generic-in.json | 14 +++ tests/virjsondata/deflatten-basic-generic-out.json | 20 ++++ .../deflatten-concat-double-key-in.json | 7 ++ tests/virjsondata/deflatten-concat-in.json | 5 + tests/virjsondata/deflatten-concat-out.json | 8 ++ tests/virjsondata/deflatten-deep-file-in.json | 9 ++ tests/virjsondata/deflatten-deep-file-out.json | 23 +++++ tests/virjsondata/deflatten-deep-generic-in.json | 9 ++ tests/virjsondata/deflatten-deep-generic-out.json | 27 +++++ tests/virjsondata/deflatten-double-key-in.json | 4 + tests/virjsondata/deflatten-nested-in.json | 16 +++ tests/virjsondata/deflatten-nested-out.json | 28 +++++ tests/virjsondata/deflatten-qemu-sheepdog-in.json | 11 ++ tests/virjsondata/deflatten-qemu-sheepdog-out.json | 13 +++ tests/virjsondata/deflatten-unflattened-in.json | 12 +++ tests/virjsondata/deflatten-unflattened-out.json | 14 +++ tests/{jsontest.c => virjsontest.c} | 75 ++++++++++++++ tests/virstoragetest.c | 10 ++ 25 files changed, 458 insertions(+), 73 deletions(-) create mode 100644 tests/virjsondata/deflatten-basic-file-in.json create mode 100644 tests/virjsondata/deflatten-basic-file-out.json create mode 100644 tests/virjsondata/deflatten-basic-generic-in.json create mode 100644 tests/virjsondata/deflatten-basic-generic-out.json create mode 100644 tests/virjsondata/deflatten-concat-double-key-in.json create mode 100644 tests/virjsondata/deflatten-concat-in.json create mode 100644 tests/virjsondata/deflatten-concat-out.json create mode 100644 tests/virjsondata/deflatten-deep-file-in.json create mode 100644 tests/virjsondata/deflatten-deep-file-out.json create mode 100644 tests/virjsondata/deflatten-deep-generic-in.json create mode 100644 tests/virjsondata/deflatten-deep-generic-out.json create mode 100644 tests/virjsondata/deflatten-double-key-in.json create mode 100644 tests/virjsondata/deflatten-nested-in.json create mode 100644 tests/virjsondata/deflatten-nested-out.json create mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-in.json create mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-out.json create mode 100644 tests/virjsondata/deflatten-unflattened-in.json create mode 100644 tests/virjsondata/deflatten-unflattened-out.json rename tests/{jsontest.c => virjsontest.c} (89%) -- 2.12.2

3 21

[libvirt] [PATCH 0/5] tests: json: Improve testing of parsing and formatting
by Peter Krempa 11 Jul '17

11 Jul '17

For an experiment I was doing I needed to nest JSON string into an attribute of a different JSON string, so I wrote some tests for that. The experiment failed, but the tests may make sense to have in libvirt. Peter Krempa (5): tests: Rename jsontest to virjsontest tests: virjson: Modify logic in testJSONFromString tests: virjson: Remove spaces from 'very-hard' parsing example tests: virjson: Test formatting along with parsing of JSON objects tests: virjson: Test string escaping tests/Makefile.am | 8 +- tests/{jsontest.c => virjsontest.c} | 195 +++++++++++++++++++++++++++--------- 2 files changed, 150 insertions(+), 53 deletions(-) rename tests/{jsontest.c => virjsontest.c} (69%) -- 2.12.2

1 6

[libvirt] [PATCH 0/8] Yet another round of qemu namespace fixes
by Michal Privoznik 11 Jul '17

11 Jul '17

I've encountered couple of problems while playing with the namespaces. For the first issue (2/8) I've got a confirmation from openstack guys that it fixes their issue. Michal Privoznik (8): conf: Rename and expose virDomainChrSourceDefPath qemuDomainBuildNamespace: Handle special file mount points qemu: Move preserved mount points path generation into a separate function qemuDomainCreateDeviceRecursive: Fail on unsupported file type qemuDomainAttachDeviceMknodHelper: Fail on unsupported file type qemuDomainCreateDeviceRecursive: Support file mount points qemuDomainAttachDeviceMknodRecursive: Support file mount points qemu ns: Create chardev backends more frequently src/conf/domain_audit.c | 44 ++--------- src/conf/domain_conf.c | 33 +++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 186 ++++++++++++++++++++++++++++++++++------------- 5 files changed, 178 insertions(+), 88 deletions(-) -- 2.13.0

2 25

[libvirt] [PATCH go-xml] Support WWN tag in disks
by Thomas Hipp 11 Jul '17

11 Jul '17

Support the WWN (World Wide Name) tag in disks, and add test code. Signed-off-by: Thomas Hipp <thipp(a)suse.de> --- domain.go | 1 + domain_test.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/domain.go b/domain.go index b9b0f77..93e2b56 100644 --- a/domain.go +++ b/domain.go @@ -124,6 +124,7 @@ type DomainDisk struct { Shareable *DomainDiskShareable `xml:"shareable"` Address *DomainAddress `xml:"address"` Boot *DomainDeviceBoot `xml:"boot"` + WWN string `xml:"wwn,omitempty"` } type DomainFilesystemDriver struct { diff --git a/domain_test.go b/domain_test.go index 47e5e26..9568f9e 100644 --- a/domain_test.go +++ b/domain_test.go @@ -1178,6 +1178,7 @@ var domainTestData = []struct { Bus: "virtio", }, Serial: "fishfood", + WWN: "0123456789abcdef", }, Expected: []string{ `<disk type="file" device="cdrom">`, @@ -1185,6 +1186,7 @@ var domainTestData = []struct { ` <source file="/var/lib/libvirt/images/demo.qcow2"></source>`, ` <target dev="vda" bus="virtio"></target>`, ` <serial>fishfood</serial>`, + ` <wwn>0123456789abcdef</wwn>`, `</disk>`, }, }, -- 2.13.2

2 1

[libvirt] [PATCH go-xml v3] Add support for QEMU
by Thomas Hipp 11 Jul '17

11 Jul '17

Add support for QEMU, and add test code. Signed-off-by: Thomas Hipp <thipp(a)suse.de> --- Changes since v2: - set default ns in commandline subtree - remove ns prefix "qemu:" --- domain.go | 50 +++++++++++++++++++++++++++++++++----------------- domain_test.go | 27 +++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/domain.go b/domain.go index b9b0f77..d5d358a 100644 --- a/domain.go +++ b/domain.go @@ -590,27 +590,43 @@ type DomainFeatureList struct { SMM *DomainFeatureState `xml:"smm"` } +type DomainQEMUCommandlineArg struct { + Value string `xml:"value,attr"` +} + +type DomainQEMUCommandlineEnv struct { + Name string `xml:"name,attr"` + Value string `xml:"value,attr,omitempty"` +} + +type DomainQEMUCommandline struct { + XMLName xml.Name `xml:"http://libvirt.org/schemas/domain/qemu/1.0 commandline"` + Args []DomainQEMUCommandlineArg `xml:"arg"` + Envs []DomainQEMUCommandlineEnv `xml:"env"` +} + // NB, try to keep the order of fields in this struct // matching the order of XML elements that libvirt // will generate when dumping XML. type Domain struct { - XMLName xml.Name `xml:"domain"` - Type string `xml:"type,attr,omitempty"` - Name string `xml:"name"` - UUID string `xml:"uuid,omitempty"` - Memory *DomainMemory `xml:"memory"` - CurrentMemory *DomainMemory `xml:"currentMemory"` - MaximumMemory *DomainMaxMemory `xml:"maxMemory"` - VCPU *DomainVCPU `xml:"vcpu"` - Resource *DomainResource `xml:"resource"` - SysInfo *DomainSysInfo `xml:"sysinfo"` - OS *DomainOS `xml:"os"` - Features *DomainFeatureList `xml:"features"` - CPU *DomainCPU `xml:"cpu"` - OnPoweroff string `xml:"on_poweroff,omitempty"` - OnReboot string `xml:"on_reboot,omitempty"` - OnCrash string `xml:"on_crash,omitempty"` - Devices *DomainDeviceList `xml:"devices"` + XMLName xml.Name `xml:"domain"` + Type string `xml:"type,attr,omitempty"` + Name string `xml:"name"` + UUID string `xml:"uuid,omitempty"` + Memory *DomainMemory `xml:"memory"` + CurrentMemory *DomainMemory `xml:"currentMemory"` + MaximumMemory *DomainMaxMemory `xml:"maxMemory"` + VCPU *DomainVCPU `xml:"vcpu"` + Resource *DomainResource `xml:"resource"` + SysInfo *DomainSysInfo `xml:"sysinfo"` + OS *DomainOS `xml:"os"` + Features *DomainFeatureList `xml:"features"` + CPU *DomainCPU `xml:"cpu"` + OnPoweroff string `xml:"on_poweroff,omitempty"` + OnReboot string `xml:"on_reboot,omitempty"` + OnCrash string `xml:"on_crash,omitempty"` + Devices *DomainDeviceList `xml:"devices"` + QEMUCommandline *DomainQEMUCommandline } func (d *Domain) Unmarshal(doc string) error { diff --git a/domain_test.go b/domain_test.go index 47e5e26..f2d83fc 100644 --- a/domain_test.go +++ b/domain_test.go @@ -1141,6 +1141,33 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "qemu", + Name: "test", + QEMUCommandline: &DomainQEMUCommandline{ + Args: []DomainQEMUCommandlineArg{ + DomainQEMUCommandlineArg{Value: "-newarg"}, + DomainQEMUCommandlineArg{Value: "-oldarg"}, + }, + Envs: []DomainQEMUCommandlineEnv{ + DomainQEMUCommandlineEnv{Name: "QEMU_ENV", Value: "VAL"}, + DomainQEMUCommandlineEnv{Name: "QEMU_VAR", Value: "VAR"}, + }, + }, + }, + Expected: []string{ + `<domain type="qemu">`, + ` <name>test</name>`, + ` <commandline xmlns="http://libvirt.org/schemas/domain/qemu/1.0">`, + ` <arg value="-newarg"></arg>`, + ` <arg value="-oldarg"></arg>`, + ` <env name="QEMU_ENV" value="VAL"></env>`, + ` <env name="QEMU_VAR" value="VAR"></env>`, + ` </commandline>`, + `</domain>`, + }, + }, /* Tests for sub-documents that can be hotplugged */ { -- 2.13.2

2 1

[libvirt] [PATCH go-xml] Add support for domain clock and test code
by zhenwei.pi 11 Jul '17

11 Jul '17

Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 7 +++++++ domain_test.go | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/domain.go b/domain.go index b9b0f77..1d020aa 100644 --- a/domain.go +++ b/domain.go @@ -532,6 +532,12 @@ type DomainCPU struct { Features []DomainCPUFeature `xml:"feature"` } +type DomainClock struct { + Offset string `xml:"offset,attr,omitempty"` + Basic string `xml:"basic,attr,omitempty"` + Adjustment int `xml:"adjustment,attr,omitempty"` +} + type DomainFeature struct { } @@ -607,6 +613,7 @@ type Domain struct { OS *DomainOS `xml:"os"` Features *DomainFeatureList `xml:"features"` CPU *DomainCPU `xml:"cpu"` + Clock *DomainClock `xml:"clock,omitempty"` OnPoweroff string `xml:"on_poweroff,omitempty"` OnReboot string `xml:"on_reboot,omitempty"` OnCrash string `xml:"on_crash,omitempty"` diff --git a/domain_test.go b/domain_test.go index 47e5e26..536b94c 100644 --- a/domain_test.go +++ b/domain_test.go @@ -491,6 +491,11 @@ var domainTestData = []struct { }, }, }, + Clock: &DomainClock{ + Offset: "variable", + Basic: "utc", + Adjustment: 28794, + }, }, Expected: []string{ `<domain type="kvm">`, @@ -524,6 +529,7 @@ var domainTestData = []struct { ` <initarg>--unit</initarg>`, ` <initarg>emergency.service</initarg>`, ` </os>`, + ` <clock offset="variable" basic="utc" adjustment="28794"></clock>`, `</domain>`, }, }, -- 2.7.4

2 1

[libvirt] [PATCH] vz: allow to start vz driver without host cache info
by Mikhail Feoktistov 11 Jul '17

11 Jul '17

--- src/vz/vz_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6f4aee3..eb97e54 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -119,7 +119,7 @@ vzBuildCapabilities(void) goto error; if (virCapabilitiesInitCaches(caps) < 0) - goto error; + VIR_WARN("Failed to get host CPU cache info"); verify(ARRAY_CARDINALITY(archs) == ARRAY_CARDINALITY(emulators)); -- 1.8.3.1

2 3

[libvirt] [PATCH] autogen.sh: tell user the correct make command
by Daniel P. Berrange 11 Jul '17

11 Jul '17

When autogen.sh finishes it helpfully prints "Now type 'make' to compile libvirt." which is fine if on a host with GNU make, but on *BSD running 'make' will end in tears. We should tell users to run 'gmake' on these platforms. If 'gmake' doesn't exist then we should report an error too "GNU make is required to build libvirt" Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autogen.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d5d836a..1e99ce8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -193,4 +193,21 @@ else fi echo -echo "Now type 'make' to compile libvirt." + +# Make sure we can find GNU make and tell the user +# the right command to run +make -v | grep "GNU Make" 1>/dev/null 2>&1 +if test $? = 0 +then + MAKE=make +else + which gmake 1>/dev/null 2>&1 + if test $? = 0 + then + MAKE=gmake + else + die "GNU make is required to build libvirt" + fi +fi + +echo "Now type '$MAKE' to compile libvirt." -- 2.9.4

4 4

[libvirt] [PATCH v4 0/6] Fix error reporting in streams
by Michal Privoznik 11 Jul '17

11 Jul '17

v4 of: https://www.redhat.com/archives/libvir-list/2017-June/msg00190.html Frankly, nothing much changed since v3, but the discussion on those patches got very hairy and without any explicit ACKs. So I'm resending to get them :-) Michal Privoznik (6): virfdstream: Check for thread error more frequently fdstream: Report error from the I/O thread virStream*All: Call virStreamAbort() more frequently virStream*All: Preserve reported error virFileInData: preserve errno in cleanup path virStream*All: Report error if a callback fails daemon/stream.c | 18 ++++++--- include/libvirt/libvirt-stream.h | 17 +++++++- src/libvirt-stream.c | 83 +++++++++++++++++++++++++++++++--------- src/util/virfdstream.c | 26 ++++++++++--- src/util/virfile.c | 5 ++- 5 files changed, 117 insertions(+), 32 deletions(-) -- 2.13.0

2 14

[libvirt] Potential problem with /proc/mounts items that don't exist inside Kubernetes
by Juan Hernández 11 Jul '17

11 Jul '17

Hello all, This is my first mail to this list, so let me introduce myself. My name is Juan Hernandez, and I work in the oVirt team. Currently I am experimenting with the integration between ManageIQ and KubeVirt. I recently detected a potential issue when running libvirt inside Kubernetes, as part of KubeVirt. There are entries in /proc/mounts that don't exist, and libvirt can't start virtual machines because of that. This is specific to this enviroment, but I think it may be worth addressing it in libvirt itself. See the following issue for details: Libvirt fails when there are hidden cgroup mount points in `/proc/mounts` https://github.com/kubevirt/libvirt/issues/4 I suggested a possible fix there, which seems simple, but it makes all tests fail. I'd be happy to fix the tests as well, but I would need some guidance on how to do so. Any suggestion is welcome. Thanks in advance, Juan Hernandez

2 7