- Devel - libvirt List Archives

[libvirt] [PATCH] virmdev: fix build on non-Linux
by Roman Bogorodskiy 28 Mar '17

28 Mar '17

- Make virMediatedDeviceNew() stub args match its prototype - Fix typo: virRerportError -> virReportError - Move virMediatedDeviceGetSysfsPath() into #ifdef __linux__ block as it uses MDEV_SYSFS_DEVICES, and a stub for it --- I'm not pushing this one too, until I get a completely clean build. src/util/virmdev.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index e924af3c1..e49ea18e5 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -170,15 +170,34 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) return ret; } + +char * +virMediatedDeviceGetSysfsPath(const char *uuidstr) +{ + char *ret = NULL; + + ignore_value(virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr)); + return ret; +} + #else virMediatedDevicePtr -virMediatedDeviceNew(virPCIDeviceAddressPtr pciaddr ATTRIBUTE_UNUSED, - const char *uuidstr ATTRIBUTE_UNUSED) +virMediatedDeviceNew(const char *uuidstr ATTRIBUTE_UNUSED, + virMediatedDeviceModelType model ATTRIBUTE_UNUSED) { - virRerportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("mediated devices are not supported on non-linux " - "platforms")); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("mediated devices are not supported on non-linux " + "platforms")); + return NULL; +} + +char * +virMediatedDeviceGetSysfsPath(const char *uuidstr ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("mediated devices are not supported on non-linux " + "platforms")); return NULL; } @@ -423,16 +442,6 @@ virMediatedDeviceIsUsed(virMediatedDevicePtr dev, } -char * -virMediatedDeviceGetSysfsPath(const char *uuidstr) -{ - char *ret = NULL; - - ignore_value(virAsprintf(&ret, MDEV_SYSFS_DEVICES "%s", uuidstr)); - return ret; -} - - int virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst, virMediatedDeviceListPtr src, -- 2.11.0

1 0

[libvirt] [PATCH] network: better validation of devices in hostdev network pool
by Laine Stump 28 Mar '17

28 Mar '17

This adds a few validations to the devices listed for a hostdev network: * devices must be listed by PCI address, not by netdev name * listing a device by PCI address is valid only for hostdev networks, not for other types of network (e.g. macvtap passthrough). * each device in a hostdev pool must be an SR-IOV VF Resolves: https://bugzilla.redhat.com/1004676 --- src/network/bridge_driver.c | 47 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a7a249..3270dc5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3224,14 +3224,55 @@ networkValidate(virNetworkDriverStatePtr driver, * the type of each. */ for (i = 0; i < def->forward.nifs; i++) { - switch ((virNetworkForwardHostdevDeviceType) - def->forward.ifs[i].type) { + virNetworkForwardIfDefPtr iface = &def->forward.ifs[i]; + char *sysfs_path = NULL; + + switch ((virNetworkForwardHostdevDeviceType) iface->type) { case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV: usesInterface = true; + + if (def->forward.type == VIR_NETWORK_FORWARD_HOSTDEV) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("hostdev network '%s' lists '%s' " + "in the device pool, but hostdev " + "networks require all devices to " + "be listed by PCI address, not " + "network device name"), + def->name, iface->device.dev); + return -1; + } break; - case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI: + + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI: { usesAddress = true; + + if (def->forward.type != VIR_NETWORK_FORWARD_HOSTDEV) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' has forward mode '%s' " + " but lists a device by PCI address " + "in the device pool. This is only " + "supported for networks with forward " + "mode 'hostdev'"), + def->name, + virNetworkForwardTypeToString(def->forward.type)); + return -1; + } + + if (virPCIDeviceAddressGetSysfsFile(&iface->device.pci, &sysfs_path) < 0) + return -1; + + if (!virPCIIsVirtualFunction(sysfs_path)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("device '%s' in network '%s' is not " + "an SR-IOV Virtual Function"), + sysfs_path, def->name); + VIR_FREE(sysfs_path); + return -1; + } + VIR_FREE(sysfs_path); break; + } + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NONE: case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST: break; -- 2.9.3

2 1

[libvirt] [PATCH 0/3] Build and other fixes
by Martin Kletzander 28 Mar '17

28 Mar '17

So I broke the build on non-Linux. Sorry. But I did that *because* I was considering other platforms in the code. Also there was a bad dereference somewhere. So because it's three patches, I'm rather sending it for review than just pushing it. Martin Kletzander (3): tests: Properly dereference cpus pointer in virnumamock.c virhostcpu: Expose virHostCPUGetOnline on non-Linux virhostcpu: Make only defined symbols available src/util/virhostcpu.c | 35 +++++++++++++++++------------------ src/util/virhostcpu.h | 5 ++++- tests/virnumamock.c | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) -- 2.12.1

2 8

[libvirt] [PATCH] logical: Need to overwrite/clear more than just first 512 bytes
by John Ferlan 28 Mar '17

28 Mar '17

https://bugzilla.redhat.com/show_bug.cgi?id=1430679 As it turns out some file headers (e.g. ext4) may be larger/longer than the 512 bytes of zeros being written prior to a pvcreate, so let's write out 2048 bytes similar to how the pvcreate sources would peek at the first 4 sectors of the device. Make sure there is at enough bytes on the device to clear before doing doing the clear - just to be sure. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 29d63b1..9ca6fd4 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -93,7 +93,8 @@ static int virStorageBackendLogicalInitializeDevice(const char *path) { int fd = -1; - char zeros[PV_BLANK_SECTOR_SIZE] = {0}; + char zeros[4 * PV_BLANK_SECTOR_SIZE] = {0}; + off_t size; int ret = -1; virCommandPtr pvcmd = NULL; @@ -107,6 +108,25 @@ virStorageBackendLogicalInitializeDevice(const char *path) return -1; } + if ((size = lseek(fd, 0, SEEK_END)) == (off_t)-1) { + virReportSystemError(errno, + _("failed to seek to end of %s"), path); + goto cleanup; + } + + if (size < 4 * PV_BLANK_SECTOR_SIZE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot initialize '%s' detected size='%lu' less " + "than minimum required='%d"), + path, size, 4 * PV_BLANK_SECTOR_SIZE); + goto cleanup; + } + if ((size = lseek(fd, 0, SEEK_SET)) == (off_t)-1) { + virReportSystemError(errno, + _("failed to seek to start of %s"), path); + goto cleanup; + } + if (safewrite(fd, zeros, sizeof(zeros)) < 0) { virReportSystemError(errno, _("cannot clear device header of '%s'"), path); -- 2.9.3

2 1

[libvirt] [PATCH 0/2] Fix syntax check
by Jiri Denemark 28 Mar '17

28 Mar '17

Jiri Denemark (2): build: Fix sc_prohibit_exit_in_tests syntax check build: Fix syntax check in VPATH cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.12.2

2 3

[libvirt] [PATCH 0/2] Reject negative storage size
by Ján Tomko 28 Mar '17

28 Mar '17

https://bugzilla.redhat.com/show_bug.cgi?id=1436119 Ján Tomko (2): storage: reject negative capacity virsh: reject more negative numbers src/conf/storage_conf.c | 2 +- tools/virsh-domain.c | 22 +++++++++++----------- tools/virsh-host.c | 6 +++--- tools/virsh-volume.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) -- 2.10.2

2 3

[libvirt] [PATCH] qemu: command: align disk serial check to schema
by Nikolay Shirokovskiy 28 Mar '17

28 Mar '17

Disk serial schema has extra '.+' allowed characters in comparison with check in code. Looks like there is no reason for that as qemu allows any character AFAIK for serial. This discrepancy is originated in 85d15b51 where ability to add serial was added. --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c76f923..c5369b0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -432,7 +432,7 @@ qemuBuildIoEventFdStr(virBufferPtr buf, } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ " + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_ .+" static int qemuSafeSerialParamValue(const char *value) -- 1.8.3.1

2 1

[libvirt] [PATCH 0/4] qemu: Use additional data reported by the hyperv panic notifier
by Peter Krempa 28 Mar '17

28 Mar '17

Allow easier debug of windows crashes by reporting the 5 additional field now reported by qemu if the hyperv panic notifier is used. Plus few cleanups noticed while adding the code. Peter Krempa (4): qemu: driver: Remove useless forward declarations qemu: driver: Fix formatting in processGuestPanicEvent qemu: monitor: Extract additional info from GUEST_PANICKED event qemu: Log additional data from hyperv crash notifier src/qemu/qemu_driver.c | 81 +++++++++++++++++++++++++++++++------------- src/qemu/qemu_monitor.c | 15 ++++++-- src/qemu/qemu_monitor.h | 32 ++++++++++++++++- src/qemu/qemu_monitor_json.c | 56 ++++++++++++++++++++++++++++-- src/qemu/qemu_process.c | 2 ++ 5 files changed, 157 insertions(+), 29 deletions(-) -- 2.12.0

2 10

[libvirt] [PATCH] conf: validate that PCI controller index is < 256
by Laine Stump 28 Mar '17

28 Mar '17

This is the maximum for many reasons, for starters because index == bus number, and a controller's bus number is 8 bits. This incidentally resolves: https://bugzilla.redhat.com/1329090 --- src/conf/domain_conf.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6bbc6a2..2139ab0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4846,6 +4846,24 @@ virDomainNetDefValidate(const virDomainNetDef *net) static int +virDomainControllerDefValidate(const virDomainControllerDef *controller) +{ + if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + if (controller->idx > 255) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("PCI controller index %d too high, or too many " + "PCI controllers. A maximum of 256 PCI " + "controllers is allowed, and the maximum value " + "of the index attribute is 255"), + controller->idx); + return -1; + } + } + return 0; +} + + +static int virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, const virDomainDef *def) { @@ -4867,6 +4885,7 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_CONTROLLER: + return virDomainControllerDefValidate(dev->data.controller); case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SMARTCARD: -- 2.9.3

2 3

[libvirt] [PATCH] util: fix build on RHEL 6
by Eric Blake 27 Mar '17

27 Mar '17

We keep forgetting that older setups don't like 'index': CC util/libvirt_util_la-virsysinfo.lo cc1: warnings being treated as errors util/virstoragefile.c: In function 'virStorageSourceFindByNodeName': util/virstoragefile.c:3804: error: declaration of 'index' shadows a global declaration [-Wshadow] /usr/include/string.h:489: error: shadowed declaration is here [-Wshadow] Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule src/util/virstoragefile.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 0ac7079..22cdb83 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1,7 +1,7 @@ /* * virstoragefile.c: file utility functions for FS storage backend * - * Copyright (C) 2007-2014, 2016 Red Hat, Inc. + * Copyright (C) 2007-2017 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3801,23 +3801,23 @@ virStorageSourceIsRelative(virStorageSourcePtr src) virStorageSourcePtr virStorageSourceFindByNodeName(virStorageSourcePtr top, const char *nodeName, - unsigned int *index) + unsigned int *idx) { virStorageSourcePtr tmp; - if (index) - *index = 0; + if (idx) + *idx = 0; for (tmp = top; tmp; tmp = tmp->backingStore) { if ((tmp->nodeformat && STREQ(tmp->nodeformat, nodeName)) || (tmp->nodebacking && STREQ(tmp->nodebacking, nodeName))) return tmp; - if (index) - (*index)++; + if (idx) + (*idx)++; } - if (index) - *index = 0; + if (idx) + *idx = 0; return NULL; } -- 2.9.3

1 0