- Devel - libvirt List Archives

[libvirt] [PATCH perl] perl: Add ERR_DEVICE_MISSING constants
by Chen Hanxiao 01 Feb '18

01 Feb '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- Changes | 2 +- Virt.xs | 1 + lib/Sys/Virt/Error.pm | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index eda3ec5..22d5752 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 4.1.0 2018-00-00 - - XXX + - Add VIR_ERR_DEVICE_MISSING constants 4.0.0 2018-01-23 diff --git a/Virt.xs b/Virt.xs index 7d2f1a7..f19880f 100644 --- a/Virt.xs +++ b/Virt.xs @@ -9488,4 +9488,5 @@ BOOT: REGISTER_CONSTANT(VIR_ERR_NO_CLIENT, ERR_NO_CLIENT); REGISTER_CONSTANT(VIR_ERR_AGENT_UNSYNCED, ERR_AGENT_UNSYNCED); REGISTER_CONSTANT(VIR_ERR_LIBSSH, ERR_LIBSSH); + REGISTER_CONSTANT(VIR_ERR_DEVICE_MISSING, ERR_DEVICE_MISSING); } diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index b97985d..78f33f3 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -812,6 +812,10 @@ Libvirt guest agent replies with wrong id to guest-sync command The libSSH operation failed +=item Sys::Virt::Error::ERR_DEVICE_MISSING + +Libvirt fail to find the desired device. + =back =head1 AUTHORS -- 2.14.3

2 1

[libvirt] [PATCH] conf: Small indentation and coding style fixes
by Andrea Bolognani 01 Feb '18

01 Feb '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8efe83489..b83e31d8c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26862,8 +26862,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, case VIR_DOMAIN_FEATURE_CAPABILITIES: if (def->features[i] == VIR_DOMAIN_CAPABILITIES_POLICY_DEFAULT && - !virDomainDefHasCapabilitiesFeatures(def)) + !virDomainDefHasCapabilitiesFeatures(def)) { break; + } virBufferAsprintf(buf, "<capabilities policy='%s'>\n", virDomainCapabilitiesPolicyTypeToString(def->features[i])); -- 2.14.3

1 0

[libvirt] [PATCH 00/10] Enable direct use of secondary drivers
by Daniel P. Berrangé 31 Jan '18

31 Jan '18

Currently the secondary drivers can only be used if you have a connection to a primary hypervisor driver. This series introduces explicit URIs that allow opening a connection that only talks to a specific secondary driver. In the future these URIs will resolve to individual daemons containing those drivers. This also allows us to fix long standing problems with most code that uses secrets internally. We need to pass a virConnectPtr into such code but some call stacks don't have a connection available. In some cases we open a temporary connection to the QEMU driver, but this is suboptimal for deployments without the QEMU driver present. Daniel P. Berrangé (10): storage: move driver registration back to end of the file storage: allow opening with storage:///system and storage:///session URIs network: move driver registration back to end of the file network: allow opening with network:///system and network:///session URIs nwfilter: allow opening with nwfilter:///system URI interface: allow opening with interface:///system and interface:///session URIs nodedev: allow opening with nodedev:///system and nodedev:///session URIs secret: allow opening with secret:///system and secret:///session URIs storage: open secret driver connection at time of use storage: remove virConnectPtr from all backend functions src/interface/interface_backend_netcf.c | 98 ++++++++- src/interface/interface_backend_udev.c | 97 ++++++++- src/network/bridge_driver.c | 185 +++++++++++++---- src/network/bridge_driver_platform.h | 3 + src/node_device/node_device_driver.c | 73 ++++++- src/node_device/node_device_driver.h | 9 + src/node_device/node_device_hal.c | 18 ++ src/node_device/node_device_udev.c | 19 ++ src/nwfilter/nwfilter_driver.c | 83 ++++++++ src/secret/secret_driver.c | 95 +++++++++ src/storage/storage_backend.h | 45 ++-- src/storage/storage_backend_disk.c | 30 +-- src/storage/storage_backend_fs.c | 15 +- src/storage/storage_backend_gluster.c | 9 +- src/storage/storage_backend_iscsi.c | 24 +-- src/storage/storage_backend_logical.c | 38 ++-- src/storage/storage_backend_mpath.c | 5 +- src/storage/storage_backend_rbd.c | 53 ++--- src/storage/storage_backend_scsi.c | 46 +++-- src/storage/storage_backend_sheepdog.c | 33 ++- src/storage/storage_backend_vstorage.c | 10 +- src/storage/storage_backend_zfs.c | 15 +- src/storage/storage_driver.c | 351 ++++++++++++++++++++------------ src/storage/storage_util.c | 146 ++++++------- src/storage/storage_util.h | 39 ++-- tests/storagevolxml2argvtest.c | 7 +- 26 files changed, 1047 insertions(+), 499 deletions(-) -- 2.14.3

4 21

[libvirt] [PATCH] util: use union for sockaddr structs to avoid aliasing
by Daniel P. Berrangé 31 Jan '18

31 Jan '18

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some platforms/toolchains will complain about casting sockaddr_storage to sockaddr_un because it breaks strict aliasing rule ../../src/util/virutil.c: In function 'virGetUNIXSocketPath': ../../src/util/virutil.c:2005: error: dereferencing pointer 'un' does break strict-aliasing rules [-Wstrict-aliasing] Change the code to use a union, in the same way that the virsocketaddr.h header does. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as (yet another) CI build fix src/util/virutil.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index c23fa8f92e..cd6fbf2f30 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1985,30 +1985,33 @@ virGetListenFDs(void) #ifdef HAVE_SYS_UN_H char *virGetUNIXSocketPath(int fd) { - struct sockaddr_storage ss = { 0 }; - struct sockaddr_un *un = (struct sockaddr_un *)&ss; - socklen_t len = sizeof(ss); + union { + struct sockaddr sa; + struct sockaddr_storage ss; + struct sockaddr_un un; + } addr = { .ss = { 0 } }; + socklen_t len = sizeof(addr.ss); char *path; - if (getsockname(fd, (struct sockaddr *)&ss, &len) < 0) { + if (getsockname(fd, &addr.sa, &len) < 0) { virReportSystemError(errno, _("Unable to get address of FD %d"), fd); return NULL; } - if (ss.ss_family != AF_UNIX) { + if (addr.ss.ss_family != AF_UNIX) { virReportSystemError(EINVAL, _("FD %d is not a UNIX socket, has af=%d"), - fd, ss.ss_family); + fd, addr.ss.ss_family); return NULL; } - if (un->sun_path[0] == '\0') - un->sun_path[0] = '@'; + if (addr.un.sun_path[0] == '\0') + addr.un.sun_path[0] = '@'; - if (VIR_ALLOC_N(path, sizeof(un->sun_path) + 1) < 0) + if (VIR_ALLOC_N(path, sizeof(addr.un.sun_path) + 1) < 0) return NULL; - memcpy(path, un->sun_path, sizeof(un->sun_path)); - path[sizeof(un->sun_path)] = '\0'; + memcpy(path, addr.un.sun_path, sizeof(addr.un.sun_path)); + path[sizeof(addr.un.sun_path)] = '\0'; return path; } -- 2.14.3

1 0

[libvirt] [PATCH] Fixed virGetUNIXSocketPath stub on Win32
by Daniel P. Berrangé 31 Jan '18

31 Jan '18

The _() macro was not terminated and an argument needs to be marked as unused. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a win32 build fix src/util/virutil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 8352e0f1f1..c23fa8f92e 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2014,10 +2014,10 @@ char *virGetUNIXSocketPath(int fd) #else /* HAVE_SYS_UN_H */ -char *virGetUNIXSocketPath(int fd) +char *virGetUNIXSocketPath(int fd ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", - _("UNIX sockets not supported on this platform"); + _("UNIX sockets not supported on this platform")); return NULL; } -- 2.14.3

1 0

[libvirt] [PATCH 0/9] Set the SCSI controller model during post parse
by John Ferlan 31 Jan '18

31 Jan '18

Fallout or a pile yak shavings from the series to move the controller validation from command line building into domain xml validation: https://www.redhat.com/archives/libvir-list/2018-January/msg00188.html This series grabs the first patch from the other series that was essentially already ACK'd, but instead of heading down the path of "working around" the fact that SCSI controller model may not be set after domain post processing, this series builds up a series of changes to implement altering the SCSI controller model during device post processing rather than waiting for the validation phase to "cheat" and alter a local model value temporarily. The first 4 patches are relatively straightforward and don't change any of the outputs. Starting with patch 5, things get a bit more interesting. Patch 6 is where the conversion to set the default model for SCSI controllers starts... Patch 7 is where things got a bit tricky w/r/t the implicit controller... Patches 8 and 9 just perform cleanup from that setting. If this is accepted - I'll go back to the other series to adjust and repost; otherwise, we can determine whether the other series is necessary or if we're just happy with the way things are. John Ferlan (9): qemu: Split qemuDomainSetSCSIControllerModel conf: Rework and rename virDomainDeviceFindControllerModel qemu: Introduce qemuDomainFindSCSIControllerModel qemu: Introduce qemuDomainGetSCSIControllerModel qemu: Fetch/save the default SCSI controller model during hotplug qemu: Introduce qemuDomainSetSCSIControllerModel conf: Allow configuration of implicit controller model qemu: Reduce need to call qemuDomainGetSCSIControllerModel qemu: Update qemuDomainFindSCSIControllerModel return src/conf/domain_conf.c | 41 ++++-- src/conf/domain_conf.h | 6 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_alias.c | 14 +- src/qemu/qemu_alias.h | 3 +- src/qemu/qemu_command.c | 88 +++++++++--- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domain_address.c | 149 +++++++++++---------- src/qemu/qemu_domain_address.h | 11 +- src/qemu/qemu_hotplug.c | 14 +- src/vbox/vbox_common.c | 8 +- tests/qemuargv2xmldata/nomachine-ppc64.xml | 2 +- tests/qemuargv2xmldata/pseries-disk.xml | 2 +- .../qemuhotplug-base-with-scsi-controller-live.xml | 8 +- ...se-without-scsi-controller-live+disk-scsi-2.xml | 8 +- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 +- .../hostdev-scsi-lsi-iscsi-auth.xml | 2 +- .../qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 2 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 2 +- 20 files changed, 229 insertions(+), 146 deletions(-) -- 2.13.6

2 11

[libvirt] [PATCH] virUSBDeviceNew: Construct vroot path properly
by Michal Privoznik 31 Jan '18

31 Jan '18

When starting an LXC container, the /dev entries are created under temp root (/var/run/libvirt/lxc/$name.dev), relabelled and then the root is pivoted. However, when it comes to USB devices which keep path to the device in the structure we need a way to override the default /dev/usb/... path because we want to work with the one under temp root. That's what @vroot argument is for in virUSBDeviceNew. However, what is being passed there is: vroot = /var/run/libvirt/lxc/lxc_0.dev/bus/usb Therefore, constructed path is wrong: dev->path = //var/run/libvirt/lxc/lxc_0.dev/bus/usb//dev/bus/usb/002/002 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virusb.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/util/virusb.c b/src/util/virusb.c index 6359235ff..f06639eec 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -343,9 +343,13 @@ virUSBDeviceNew(unsigned int bus, virUSBDeviceFree(dev); return NULL; } - if (virAsprintf(&dev->path, "%s" USB_DEVFS "%03d/%03d", - vroot ? vroot : "", - dev->bus, dev->dev) < 0) { + + if ((vroot && + virAsprintf(&dev->path, "%s/%03d/%03d", + vroot, dev->bus, dev->dev) < 0) || + (!vroot && + virAsprintf(&dev->path, USB_DEVFS "%03d/%03d", + dev->bus, dev->dev) < 0)) { virUSBDeviceFree(dev); return NULL; } -- 2.13.6

2 1

[libvirt] [PATCH] blockjob: Fix a error checking of blockjob status in some case
by Jie Wang 31 Jan '18

31 Jan '18

offset and len can also be equal to 0 on failed if blockjob return status:"BLOCK_JOB_COMPLETED" with error:"File descriptor in bad state", this bug can be reproduced easily if you perform a async block job on read only filesystem, so it's very worthwhile for us to check 'error' in this case. --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5ddd855..442b218 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -889,7 +889,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: error = virJSONValueObjectGetString(data, "error"); /* Make sure the whole device has been processed */ - if (offset != len) + if (offset != len || error) event = VIR_DOMAIN_BLOCK_JOB_FAILED; break; case VIR_DOMAIN_BLOCK_JOB_CANCELED: -- 1.8.3.1

3 2

[libvirt] [PATCH 0/3] tools: Actually enable bash-completion
by Michal Privoznik 31 Jan '18

31 Jan '18

Due to some naming convention the bash script for inactive virsh/virt-admin wasn't loaded. Fix this. At the same time, fix two small nits raised in the other patch set for bash completion. Michal Privoznik (3): virshDomainNameCompleter: Prune accepted flags virsh: Offer only persistent domains for autostart tools: Make symlinks to vsh bash-completion script libvirt.spec.in | 24 +++++++++++++++++++++++- tools/Makefile.am | 7 ++++++- tools/virsh-completer.c | 13 +++---------- tools/virsh-domain.c | 2 +- 4 files changed, 33 insertions(+), 13 deletions(-) -- 2.13.6

3 10

[libvirt] [PATCH] resctl: stub out functions with Linux-only APIs used
by Daniel P. Berrangé 31 Jan '18

31 Jan '18

The flock() function and d_type field in struct dirent are not portable to the mingw platform. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- * Pushed as CI build fix src/util/virresctrl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index e252aefe31..754820ee46 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -295,6 +295,7 @@ virResctrlAllocNew(void) /* Common functions */ +#ifdef __linux__ static int virResctrlLockInternal(int op) { @@ -321,6 +322,20 @@ virResctrlLockWrite(void) return virResctrlLockInternal(LOCK_EX); } +#else + +static inline int +virResctrlLockWrite(void) +{ + virReportSystemError(ENOSYS, "%s", + _("resctrlfs not supported on this platform")); + return -1; +} + +#endif + + + static int virResctrlUnlock(int fd) @@ -328,6 +343,7 @@ virResctrlUnlock(int fd) if (fd == -1) return 0; +#ifdef __linux__ /* The lock gets unlocked by closing the fd, which we need to do anyway in * order to clean up properly */ if (VIR_CLOSE(fd) < 0) { @@ -338,6 +354,7 @@ virResctrlUnlock(int fd) virReportSystemError(errno, "%s", _("Cannot unlock resctrlfs")); return -1; } +#endif /* ! __linux__ */ return 0; } @@ -369,6 +386,8 @@ virResctrlInfoIsEmpty(virResctrlInfoPtr resctrl) } +#ifdef __linux__ + int virResctrlGetInfo(virResctrlInfoPtr resctrl) { @@ -495,6 +514,18 @@ virResctrlGetInfo(virResctrlInfoPtr resctrl) return ret; } +#else /* ! __linux__ */ + +int +virResctrlGetInfo(virResctrlInfoPtr resctrl ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cache tune not supported on this platform")); + return -1; +} + +#endif /* ! __linux__ */ + int virResctrlInfoGetCache(virResctrlInfoPtr resctrl, @@ -632,6 +663,8 @@ virResctrlAllocGetType(virResctrlAllocPtr resctrl, } +#ifdef __linux__ + static int virResctrlAllocUpdateMask(virResctrlAllocPtr resctrl, unsigned int level, @@ -659,6 +692,8 @@ virResctrlAllocUpdateMask(virResctrlAllocPtr resctrl, return virBitmapCopy(a_type->masks[cache], mask); } +#endif + static int virResctrlAllocUpdateSize(virResctrlAllocPtr resctrl, @@ -878,6 +913,8 @@ virResctrlAllocFormat(virResctrlAllocPtr resctrl) } +#ifdef __linux__ + static int virResctrlAllocParseProcessCache(virResctrlInfoPtr resctrl, virResctrlAllocPtr alloc, @@ -1180,7 +1217,17 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl) goto cleanup; } +#else /* ! __linux__ */ + +virResctrlAllocPtr +virResctrlAllocGetUnused(virResctrlInfoPtr resctrl ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cache tune not supported on this platform")); + return NULL; +} +#endif /* ! __linux__ */ static int virResctrlAllocSetMask(virResctrlAllocPerTypePtr a_type, -- 2.14.3

2 3

[libvirt] [PATCH 0/7] Last CAT fixups
by Martin Kletzander 31 Jan '18

31 Jan '18

Few finishing touches for the Cache Allocation Technology. This series copies the default group's mask to newly created groups, fixes a possible wrong memory access, cleans up after domains even if daemon was restarted, and then reorders the functions in virresctrl.c so that it's nice to find the non-Linux stubs and Linux-only functions. And the last thing is just one variable rename that was forgotten before. Martin Kletzander (8): util: Add helpers for getting resctrl group allocs util: Use default group's mask for unspecified resctrl allocations util: Don't overwrite mask in virResctrlAllocFindUnused qemu: Restore machinename even without cgroups util: Extract path formatting into virResctrlAllocDeterminePath qemu: Restore resctrl alloc data after restart util: Reorder functions in virresctrl to minimize stubs util: Rename resctrl to alloc in virResctrlAllocUpdateMask to be consistent src/libvirt_linux.syms | 3 + src/libvirt_private.syms | 2 +- src/qemu/qemu_cgroup.c | 4 - src/qemu/qemu_process.c | 11 + src/util/virresctrl.c | 1620 +++++++++++++++++++++++----------------------- src/util/virresctrl.h | 4 + 6 files changed, 843 insertions(+), 801 deletions(-) -- 2.16.1

2 11

[libvirt] [PATCH go-xml] Add reconnect support for vhost-user interfaces
by Andrea Bolognani 31 Jan '18

31 Jan '18

Introduced in libvirt commit 614be3b88276. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Does this look like Go to you? Because I have no idea what I'm doing. domain.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/domain.go b/domain.go index 429e61b..4f7725a 100644 --- a/domain.go +++ b/domain.go @@ -392,9 +392,10 @@ type DomainInterfaceSourceEthernet struct { } type DomainInterfaceSourceVHostUser struct { - Type string `xml:"type,attr"` - Path string `xml:"path,attr,omitempty"` - Mode string `xml:"mode,attr,omitempty"` + Type string `xml:"type,attr"` + Path string `xml:"path,attr,omitempty"` + Mode string `xml:"mode,attr,omitempty"` + Reconnect *DomainInterfaceSourceReconnect `xml:"reconnect"` } type DomainInterfaceSourceServer struct { @@ -449,6 +450,11 @@ type DomainInterfaceSourceLocal struct { Port uint `xml:"port,attr,omitempty"` } +type DomainInterfaceSourceReconnect struct { + Enabled string `xml:"enabled,attr"` + Timeout *uint `xml:"timeout,attr"` +} + type DomainInterfaceTarget struct { Dev string `xml:"dev,attr"` } -- 2.14.3

2 1

[libvirt] [PATCH v2] vbox: fix SEGV during dumpxml of a serial port
by Laine Stump 31 Jan '18

31 Jan '18

commit 77a12987a48 changed the "virDomainChrSourceDef source" inside virDomainChrDef to "virDomainChrSourceDefPtr source", and started allocating source inside virDomainChrDefNew(), but vboxDumpSerial() was allocating a virDomainChrDef with a simple VIR_ALLOC() (i.e. never calling virDomainChrDefNew()), so source was never initialized, leading to a SEGV any time a serial port was present. The same problem was created in vboxDumpParallel(). This patch changes vboxDumpSerial() and vboxDumpParallel() to use virDomainChrDefNew() instead of VIR_ALLOC(), and changes both of those functions to return an error if virDomainChrDef() (or any other allocation) fails. This resolves: https://bugzilla.redhat.com/1536649 --- Change from V1: Due to reviews of V1 whining about the patch calling out the lack of returning failure on OOM in a comment rather than fixing it, V2 changes both functions to return 0/-1, and their caller to abort the dumpxml if they return -1. (If I'd taken the extra 30 seconds to look one level up the call chain before posting V1, I would have done that to begin with - there's really nothing complicated about the change, so I'm just as comfortable posting this V2 patch without being able to test as I was with V1). src/vbox/vbox_common.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 33aefabe5..e8381ac95 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3862,7 +3862,7 @@ vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, } } -static void +static int vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 serialPortCount) { PRUint32 serialPortIncCount = 0; @@ -3886,9 +3886,15 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin } /* Allocate memory for the serial ports which are enabled */ - if ((def->nserials > 0) && (VIR_ALLOC_N(def->serials, def->nserials) >= 0)) { - for (i = 0; i < def->nserials; i++) - ignore_value(VIR_ALLOC(def->serials[i])); + if (def->nserials > 0) { + if (VIR_ALLOC_N(def->serials, def->nserials) < 0) + return -1; + + for (i = 0; i < def->nserials; i++) { + def->serials[i] = virDomainChrDefNew(NULL); + if (!def->serials[i]) + return -1; + } } /* Now get the details about the serial ports here */ @@ -3936,7 +3942,8 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin if (pathUtf16) { VBOX_UTF16_TO_UTF8(pathUtf16, &path); - ignore_value(VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path)); + if (VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path) < 0) + return -1; } serialPortIncCount++; @@ -3948,9 +3955,10 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin VBOX_RELEASE(serialPort); } } + return 0; } -static void +static int vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 parallelPortCount) { PRUint32 parallelPortIncCount = 0; @@ -3974,9 +3982,15 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU } /* Allocate memory for the parallel ports which are enabled */ - if ((def->nparallels > 0) && (VIR_ALLOC_N(def->parallels, def->nparallels) >= 0)) { - for (i = 0; i < def->nparallels; i++) - ignore_value(VIR_ALLOC(def->parallels[i])); + if (def->nparallels > 0) { + if (VIR_ALLOC_N(def->parallels, def->nparallels) < 0) + return -1; + + for (i = 0; i < def->nparallels; i++) { + def->parallels[i] = virDomainChrDefNew(NULL); + if (!def->parallels[i]) + return -1; + } } /* Now get the details about the parallel ports here */ @@ -4011,7 +4025,8 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU gVBoxAPI.UIParallelPort.GetPath(parallelPort, &pathUtf16); VBOX_UTF16_TO_UTF8(pathUtf16, &path); - ignore_value(VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path)); + if (VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path) < 0) + return -1; parallelPortIncCount++; @@ -4022,6 +4037,7 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU VBOX_RELEASE(parallelPort); } } + return 0; } static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) @@ -4162,8 +4178,11 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) vboxDumpSharedFolders(def, data, machine); vboxDumpNetwork(def, data, machine, networkAdapterCount); vboxDumpAudio(def, data, machine); - vboxDumpSerial(def, data, machine, serialPortCount); - vboxDumpParallel(def, data, machine, parallelPortCount); + + if (vboxDumpSerial(def, data, machine, serialPortCount) < 0) + goto cleanup; + if (vboxDumpParallel(def, data, machine, parallelPortCount) < 0) + goto cleanup; /* dump USB devices/filters if active */ vboxHostDeviceGetXMLDesc(data, def, machine); -- 2.14.3

2 1

[libvirt] [PATCH 0/2] Fix parsing of iSCSI LUN from JSON backing store strings
by Peter Krempa 31 Jan '18

31 Jan '18

Peter Krempa (2): util: json: Add helper to return string or number properties as string util: storage: Parse 'lun' for iSCSI protocol from JSON as string or number src/util/virjson.c | 27 +++++++++++++++++++++++++++ src/util/virjson.h | 1 + src/util/virstoragefile.c | 13 +++++-------- tests/virstoragetest.c | 2 +- 4 files changed, 34 insertions(+), 9 deletions(-) -- 2.15.0

2 4

[libvirt] [PATCH] tests: Remove caps from DO_TEST_PARSE_ERROR() calls
by Andrea Bolognani 31 Jan '18

31 Jan '18

The lack of certain capabilities is going to cause errors pretty much exclusively when building the QEMU command line, because we purposefully leave such checks to the very last moments before starting a guest; so it doesn't make much sense to pass QEMU capabilities to DO_TEST_PARSE_ERROR() call which are supposed, as the name implies, to result in much earlier error. The only exception is the "cpu-hotplug-granularity" test, due to the fact that the checks we want to fail are skipped entirely if the relevant QEMU feature is not available. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuxml2argvtest.c | 184 +++++++++++++---------------------------------- 1 file changed, 51 insertions(+), 133 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c8739909d..2df778853 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -743,9 +743,7 @@ mymain(void) DO_TEST("boot-menu-disable-drive-bootindex", QEMU_CAPS_BOOT_MENU, QEMU_CAPS_BOOTINDEX); - DO_TEST_PARSE_ERROR("boot-dev+order", - QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_VIRTIO_BLK_SCSI); + DO_TEST_PARSE_ERROR("boot-dev+order", NONE); DO_TEST("boot-order", QEMU_CAPS_BOOTINDEX, QEMU_CAPS_VIRTIO_BLK_SCSI); @@ -959,8 +957,7 @@ mymain(void) VIR_FREE(driver.config->vxhsTLSx509certdir); DO_TEST("disk-drive-no-boot", QEMU_CAPS_BOOTINDEX); - DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid", NONE); DO_TEST_FAILURE("disk-usb-nosupport", NONE); DO_TEST("disk-usb-device", QEMU_CAPS_DEVICE_USB_STORAGE, @@ -1037,17 +1034,10 @@ mymain(void) QEMU_CAPS_DRIVE_DISCARD, QEMU_CAPS_DRIVE_DETECT_ZEROES); DO_TEST("disk-snapshot", NONE); - DO_TEST_PARSE_ERROR("disk-same-targets", - QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("disk-drive-address-conflict", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_SCSI_GENERIC); - DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_DEVICE_SCSI_GENERIC); + DO_TEST_PARSE_ERROR("disk-same-targets", NONE); + DO_TEST_PARSE_ERROR("disk-drive-address-conflict", NONE); + DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict", NONE); + DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict", NONE); DO_TEST("event_idx", QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, QEMU_CAPS_VIRTIO_NET_EVENT_IDX, @@ -1060,14 +1050,10 @@ mymain(void) DO_TEST("disk-serial", QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_SERIAL); - DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address", - NONE); - DO_TEST_PARSE_ERROR("disk-ide-incompatible-address", - NONE); - DO_TEST_PARSE_ERROR("disk-sata-incompatible-address", - QEMU_CAPS_ICH9_AHCI); - DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_PARSE_ERROR("disk-fdc-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-ide-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-sata-incompatible-address", NONE); + DO_TEST_PARSE_ERROR("disk-scsi-incompatible-address", NONE); DO_TEST("graphics-vnc", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); @@ -1396,12 +1382,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_CCID_PASSTHRU); - DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_CHARDEV_RECONNECT); - DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_CHARDEV_RECONNECT); + DO_TEST_PARSE_ERROR("chardev-reconnect-invalid-timeout", NONE); + DO_TEST_PARSE_ERROR("chardev-reconnect-generated-path", NONE); DO_TEST("usb-controller", QEMU_CAPS_NODEFCONFIG); @@ -1419,10 +1401,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1); - DO_TEST_PARSE_ERROR("usb-ich9-no-companion", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_ICH9_USB_EHCI1); + DO_TEST_PARSE_ERROR("usb-ich9-no-companion", NONE); DO_TEST("usb-ich9-autoassign", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PCI_MULTIFUNCTION, @@ -1437,12 +1416,8 @@ mymain(void) DO_TEST("usb-hub-autoadd-deluxe", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-hub-conflict", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-hub-nonexistent", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-hub-conflict", NONE); + DO_TEST_PARSE_ERROR("usb-hub-nonexistent", NONE); DO_TEST("usb-port-missing", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); @@ -1452,9 +1427,7 @@ mymain(void) DO_TEST("usb-ports", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-ports-out-of-range", - QEMU_CAPS_USB_HUB, - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-ports-out-of-range", NONE); DO_TEST("usb-port-autoassign", QEMU_CAPS_USB_HUB, QEMU_CAPS_NODEFCONFIG); @@ -1499,13 +1472,9 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1); DO_TEST("usb-none", QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-none-other", - QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("usb-none-hub", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-none-usbtablet", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("usb-none-other", NONE); + DO_TEST_PARSE_ERROR("usb-none-hub", NONE); + DO_TEST_PARSE_ERROR("usb-none-usbtablet", NONE); DO_TEST("usb-controller-default-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_PCI_OHCI, @@ -1535,19 +1504,14 @@ mymain(void) QEMU_CAPS_NEC_USB_XHCI, QEMU_CAPS_NEC_USB_XHCI_PORTS, QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_PIIX3_USB_UHCI, - QEMU_CAPS_NEC_USB_XHCI, - QEMU_CAPS_NEC_USB_XHCI_PORTS); + DO_TEST_PARSE_ERROR("usb-controller-xhci-limit", NONE); DO_TEST("usb-controller-qemu-xhci", QEMU_CAPS_DEVICE_QEMU_XHCI); DO_TEST_FAILURE("usb-controller-qemu-xhci-unavailable", NONE); - DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", - QEMU_CAPS_DEVICE_QEMU_XHCI); + DO_TEST_PARSE_ERROR("usb-controller-qemu-xhci-limit", NONE); DO_TEST("smbios", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-date", QEMU_CAPS_SMBIOS_TYPE); - DO_TEST_PARSE_ERROR("smbios-uuid-match", QEMU_CAPS_SMBIOS_TYPE); + DO_TEST_PARSE_ERROR("smbios-date", NONE); + DO_TEST_PARSE_ERROR("smbios-uuid-match", NONE); DO_TEST("watchdog", NONE); DO_TEST("watchdog-device", QEMU_CAPS_NODEFCONFIG); @@ -1601,12 +1565,8 @@ mymain(void) DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_DEVICE_VFIO_PCI); + DO_TEST_PARSE_ERROR("hostdev-mdev-src-address-invalid", NONE); + DO_TEST_PARSE_ERROR("hostdev-mdev-invalid-target-address", NONE); DO_TEST_FAILURE("hostdev-vfio-multidomain", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("pci-rom", @@ -1695,7 +1655,7 @@ mymain(void) DO_TEST_FAILURE("luks-disks", QEMU_CAPS_OBJECT_SECRET); # endif DO_TEST_PARSE_ERROR("luks-disk-invalid", NONE); - DO_TEST_PARSE_ERROR("luks-disks-source-both", QEMU_CAPS_OBJECT_SECRET); + DO_TEST_PARSE_ERROR("luks-disks-source-both", NONE); DO_TEST("memtune", NONE); DO_TEST("memtune-unlimited", NONE); @@ -1799,8 +1759,7 @@ mymain(void) DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-vio-address-clash", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("pseries-vio-address-clash", NONE); DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM); DO_TEST("pseries-usb-kbd", QEMU_CAPS_PCI_OHCI, QEMU_CAPS_DEVICE_USB_KBD, @@ -1809,8 +1768,7 @@ mymain(void) DO_TEST("pseries-cpu-exact", QEMU_CAPS_DEVICE_SPAPR_VTY, QEMU_CAPS_NODEFCONFIG); - DO_TEST_PARSE_ERROR("pseries-no-parallel", - QEMU_CAPS_NODEFCONFIG); + DO_TEST_PARSE_ERROR("pseries-no-parallel", NONE); qemuTestSetHostArch(driver.caps, VIR_ARCH_PPC64); DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, @@ -1898,10 +1856,7 @@ mymain(void) DO_TEST_FAILURE("pseries-hpt-resizing", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_MACHINE_OPT); - DO_TEST_PARSE_ERROR("pseries-hpt-resizing-invalid-machine", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + DO_TEST_PARSE_ERROR("pseries-hpt-resizing-invalid-machine", NONE); DO_TEST("pseries-serial-native", QEMU_CAPS_NODEFCONFIG, @@ -2041,9 +1996,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_EGD); + DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", NONE); DO_TEST("virtio-rng-ccw", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX, @@ -2077,10 +2030,7 @@ mymain(void) QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390); - DO_TEST_PARSE_ERROR("s390-no-parallel", - QEMU_CAPS_NODEFCONFIG, - QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390); + DO_TEST_PARSE_ERROR("s390-no-parallel", NONE); DO_TEST("s390-serial", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_CCW, @@ -2106,8 +2056,7 @@ mymain(void) DO_TEST("tpm-passthrough", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); - DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", - QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); + DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", NONE); DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); @@ -2144,14 +2093,8 @@ mymain(void) QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); - DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420); + DO_TEST_PARSE_ERROR("q35-dmi-bad-address1", NONE); + DO_TEST_PARSE_ERROR("q35-dmi-bad-address2", NONE); DO_TEST("q35-pm-disable", QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, @@ -2382,21 +2325,11 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_HDA_DUPLEX); - DO_TEST_PARSE_ERROR("q35-wrong-root", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_PARSE_ERROR("q35-wrong-root", NONE); DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE); DO_TEST_PARSE_ERROR("440fx-ide-address-conflict", NONE); - DO_TEST_PARSE_ERROR("pcie-root-port-too-many", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_PCI_MULTIFUNCTION, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_PARSE_ERROR("pcie-root-port-too-many", NONE); DO_TEST("pcie-switch-upstream-port", QEMU_CAPS_DEVICE_IOH3420, @@ -2415,26 +2348,17 @@ mymain(void) DO_TEST("pci-expander-bus", QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_PXB); - DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_PXB); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-node", NONE); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-machine", NONE); + DO_TEST_PARSE_ERROR("pci-expander-bus-bad-bus", NONE); DO_TEST("pcie-expander-bus", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_DEVICE_X3130_UPSTREAM, QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_X3130_UPSTREAM, - QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, - QEMU_CAPS_DEVICE_PXB_PCIE); - DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_DEVICE_PXB_PCIE); + DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-machine", NONE); + DO_TEST_PARSE_ERROR("pcie-expander-bus-bad-bus", NONE); DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI, @@ -2653,9 +2577,7 @@ mymain(void) DO_TEST_GIC("aarch64-gic-host", GIC_BOTH, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + DO_TEST_PARSE_ERROR("aarch64-gic-invalid", NONE); DO_TEST_FAILURE("aarch64-gic-not-virt", QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -2822,14 +2744,8 @@ mymain(void) QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM); - DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", - QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_LOADPARM); - DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", - QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_VIRTIO_CCW, - QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX, - QEMU_CAPS_LOADPARM); + DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", NONE); + DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", NONE); DO_TEST("qemu-ns-domain-ns0", NONE); DO_TEST("qemu-ns-domain-commandline", NONE); @@ -2877,8 +2793,7 @@ mymain(void) DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET); DO_TEST("usb-long-port-path", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); - DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", - QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_USB_HUB); + DO_TEST_PARSE_ERROR("usb-too-long-port-path-invalid", NONE); DO_TEST("acpi-table", NONE); DO_TEST("intel-iommu", @@ -2915,6 +2830,9 @@ mymain(void) QEMU_CAPS_DEVICE_INTEL_IOMMU); DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); + /* The _QUERY_HOTPLUGGABLE_CPUS capability is needed here because, if + * not present, libvirt will not perform the vCPU hotplug granularity + * validation and the test will pass rather than failing */ DO_TEST_PARSE_ERROR("cpu-hotplug-granularity", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); @@ -2954,9 +2872,9 @@ mymain(void) DO_TEST("cpu-cache-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); DO_TEST("cpu-cache-passthrough2", QEMU_CAPS_KVM); DO_TEST("cpu-cache-emulate-l3", QEMU_CAPS_KVM, QEMU_CAPS_CPU_CACHE); - DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM); + DO_TEST_PARSE_ERROR("cpu-cache-emulate-l2", NONE); + DO_TEST_PARSE_ERROR("cpu-cache-passthrough3", NONE); + DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", NONE); DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO); DO_TEST("user-aliases", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_CIRRUS_VGA, -- 2.14.3

2 2

[libvirt] [PATCH v5 00/16] Move qemu command line controller checks to qemuDomainDeviceDefValidateController* checks
by John Ferlan 31 Jan '18

31 Jan '18

v4: https://www.redhat.com/archives/libvir-list/2017-December/msg00401.html Changes since v4: Insert patch 1 to split the qemuDomainSetSCSIControllerModel as has been discussed during review. Adjustments to the SCSI patches as a result. Added patch 16 from Mark Hartmayer Andrea Bolognani (1): qemu: Add missing checks for pcie-root-port options John Ferlan (14): qemu: Split qemuDomainSetSCSIControllerModel qemu: Introduce qemuDomainDeviceDefValidateControllerAttributes qemu: Move and rename qemuBuildCheckSCSIControllerModel qemu: Move model set for qemuBuildControllerDevStr qemu: Adjust SCSI controller switch in qemuBuildControllerDevStr qemu: Add check for iothread attribute in validate controller qemu: Introduce qemuDomainDeviceDefValidateControllerSCSI qemu: Introduce qemuDomainDeviceDefValidateControllerPCI qemu: Use virDomainPCIControllerOpts in qemuBuildControllerDevStr qemu: Move PCI command modelName check to controller def validate qemu: Move PCI command modelName TypeToString to controller def validate qemu: Move PCI more command checks to controller def validate qemu: Complete PCI command checks to controller def validate qemu: Introduce qemuDomainDeviceDefValidateControllerSATA Marc Hartmayer (1): qemu: Use switch statement for address types in qemuBuildControllerDevStr src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_command.c | 452 +++++---------------------------------- src/qemu/qemu_domain.c | 474 ++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain_address.c | 74 ++----- src/qemu/qemu_domain_address.h | 6 +- tests/qemumemlocktest.c | 14 ++ tests/qemuxml2xmltest.c | 5 +- 7 files changed, 568 insertions(+), 461 deletions(-) -- 2.13.6

4 45

[libvirt] [PATCH] conf: Use correct attribute name in error message
by Andrea Bolognani 30 Jan '18

30 Jan '18

The <capabilities> feature has an attribute named 'policy', but the error message mentioned the non-existing 'state' attribute instead. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1581f61a4..9c9e3334f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19162,7 +19162,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((tmp = virXMLPropString(nodes[i], "policy"))) { if ((def->features[val] = virDomainCapabilitiesPolicyTypeFromString(tmp)) == -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature '%s'"), + _("unknown policy attribute '%s' of feature '%s'"), tmp, virDomainFeatureTypeToString(val)); goto error; } -- 2.14.3

1 0

[libvirt] [PATCH] storage: util: Properly ignore errors when backing volume is inaccessible
by Peter Krempa 30 Jan '18

30 Jan '18

Commit 000e9504559 tried to fix improper bracketing when refreshing disk volume stats for a backing volume. Unfortunately the condition is still wrong as in cases as the backing store being inaccessible storageBackendUpdateVolTargetInfo returns -2 if instructed to ignore errors. The condition does not take this into account. Dumping XML of a volume which has inacessible backing store would then result into: # virsh vol-dumpxml http.img --pool default error: An error occurred, but the cause is unknown Properly ignore -2 for backing volumes. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1540022 --- src/storage/storage_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 9e1b63a436..61a87b37b6 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1918,7 +1918,7 @@ virStorageBackendUpdateVolInfo(virStorageVolDefPtr vol, withBlockVolFormat, VIR_STORAGE_VOL_OPEN_DEFAULT | VIR_STORAGE_VOL_OPEN_NOERROR, - readflags)) < 0) + readflags)) == -1) return ret; return 0; -- 2.15.0

2 1

[libvirt] [PATCH] qemu: Refresh caps cache after booting a different kernel
by Jiri Denemark 30 Jan '18

30 Jan '18

Whenever a different kernel is booted, some capabilities related to KVM (such as CPUID bits) may change. We need to refresh the cache to see the changes. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: The capabilities may also change if a parameter passed to a kvm module changes (kvm_intel.nested is a good example) so this is not a complete solution, but we're hopefully getting closer to it :-) src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++++++++++++++++++++------- src/qemu/qemu_capspriv.h | 1 + tests/qemucapsprobe.c | 2 +- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ab0ea8ec0d..2c573827f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -52,6 +52,7 @@ #include <unistd.h> #include <sys/wait.h> #include <stdarg.h> +#include <sys/utsname.h> #define VIR_FROM_THIS VIR_FROM_QEMU @@ -510,6 +511,7 @@ struct _virQEMUCaps { unsigned int libvirtVersion; unsigned int microcodeVersion; char *package; + char *kernelVersion; virArch arch; @@ -2303,6 +2305,9 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (VIR_STRDUP(ret->package, qemuCaps->package) < 0) goto error; + if (VIR_STRDUP(ret->kernelVersion, qemuCaps->kernelVersion) < 0) + goto error; + ret->arch = qemuCaps->arch; if (qemuCaps->kvmCPUModels) { @@ -2363,6 +2368,7 @@ void virQEMUCapsDispose(void *obj) virBitmapFree(qemuCaps->flags); VIR_FREE(qemuCaps->package); + VIR_FREE(qemuCaps->kernelVersion); VIR_FREE(qemuCaps->binary); VIR_FREE(qemuCaps->gicCapabilities); @@ -3834,6 +3840,7 @@ struct _virQEMUCapsCachePriv { gid_t runGid; virArch hostArch; unsigned int microcodeVersion; + char *kernelVersion; }; typedef struct _virQEMUCapsCachePriv virQEMUCapsCachePriv; typedef virQEMUCapsCachePriv *virQEMUCapsCachePrivPtr; @@ -3845,6 +3852,7 @@ virQEMUCapsCachePrivFree(void *privData) virQEMUCapsCachePrivPtr priv = privData; VIR_FREE(priv->libDir); + VIR_FREE(priv->kernelVersion); VIR_FREE(priv); } @@ -3970,6 +3978,12 @@ virQEMUCapsLoadCache(virArch hostArch, goto cleanup; } + if (virXPathBoolean("boolean(./kernelVersion)", ctxt) > 0) { + qemuCaps->kernelVersion = virXPathString("string(./kernelVersion)", ctxt); + if (!qemuCaps->kernelVersion) + goto cleanup; + } + if (!(str = virXPathString("string(./arch)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing arch in QEMU capabilities cache")); @@ -4248,6 +4262,10 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) virBufferAsprintf(&buf, "<package>%s</package>\n", qemuCaps->package); + if (qemuCaps->kernelVersion) + virBufferAsprintf(&buf, "<kernelVersion>%s</kernelVersion>\n", + qemuCaps->kernelVersion); + virBufferAsprintf(&buf, "<arch>%s</arch>\n", virArchToString(qemuCaps->arch)); @@ -4385,14 +4403,24 @@ virQEMUCapsIsValid(void *data, return false; } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && - priv->microcodeVersion != qemuCaps->microcodeVersion) { - VIR_DEBUG("Outdated capabilities for '%s': microcode version changed " - "(%u vs %u)", - qemuCaps->binary, - priv->microcodeVersion, - qemuCaps->microcodeVersion); - return false; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { + if (priv->microcodeVersion != qemuCaps->microcodeVersion) { + VIR_DEBUG("Outdated capabilities for '%s': microcode version " + "changed (%u vs %u)", + qemuCaps->binary, + priv->microcodeVersion, + qemuCaps->microcodeVersion); + return false; + } + + if (STRNEQ_NULLABLE(priv->kernelVersion, qemuCaps->kernelVersion)) { + VIR_DEBUG("Outdated capabilities for '%s': kernel version changed " + "('%s' vs '%s')", + qemuCaps->binary, + priv->kernelVersion, + qemuCaps->kernelVersion); + return false; + } } return true; @@ -5228,6 +5256,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, + const char *kernelVersion, bool qmpOnly) { virQEMUCapsPtr qemuCaps; @@ -5284,9 +5313,13 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_QEMU); - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) { qemuCaps->microcodeVersion = microcodeVersion; + if (VIR_STRDUP(qemuCaps->kernelVersion, kernelVersion) < 0) + goto error; + } + cleanup: VIR_FREE(qmperr); return qemuCaps; @@ -5309,6 +5342,7 @@ virQEMUCapsNewData(const char *binary, priv->runUid, priv->runGid, priv->microcodeVersion, + priv->kernelVersion, false); } @@ -5397,6 +5431,7 @@ virQEMUCapsCacheNew(const char *libDir, char *capsCacheDir = NULL; virFileCachePtr cache = NULL; virQEMUCapsCachePrivPtr priv = NULL; + struct utsname uts = { 0 }; if (virAsprintf(&capsCacheDir, "%s/capabilities", cacheDir) < 0) goto error; @@ -5417,6 +5452,10 @@ virQEMUCapsCacheNew(const char *libDir, priv->runGid = runGid; priv->microcodeVersion = microcodeVersion; + if (uname(&uts) == 0 && + virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0) + goto error; + cleanup: VIR_FREE(capsCacheDir); return cache; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 98d163b920..222f3368e3 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -37,6 +37,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch, uid_t runUid, gid_t runGid, unsigned int microcodeVersion, + const char *kernelVersion, bool qmpOnly); int virQEMUCapsLoadCache(virArch hostArch, diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index a5f5a38b16..7d60246949 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -72,7 +72,7 @@ main(int argc, char **argv) return EXIT_FAILURE; if (!(caps = virQEMUCapsNewForBinaryInternal(VIR_ARCH_NONE, argv[1], "/tmp", - -1, -1, 0, true))) + -1, -1, 0, NULL, true))) return EXIT_FAILURE; virObjectUnref(caps); -- 2.16.0

4 5

[libvirt] How to use /dev/net/tun from libvirt-lxc with user namespacing enabled
by Thiago Padilha 29 Jan '18

29 Jan '18

I have a container rootfs that I use to keep all work-related stuff. This container was originally created by lxd (which creates all containers for use with user namespacing), but now I decided to start using libvirt for container management since I already use it for virtual machines, which will spare me from dealing with multiple hypervisor technologies. I managed to create a working domain xml for the container, and everything seems to be working very well except one thing: I cannot start openconnect (VPN software) inside the container. I noticed that by default libvirt won't create /dev/net/tun for the container, so I added this to the domain xml: <filesystem type='mount'> <source dir='/dev/net'/> <target dir='/dev/net'/> </filesystem> This successfully created /dev/net/tun in the container, but openconnect still can't open it even though it has 666 permissions. It seems this is exactly what lxd does to allow VPNs for their unprivileged containers, as shown by the output of ls -l /dev/net total 0 crw-rw-rw- 1 nobody nogroup 10, 200 Jan 29 13:23 tun The same container can also be successfully booted with systemd-nspawn, also allowing openconnect to create its VPN. I already tried setting security driver to "none" in /etc/libvirt/lxc.conf, but it had no effect. I get "Operation not permitted" when trying to open /dev/net/tun, which is also the message openconnect displays in its logs. Can someone guide me on how I might debug what is causing this error? BTW, here's the full xml: <domain type='lxc'> <name>work-stuff</name> <uuid>ffee008c-ec6b-48ab-af6d-4aba830847a1</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <vcpu placement='static'>16</vcpu> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64'>exe</type> <init>/sbin/init</init> </os> <idmap> <uid start='0' target='165536' count='65536'/> <gid start='0' target='165536' count='65536'/> </idmap> <cpu mode='host-model'> <model fallback='allow'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/lib/libvirt/libvirt_lxc</emulator> <filesystem type='mount' accessmode='passthrough'> <source dir='/var/lib/libvirt/containers/work-stuff/rootfs'/> <target dir='/'/> </filesystem> <filesystem type='mount'> <source dir='/dev/net'/> <target dir='/dev/net'/> </filesystem> <interface type='network'> <mac address='52:54:00:3e:59:e9'/> <source network='default'/> </interface> <console type='pty'> <target type='lxc' port='0'/> </console> </devices> </domain>

1 1

[libvirt] [PATCH 0/4] Tiny updates for virresctrl
by Martin Kletzander 29 Jan '18

29 Jan '18

The first patch is the only interesting one. Martin Kletzander (4): util: Check for empty allocation instead of just NULL pointer util: Use "resctrl" instead of "resctrlfs" spelling util: Make it possible for virResctrlAllocSetMask to replace existing mask util: Remove unused variable in virResctrlGetInfo src/qemu/qemu_process.c | 2 +- src/util/virresctrl.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) -- 2.16.1

2 11

[libvirt] [PATCH] build: Fix broken build on FreeBSD and OSX after recent nodedev series
by Erik Skultety 29 Jan '18

29 Jan '18

Commits f83c7c88 and 6eb1f2b9 broke the build on FreeBSD and OSX because of symbols being undefined for those platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/conf/node_device_conf.c | 6 ++++++ src/util/virpci.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index dfd61b7b7..fd8f4e4a9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2806,6 +2806,12 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, #else int +virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_UNUSED) +{ + return -1; +} + +int virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath ATTRIBUTE_UNUSED, virNodeDevCapPCIDevPtr pci_dev ATTRIBUTE_UNUSED) { diff --git a/src/util/virpci.c b/src/util/virpci.c index b6a5739ca..55e4c3e49 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3158,6 +3158,15 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path ATTRIBUTE_UNUSED, virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } + + +ssize_t +virPCIGetMdevTypes(const char *sysfspath ATTRIBUTE_UNUSED, + virMediatedDeviceTypePtr **types ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} #endif /* __linux__ */ int -- 2.13.6

1 0

[libvirt] [PATCH 00/15] Nodedev-mdev overhaul
by Erik Skultety 29 Jan '18

29 Jan '18

TL;DR: nodedev: - contained a decent amount of redundant code handling the same thing, now it doesn't. - only updated dynamic capabilities during dumpXML, now it does every time it touches them mdev: - didn't update mdev capabilities at all, now it does This series combines some long-needed refactor changes to the nodedev driver with some necessary mdev fixes based on Wu Zongyong's patch series [1]. There's a lot of simple code movement due to the fact that update of the device capabilities is strictly bound to the nodedev driver. The problem with the existing approach is that in order to properly update all capabilities, especially mdev, we would have to violate the logical code flow we have and call back into the driver to have access to sysfs, i.e. driver->(conf|obj) handling->util_helpers->DRIVER. Therefore to resolve it, along with all the compilation dependencies, I moved most of the capability handling out of the driver into src/conf/node_device_conf.c which already contained more than just parsing and formatting of the capabilities. I also had to move the existing virNodeDevCapMdevType into src/util so that the util helpers would know the type they're working with. [1] https://www.redhat.com/archives/libvir-list/2018-January/msg00315.html Erik Skultety (15): conf: nodedev: Rename virNodeDevObjHasCap to virNodeDevObjHasCapStr conf: nodedev: Rename virNodeDeviceCapMatch to virNodeDevObjHasCap conf: nodedev: Convert virNodeDevObjHasCapStr to a simple wrapper nodedev: Drop the nodeDeviceSysfsGetSCSIHostCaps wrapper nodedev: Move the sysfs-related cap handling to node_device_conf.c nodedev: Export nodeDeviceUpdateCaps from node_device_conf.c nodedev: Introduce virNodeDeviceCapsListExport conf: nodedev: Refresh capabilities before touching them util: mdev: Drop some unused symbols/includes from the header util: mdev: Introduce virMediatedDeviceType structure util: mdev: Introduce virMediatedDeviceTypeReadAttrs getter util: pci: Introduce virPCIGetMdevTypes helper nodedev: udev: Drop the unused mdev type helpers conf: Replace usage of virNodeDevCapMdevType with virMediatedDeviceType conf: nodedev: Update PCI mdev capabilities dynamically src/Makefile.am | 4 +- src/conf/node_device_conf.c | 343 ++++++++++++++++++++++++++++-- src/conf/node_device_conf.h | 29 +-- src/conf/virnodedeviceobj.c | 74 ++----- src/libvirt_private.syms | 7 +- src/node_device/node_device_driver.c | 130 ++--------- src/node_device/node_device_hal.c | 5 +- src/node_device/node_device_linux_sysfs.c | 218 ------------------- src/node_device/node_device_linux_sysfs.h | 34 --- src/node_device/node_device_udev.c | 127 +---------- src/util/virmdev.c | 47 ++++ src/util/virmdev.h | 20 +- src/util/virpci.c | 58 +++++ src/util/virpci.h | 4 + 14 files changed, 516 insertions(+), 584 deletions(-) delete mode 100644 src/node_device/node_device_linux_sysfs.c delete mode 100644 src/node_device/node_device_linux_sysfs.h -- 2.13.6

3 39

[libvirt] [PATCH 0/5] Add optional pSeries features
by Andrea Bolognani 29 Jan '18

29 Jan '18

I consider the first 4 patches ready for inclusion, but the last one - which is basically what justifies going through all this trouble - is sub-optimal until more development has happened in QEMU, so it's marked as RFC. Still, I thought I'd get the ball rolling sooner rather than later. Andrea Bolognani (5): docs: Refactor schema for 'resizing' attribute conf: Add pSeries features conf: Remove obsolete <hpt> feature tests: Clean up HPT tests conf: Add HTM pSeries feature docs/formatdomain.html.in | 39 +++- docs/schemas/domaincommon.rng | 39 +++- src/conf/domain_conf.c | 249 ++++++++++++++++++--- src/conf/domain_conf.h | 14 +- src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 9 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 116 ++++++++-- src/qemu/qemu_domain.c | 7 +- ...hpt-resizing.args => pseries-features-hpt.args} | 1 - .../pseries-features-hpt.xml} | 4 +- ...hpt-resizing.args => pseries-features-htm.args} | 3 +- .../pseries-features-htm.xml} | 4 +- ...ne.xml => pseries-features-invalid-machine.xml} | 6 +- tests/qemuxml2argvdata/pseries-hpt-resizing.xml | 19 -- tests/qemuxml2argvtest.c | 12 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-htm.xml | 1 + tests/qemuxml2xmltest.c | 6 +- 19 files changed, 423 insertions(+), 110 deletions(-) copy tests/qemuxml2argvdata/{pseries-hpt-resizing.args => pseries-features-hpt.args} (96%) copy tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => qemuxml2argvdata/pseries-features-hpt.xml} (92%) rename tests/qemuxml2argvdata/{pseries-hpt-resizing.args => pseries-features-htm.args} (86%) rename tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => qemuxml2argvdata/pseries-features-htm.xml} (93%) rename tests/qemuxml2argvdata/{pseries-hpt-resizing-invalid-machine.xml => pseries-features-invalid-machine.xml} (76%) delete mode 100644 tests/qemuxml2argvdata/pseries-hpt-resizing.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-htm.xml -- 2.14.3

2 10

[libvirt] [PATCH v2] virsh: Checking the volume capacity before uploading a new file.
by Julio Faracco 29 Jan '18

29 Jan '18

The current command 'vol-upload' is not checking if the volume accepts a file bigger than its capacity. It can cause an interrupt of the upload stream. This commit adds a check that fails before starting to send new file to volume if the file is bigger. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1529059 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-volume.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 8265a39..04e480c 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -672,6 +672,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) { const char *file = NULL; virStorageVolPtr vol = NULL; + virStorageVolInfo volumeInfo; bool ret = false; int fd = -1; virStreamPtr st = NULL; @@ -679,6 +680,7 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) unsigned long long offset = 0, length = 0; virshControlPtr priv = ctl->privData; unsigned int flags = 0; + off_t fileLen = -1; virshStreamCallbackData cbData; if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) @@ -701,6 +703,29 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) cbData.ctl = ctl; cbData.fd = fd; + if (virStorageVolGetInfo(vol, &volumeInfo) < 0) + goto cleanup; + + if ((fileLen = virFileLength(file, fd)) < 0) { + vshError(ctl, _("cannot get the file %s length"), file); + goto cleanup; + } + + if (length < fileLen) { + vshError(ctl, _("length parameter is smaller than file size")); + goto cleanup; + } + + if (volumeInfo.capacity < length) { + vshError(ctl, _("lenth parameter is bigger than volume %s capacity"), name); + goto cleanup; + } + + if (volumeInfo.capacity < fileLen + offset) { + vshError(ctl, _("file is bigger than volume %s capacity"), name); + goto cleanup; + } + if (vshCommandOptBool(cmd, "sparse")) flags |= VIR_STORAGE_VOL_UPLOAD_SPARSE_STREAM; -- 2.7.4

3 4