- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] conf: Clean up virDomain*Def creation
by Andrea Bolognani 30 Jun '17

30 Jun '17

This series is required to solve a known limitation in the current incarnation of device isolation support[1], namely the inability to isolate host devices coming from IOMMU group 0. The issue lies in the fact that virDomainDeviceInfo, and all virDomain*Def that embed it, are usually allocated through VIR_ALLOC(), which result in all their fields being initialized to zero. That's worked out just fine so far, because zero was a sensible default value for all existing fields; however, when implementing isolation groups, we add a new virDomainDeviceInfo::isolationGroup field which we need to be initialized to -1 instead so that it doesn't overlap with IOMMU group 0 mentioned above. Solving the issue involves creating twenty or so virDomain*DefNew() functions and using them instead of VIR_ALLOC() every time a virDomain*Def needs to be created, which is arguably a pretty good idea regardless. The series could probably be organized so that eg. the patch order makes more sense, but honestly I'm pretty tired right now and I just don't have it in me. Moreover, the goal of the series and its implementation are both straighforward enough that I feel reviewers will have no problem following along. My main concern with this series is that, while converting from VIR_ALLOC() to virDomain*DefNew(), I might simply have missed some instances. That would not cause any issue right away, but once we introduce isolation groups it would lead to suboptimal PCI addresses being allocated at best, and to perfectly legitimate hotplug requests being denied at worst. The fact that the test suite[2] passes gives me a lot of confidence that I haven't overlooked anything, but if anyone has clever ideas on how to be actually sure rather than merely confident please do let me know. [1] https://www.redhat.com/archives/libvir-list/2017-June/msg01018.html [2] That is, the version of it where the default isolation group being initialized correctly actually matters Andrea Bolognani (10): conf: Make virDomainDeviceGetInfo() private conf: Rename virDomainHostdevDefAlloc() to virDomainHostdevDefNew() conf: Clean up virDomainHostdevDefNew() conf: Clean up virDomain{Memory,Shmem}DefParseXML() conf: Move some virDomainDeviceInfo functions conf: Introduce virDomainDeviceInfoNew() conf: Clean up virDomainDeviceInfo functions conf, qemu: Use virDomainDeviceInfoNew() conf: Provide missing virDomain*DefNew() functions conf: Call virDomainDeviceInfoClear() in virDomain*DefNew() src/bhyve/bhyve_parse_command.c | 4 +- src/conf/device_conf.c | 146 ++++++++++++ src/conf/device_conf.h | 9 + src/conf/domain_addr.c | 6 +- src/conf/domain_conf.c | 486 ++++++++++++++++++++++++---------------- src/conf/domain_conf.h | 25 ++- src/libvirt_private.syms | 19 +- src/lxc/lxc_native.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_command.c | 12 +- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_domain_address.c | 31 +-- src/qemu/qemu_hotplug.c | 5 +- src/qemu/qemu_parse_command.c | 31 +-- src/vbox/vbox_common.c | 14 +- src/vmx/vmx.c | 2 +- src/vz/vz_sdk.c | 6 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenconfig/xen_common.c | 4 +- src/xenconfig/xen_sxpr.c | 10 +- src/xenconfig/xen_xl.c | 4 +- src/xenconfig/xen_xm.c | 2 +- tests/virhostdevtest.c | 2 +- 24 files changed, 561 insertions(+), 276 deletions(-) -- 2.7.5

3 30

[libvirt] [PATCH] qemu: Don't update CPU when checking ABI stability
by Jiri Denemark 30 Jun '17

30 Jun '17

When checking ABI stability between two domain definitions, we first make migratable copies of them. However, we also asked for the guest CPU to be updated, even though the updated CPU is supposed to be already included in the original definitions. Moreover, if we do this on the destination host during migration, we're potentially updating the definition with according to an incompatible host CPU. While updating the CPU when checking ABI stability doesn't make any sense, it actually just worked because updating the CPU doesn't do anything for custom CPUs (only host-model CPUs are affected) and we updated both definitions in the same way. Less then a year ago commit v2.3.0-rc1~42 stopped updating the CPU in the definition we got internally and only the user supplied definition was updated. However, the same commit started updating host-model CPUs to custom CPUs which are not affected by the request to update the CPU. So it still seemed to work right, unless a user upgraded libvirt 2.2.0 to a newer version while there were some domains with host-model CPUs running on the host. Such domains couldn't be migrated with a user supplied XML since libvirt would complain: Target CPU mode custom does not match source host-model The fix is pretty straightforward, we just need to stop updating the CPU when checking ABI stability. https://bugzilla.redhat.com/show_bug.cgi?id=1463957 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8e7404da6..d9357f20c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5926,7 +5926,6 @@ qemuDomainMigratableDefCheckABIStability(virQEMUDriverPtr driver, #define COPY_FLAGS (VIR_DOMAIN_XML_SECURE | \ - VIR_DOMAIN_XML_UPDATE_CPU | \ VIR_DOMAIN_XML_MIGRATABLE) bool -- 2.13.2

2 1

[libvirt] [PATCH 0/3] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 30 Jun '17

30 Jun '17

Marek Marczykowski-Górecki (3): cpu: define sub-leaf 0 for leaf 7 in cpu_map.xml libxl: add support for CPUID features policy tests: check domain XML to libxl structures conversion src/cpu/cpu_map.xml | 58 +++++------ src/libxl/libxl_conf.c | 139 ++++++++++++++++++++----- src/libxl/libxl_conf.h | 1 +- tests/Makefile.am | 8 +- tests/libxlxmltest.c | 232 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 383 insertions(+), 55 deletions(-) create mode 100644 tests/libxlxmltest.c base-commit: f914b3f2d24d05615095e5ab5b0c91560c4dc903 -- git-series 0.9.1

4 15

[libvirt] [RFC PATCH 0/5] hotplug: fix premature rebinding of VFIO devices to host
by Michael Roth 30 Jun '17

30 Jun '17

Hi everyone. Hoping to get some feedback on this approach, or some alternatives proposed below, to the following issue: Currently libvirt immediately attempts to rebind a managed device back to the host driver when it receives a DEVICE_DELETED event from QEMU. This is problematic for 2 reasons: 1) If multiple devices from a group are attached to a guest, this can move the group into a "non-viable" state where some devices are assigned to the host and some to the guest. 2) When QEMU emits the DEVICE_DELETED event, there's still a "finalize" phase where additional cleanup occurs. In most cases libvirt can ignore this cleanup, but in the case of VFIO devices this is where closing of a VFIO group FD occurs, and failing to wait before rebinding the device to the host driver can result in unexpected behavior. In the case of powernv hosts at least, this can lead to a host driver crashing due to the default DMA windows not having been fully-restored yet. The window between this is and the initial DEVICE_DELETED seems to be ~6 seconds in practice. We've seen host dumps with Mellanox CX4 VFs being rebound to host driver during this period (on powernv hosts). Patches 1-4 address 1) by deferring rebinding of a hostdev to the host driver until all the devices in the group have been detached, at which point all the hostdevs are rebound as a group. Until that point, the devices are traced by the drvManager's inactiveList in a similar manner to hostdevs that are assigned to VFIO via the nodedev-detach interface. Patch 5 addresses 2) by adding an additional check that, when the last device from a group is detached, polls /proc for open FDs referencing the VFIO group path in /dev/vfio/<iommu_group> and waiting for the FD to be closed. If we time out, we abandon rebinding the hostdevs back to the host. There are a couple alternatives to Patch 5 that might be worth considering: a) Add a DEVICE_FINALIZED event to QEMU and wait for that instead of DEVICE_DELETED. Paired with patches 1-4 this would let us drop patch 5 in favor of minimal changes to libvirt's event handlers. The downsides are: - that we'd incur some latency for all device-detach calls, but it's not apparent to me whether this delay is significant for anything outside of VFIO. - there may be cases where finalization after DEVICE_DELETE/unparent are is not guaranteed, and I'm not sure QOM would encourage such expectations even if that's currently the case. b) Add a GROUP_DELETED event to VFIO's finalize callback. This is the most direct solution. With this we could completely separate out the handling of rebinding to host driver based on receival of this event. The downsides are: - this would only work for newer versions of QEMU, though we could use the poll-wait in patch 5 as a fallback. - synchronizing sync/async device-detach threads with sync/async handlers for this would be a bit hairy, but I have a WIP in progress that seems *fairly reasonable* c) Take the approach in Patch 5, either as a precursor to implementing b) or something else, or just sticking with that for now. d) ??? Personally I'm leaning toward c), but I'm wondering if that's "good enough" for now, or if we should pursue something more robust from the start, or perhaps something else entirely? Any feedback is greatly appreciated! src/libvirt_private.syms | 5 ++ src/qemu/qemu_hostdev.c | 16 +++++ src/qemu/qemu_hostdev.h | 4 ++ src/qemu/qemu_hotplug.c | 56 ++++++++++++++---- src/util/virfile.c | 52 +++++++++++++++++ src/util/virfile.h | 1 + src/util/virhostdev.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++----- src/util/virhostdev.h | 16 +++++ src/util/virpci.c | 69 ++++++++++++++++++---- src/util/virpci.h | 4 ++ 10 files changed, 360 insertions(+), 36 deletions(-)

5 15

[libvirt] [PATCH] conf: Move virDomainPCIAddressBusIsFullyReserved()
by Andrea Bolognani 29 Jun '17

29 Jun '17

This function was private to the QEMU driver and was, accordingly, called qemuDomainPCIBusFullyReserved(). However, since it's really not QEMU-specific at all, it makes a lot of sense to have it closer to the virDomainPCIAddressBus struct it operates on; even more so considering we're going to introduce a complementary virDomainPCIAddressBusIsEmpty() function later on. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_addr.c | 14 ++++++++++++++ src/conf/domain_addr.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 15 +-------------- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 639168e..0ae1ed9 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -355,6 +355,20 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus, } +bool +virDomainPCIAddressBusIsFullyReserved(virDomainPCIAddressBusPtr bus) +{ + size_t i; + + for (i = bus->minSlot; i <= bus->maxSlot; i++) { + if (!bus->slot[i].functions) + return false; + } + + return true; +} + + /* Ensure addr fits in the address set, by expanding it if needed * * Return value: diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index f884b8a..c90a335 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -141,6 +141,9 @@ int virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus, virDomainControllerModelPCI model) ATTRIBUTE_NONNULL(1); +bool virDomainPCIAddressBusIsFullyReserved(virDomainPCIAddressBusPtr bus) + ATTRIBUTE_NONNULL(1); + bool virDomainPCIAddressSlotInUse(virDomainPCIAddressSetPtr addrs, virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 888412a..d76c1a7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -106,6 +106,7 @@ virDomainCCWAddressSetFree; virDomainCCWAddressValidate; virDomainGetBlkioParametersAssignFromDef; virDomainPCIAddressAsString; +virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusSetModel; virDomainPCIAddressEnsureAddr; virDomainPCIAddressFlagsCompatible; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b5b863f..efc698d 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1499,19 +1499,6 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def, } -static bool -qemuDomainPCIBusFullyReserved(virDomainPCIAddressBusPtr bus) -{ - size_t i; - - for (i = bus->minSlot; i <= bus->maxSlot; i++) - if (!bus->slot[i].functions) - return false; - - return true; -} - - /* * This assigns static PCI slots to all configured devices. * The ordering here is chosen to match the ordering used @@ -2043,7 +2030,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, bool buses_reserved = true; for (i = 0; i < addrs->nbuses; i++) { - if (!qemuDomainPCIBusFullyReserved(&addrs->buses[i])) { + if (!virDomainPCIAddressBusIsFullyReserved(&addrs->buses[i])) { buses_reserved = false; break; } -- 2.7.5

2 1

[libvirt] libvirt-2.0.0 build error (hidden symbol libvirt_event_poll_update_handle_semaphore)
by longguang.yue 29 Jun '17

29 Jun '17

Hi, all: i back port a patch which makes qemu depends on util directory. so i correct its dependency by applying a patch. but another error occur. the patch is http://libvirt.org/git/?p=libvirt.git;a=commit;h=57b5e27d3d74f8dbb77ac909b4… the patch fix dependency : --- libvirt-2.0.0/src/Makefile.am 2016-06-27 22:12:20.523191076 +0800 +++ libvirt-2.0.0-ok/src/Makefile.am 2017-06-22 12:25:17.512000000 +0800 @@ -1362,6 +1362,7 @@ -I$(srcdir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ + -I$(srcdir)/util \ $(AM_CFLAGS) libvirt_driver_qemu_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_qemu_impl_la_LIBADD = $(CAPNG_LIBS) \ @@ -1369,6 +1370,7 @@ $(LIBNL_LIBS) \ $(LIBXML_LIBS) \ libvirt_secret.la \ + libvirt_util.la \ $(NULL) libvirt_driver_qemu_impl_la_SOURCES = $(QEMU_DRIVER_SOURCES) --------- BUILD ERROR: CCLD qemucapsprobe /bin/ld: .libs/qemucapsprobe: hidden symbol `libvirt_event_poll_update_handle_semaphore' in ../src/libvirt_probes.o is referenced by DSO /bin/ld: final link failed: Bad value collect2: error: ld returned 1 exit status make[1]: *** [qemucapsprobe] Error 1 make[1]: Leaving directory `/root/libvirt-2.0/BUILD/libvirt-2.0.0/tests' make: *** [check-am] Error 2 + cat test-suite.log cat: test-suite.log: No such file or directory + true + exit 1 error: Bad exit status from /var/tmp/rpm-tmp.ZVbGSv (%check) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.ZVbGSv (%check) -------------

2 2

[libvirt] [PATCH v2 0/2] vz: fix vz driver compilation
by Mikhail Feoktistov 29 Jun '17

29 Jun '17

Mikhail Feoktistov (2): vz: add argument xmlopt for virDomainDefCheckABIStability call vz: nseclabels member is moved to virDomainChrSourceDef struct src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 1.8.3.1

2 3

[libvirt] [PATCH] docs: Document bhyve's vgaconf support
by Roman Bogorodskiy 29 Jun '17

29 Jun '17

- Add a news entry - Update driver's page with information about the new vgaconf attribute and provide usage example; while here, fix a grammar mistake Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- docs/drvbhyve.html.in | 28 +++++++++++++++++++++++++++- docs/news.xml | 12 ++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index dd6620d..f083db9 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -351,10 +351,36 @@ FreeBSD port.</p> <p>This way, VNC will be accessible on <code>127.0.0.1:5904</code>.</p> -<p>Please note that the tablet device requires to have an USB controller +<p>Please note that the tablet device requires to have a USB controller of the <code>nec-xhci</code> model. Currently, only a single controller of this type and a single tablet are supported per domain.</p> +<p><span class="since">Since 3.5.0</span>, it's possible to configure how the video device is exposed +to the guest using the <code>vgaconf</code> attribute:</p> + +<pre> +<domain type='bhyve'> + <devices> + ... + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='on'/> + <model type='gop' heads='1' primary='yes'/> + </video> + ... + </devices> + ... +</domain> +</pre> + +<p>If not specified, bhyve's default mode for <code>vgaconf</code> +will be used. Please refer to the +<a href="https://www.freebsd.org/cgi/man.cgi?query=bhyve&sektion=8&manpath=F…">bhyve(8)</a> +manual page and the <a href="https://wiki.freebsd.org/bhyve">bhyve wiki</a> for more details on using +the <code>vgaconf</code> option.</p> + <h3><a name="clockconfig">Clock configuration</a></h3> <p>Originally bhyve supported only localtime for RTC. Support for UTC time was introduced in diff --git a/docs/news.xml b/docs/news.xml index 27562e1..d320965 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -46,6 +46,18 @@ select a boot entry. </description> </change> + <change> + <summary> + Support controlling how video devices are exposed to the bhyve guests + </summary> + <description> + The <code>vgaconf</code> attribute was added to <code>video</code>'s + <code>driver</code> element. Possible values are: <code>on</code>, + <code>off</code>, and <code>io</code>. It controlls the way how + bhyve exposes video devices to its guests; various guest OSes might + require different settings to boot properly. + </description> + </change> </section> <section title="Improvements"> </section> -- 2.7.4

2 2

[libvirt] [PATCH 0/2] Really check for TLS dir if specified in qemu.conf
by John Ferlan 29 Jun '17

29 Jun '17

The qemu.conf indicates that for the various *_tls_x509_cert_dir settings that "If the provided path does not exist then the default_tls_x509_cert_dir path will be used."; however, the code didn't quite do that. The default for each was set during virQEMUDriverConfigNew; however, that was overwritten if the various config settings were used, but whether the directory actually existed and falling back to the default action of using the default configuration was not done. So that's what these patches do. John Ferlan (2): qemu: Clean up long lines in virQEMUDriverConfigLoadFile qemu: Check for existence of provided *_tls_x509_cert_dir src/qemu/qemu.conf | 9 +++- src/qemu/qemu_conf.c | 123 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 98 insertions(+), 34 deletions(-) -- 2.9.4

5 11

[libvirt] [PATCH] vz: support disabled items in prlsdk boot order
by Nikolay Shirokovskiy 29 Jun '17

29 Jun '17

--- src/vz/vz_sdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 8ccd7ea..a6eb0dd 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1736,11 +1736,8 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) pret = PrlBootDev_IsInUse(bootDev, &inUse); prlsdkCheckRetGoto(pret, cleanup); - if (!inUse) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Boot ordering with disabled items is not supported")); - goto cleanup; - } + if (!inUse) + continue; pret = PrlBootDev_GetSequenceIndex(bootDev, &bootIndex); prlsdkCheckRetGoto(pret, cleanup); -- 1.8.3.1

2 1

[libvirt] [PATCH] vz: fix vz driver compilation
by Mikhail Feoktistov 28 Jun '17

28 Jun '17

- add argument xmlopt for virDomainDefCheckABIStability - nseclabels is moved to virDomainChrSourceDefPtr --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d47774c..6f4aee3 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -872,7 +872,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) * So forbid this operation, if config is changed. If it's * not changed - just do nothing. */ - if (!virDomainDefCheckABIStability(dom->def, def)) { + if (!virDomainDefCheckABIStability(dom->def, def, driver->xmlopt)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Can't change domain configuration " "in managed save state")); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a62b310..0aa1a30 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2894,7 +2894,7 @@ static int prlsdkCheckSerialUnsupportedParams(virDomainChrDefPtr chr) return -1; } - if (chr->nseclabels > 0) { + if (chr->source->nseclabels > 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Setting security labels is not " "supported by vz driver.")); -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: news: Add entries for my recent changes
by Peter Krempa 28 Jun '17

28 Jun '17

--- docs/news.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 27562e12b..f0c902fa4 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -48,8 +48,40 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + block copy job can be used with persistent domains + </summary> + <description> + Users who can tolerate that the block copy job might not be recovered + if a VM is shutdown until it finishes now may specify the + VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB flag to make block copy work for + persistent VMs too. + </description> + </change> + <change> + <summary> + JSON pseudo-protocol backing store parser supports new format of qemu 2.9 + </summary> + <description> + QEMU 2.9 modified a few structures corresponding to the JSON format + of specifying a backing store for a disk image. Libvirt now implements + the new format. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + block commit is now able to keep relative backing chain after snapshot again + </summary> + <description> + An external snapshot created with VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT + would not be scanned for metadata and thus if users specified a + relative path to the backing image this would not be detected. Block + commit operation then was unable to keep the relative relationship. + </description> + </change> </section> </release> <release version="v3.4.0" date="2017-06-02"> -- 2.12.2

2 3

[libvirt] [PATCH v4] virsh: add [--domain DOMAIN] option to domxml-to-native DOMAIN COMMAND
by Daniel Liu 28 Jun '17

28 Jun '17

The option allows someone to run domain-to-native on already existing domain without the need of supplying their XML. It is basically wrapper around 'virsh dumpxml | virsh domxml-to-native /dev/stdin'. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=835476 Signed-off-by: Daniel Liu <srwx4096(a)gmail.com> --- tools/virsh-domain.c | 51 ++++++++++++++++++++++++++++++++++++++------------- tools/virsh.pod | 7 ++++--- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ccb514ef9..3496359c5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9848,9 +9848,13 @@ static const vshCmdOptDef opts_domxmltonative[] = { .flags = VSH_OFLAG_REQ, .help = N_("target config data type format") }, + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ_OPT, + .help = N_("domain name, id or uuid") + }, {.name = "xml", .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, .help = N_("xml data file to export from") }, {.name = NULL} @@ -9859,30 +9863,51 @@ static const vshCmdOptDef opts_domxmltonative[] = { static bool cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) { - bool ret = true; + bool ret = false; const char *format = NULL; - const char *xmlFile = NULL; - char *configData; - char *xmlData; + const char *xml = NULL; + char *xmlData = NULL; + char *configData = NULL; unsigned int flags = 0; virshControlPtr priv = ctl->privData; + virDomainPtr dom = NULL; if (vshCommandOptStringReq(ctl, cmd, "format", &format) < 0 || - vshCommandOptStringReq(ctl, cmd, "xml", &xmlFile) < 0) + vshCommandOptStringReq(ctl, cmd, "xml", &xml) < 0) return false; - if (virFileReadAll(xmlFile, VSH_MAX_XML_FILE, &xmlData) < 0) - return false; + VSH_EXCLUSIVE_OPTIONS("domain", "xml"); - configData = virConnectDomainXMLToNative(priv->conn, format, xmlData, flags); - if (configData != NULL) { - vshPrint(ctl, "%s", configData); - VIR_FREE(configData); + if (vshCommandOptBool(cmd, "domain") && + (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))) + return false; + + if (dom) { + xmlData = virDomainGetXMLDesc(dom, flags); + } else if (xml) { + if (virFileReadAll(xml, VSH_MAX_XML_FILE, &xmlData) < 0) + goto cleanup; } else { - ret = false; + vshError(ctl, "%s", _("need either domain or domain XML")); + goto cleanup; + } + + if (!xmlData) { + vshError(ctl, "%s", _("failed to retrieve XML")); + goto cleanup; } + if (!(configData = virConnectDomainXMLToNative(priv->conn, format, xmlData, flags))) { + goto cleanup; + } else { + vshPrint(ctl, "%s", configData); + ret = true; + } + + cleanup: + virshDomainFree(dom); VIR_FREE(xmlData); + VIR_FREE(configData); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index aee964689..049c2f3c7 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1433,10 +1433,11 @@ the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the I<format> argument may be B<xen-xm>, B<xen-xl>, or B<xen-sxpr>. For LXC hypervisor, the I<format> argument must be B<lxc-tools>. -=item B<domxml-to-native> I<format> I<xml> +=item B<domxml-to-native> I<format> +{ I<--domain> I<domain-name-or-id-or-uuid> | [I<--xml>] I<xml> } -Convert the file I<xml> in domain XML format to the native guest -configuration format named by I<format>. For QEMU/KVM hypervisor, +Convert the file I<xml> in domain XML format or existing domain to the +native guest configuration format named by I<format>. For QEMU/KVM hypervisor, the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the I<format> argument may be B<xen-xm>, B<xen-xl>, or B<xen-sxpr>. For LXC hypervisor, the I<format> argument must be B<lxc-tools>. -- 2.13.0

5 18

[libvirt] [PATCH] util: netdevbridge: Refactor error handling in virNetDevBridgeCreate
by Peter Krempa 28 Jun '17

28 Jun '17

Replace the switch statement with a simpler if statement. This also removes the fallthrough path that coverity was complaining about. --- src/util/virnetdevbridge.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 11b03b426..cfb7ebae9 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -468,22 +468,17 @@ virNetDevBridgeCreate(const char *brname) if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; - switch (err->error) { - case 0: - break; - case -EOPNOTSUPP: + if (err->error < 0) { # if defined(HAVE_STRUCT_IFREQ) && defined(SIOCBRADDBR) - /* fallback to ioctl if netlink doesn't support creating - * bridges - */ - rc = virNetDevBridgeCreateWithIoctl(brname); - goto cleanup; + if (err->error == -EOPNOTSUPP) { + /* fallback to ioctl if netlink doesn't support creating + * bridges + */ + rc = virNetDevBridgeCreateWithIoctl(brname); + goto cleanup; + } # endif - /* intentionally fall through if virNetDevBridgeCreateWithIoctl() - * isn't available. - */ - ATTRIBUTE_FALLTHROUGH; - default: + virReportSystemError(-err->error, _("error creating bridge interface %s"), brname); -- 2.12.2

2 1

[libvirt] [PATCH 0/4] Resolve a few Coverity found issues
by John Ferlan 28 Jun '17

28 Jun '17

Was actually hoping the nodedev series would get reviewed, but since it didn't the first patch fixes a problem that Coverity noted... The other 3 patches are also things Coverity has noted and I've been holding onto in my wait for enough Coverity issues to surface before posting queue of things to do. The really strange thing about patch 2 is Coverity complained on the second one, but not the first mainly because of the net->ifname check a few lines earlier. By moving things - the complaint went away, but the code looked better with a helper so I kept it that way. Patch 3 is based on newer code that caught the attention, while patch 4 is a much older change which just got buried amongst 30 others that I keep in a false positive branch John Ferlan (4): nodedev: Add check for NULL obj before call Unlock hotplug: Create helper to remove vport util: Adjust the #ifdef logic in virNetDevBridgeCreate test: Fix possible ap leak for VIR_TEST_PRELOAD src/node_device/node_device_driver.c | 3 ++- src/qemu/qemu_hotplug.c | 41 +++++++++++++++++------------------- src/util/virnetdevbridge.c | 3 ++- tests/qemucapsprobe.c | 2 +- tests/testutils.c | 4 ++-- tests/testutils.h | 6 +++++- 6 files changed, 31 insertions(+), 28 deletions(-) -- 2.9.4

2 10

[libvirt] [PATCH] qemu: hotplug: Disallow modification of vcpu 0 in inactive config
by Peter Krempa 28 Jun '17

28 Jun '17

vcpu 0 must be always enabled and non-hotpluggable, thus you can't modify it using the vcpu hotplug APIs. Disallow it so that users can't create invalid configurations. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1459785 --- src/qemu/qemu_hotplug.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a486fb4fe..dd030d3d9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5884,18 +5884,17 @@ qemuDomainFilterHotplugVcpuEntities(virDomainDefPtr def, static int qemuDomainVcpuValidateConfig(virDomainDefPtr def, - virBitmapPtr map, - bool state) + virBitmapPtr map) { virDomainVcpuDefPtr vcpu; size_t maxvcpus = virDomainDefGetVcpusMax(def); ssize_t next; ssize_t firstvcpu = -1; - /* vcpu 0 can't be disabled */ - if (!state && virBitmapIsBitSet(map, 0)) { + /* vcpu 0 can't be modified */ + if (virBitmapIsBitSet(map, 0)) { virReportError(VIR_ERR_INVALID_ARG, "%s", - _("vCPU '0' must be enabled")); + _("vCPU '0' can't be modified")); return -1; } @@ -5959,7 +5958,7 @@ qemuDomainSetVcpuInternal(virQEMUDriverPtr driver, } if (persistentDef) { - if (qemuDomainVcpuValidateConfig(persistentDef, map, state) < 0) + if (qemuDomainVcpuValidateConfig(persistentDef, map) < 0) goto cleanup; } -- 2.12.2

2 1

[libvirt] [PATCH 0/2] Two news bits for this release
by Martin Kletzander 28 Jun '17

28 Jun '17

Martin Kletzander (2): news: Add live coalesce settings to new features news: Add CAT capability information into improvements docs/news.xml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- 2.13.2

2 7

[libvirt] [PATCH v2] Fix documentation errors about the path of conf files
by Lily Zhu 28 Jun '17

28 Jun '17

The default conf files, for example, libvirtd.conf, virtlockd.conf and virtlogd.conf, should be located under the directory "/etc/libvirt" when root as root, rather than "/etc". When run as non-root, the configuration file should be located under "$XDG_CONFIG_HOME/libvirt/", rather than "XDG_CONFIG_HOME". Signed-off-by: Lily Zhu <lizhu(a)redhat.com> --- daemon/libvirtd.pod | 4 ++-- src/locking/virtlockd.pod | 4 ++-- src/logging/virtlogd.pod | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 3b819a2..9f5a17d 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -81,7 +81,7 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration. =over -=item F<SYSCONFDIR/libvirtd.conf> +=item F<SYSCONFDIR/libvirt/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. @@ -114,7 +114,7 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. =over -=item F<$XDG_CONFIG_HOME/libvirtd.conf> +=item F<$XDG_CONFIG_HOME/libvirt/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/locking/virtlockd.pod b/src/locking/virtlockd.pod index a3bb268..355d974 100644 --- a/src/locking/virtlockd.pod +++ b/src/locking/virtlockd.pod @@ -67,7 +67,7 @@ upgrades of the virtlockd service. =over -=item F<SYSCONFDIR/virtlockd.conf> +=item F<SYSCONFDIR/libvirt/virtlockd.conf> The default configuration file used by virtlockd, unless overridden on the command line using the B<-f>|B<--config> option. @@ -86,7 +86,7 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. =over -=item F<$XDG_CONFIG_HOME/virtlockd.conf> +=item F<$XDG_CONFIG_HOME/libvirt/virtlockd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/logging/virtlogd.pod b/src/logging/virtlogd.pod index 7e55c9e..9e7212c 100644 --- a/src/logging/virtlogd.pod +++ b/src/logging/virtlogd.pod @@ -67,7 +67,7 @@ upgrades of the virtlogd service. =over -=item F<SYSCONFDIR/virtlogd.conf> +=item F<SYSCONFDIR/libvirt/virtlogd.conf> The default configuration file used by virtlogd, unless overridden on the command line using the B<-f>|B<--config> option. @@ -86,7 +86,7 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. =over -=item F<$XDG_CONFIG_HOME/virtlogd.conf> +=item F<$XDG_CONFIG_HOME/libvirt/virtlogd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. -- 1.8.3.1

2 1

[libvirt] Plans for next release
by Daniel Veillard 28 Jun '17

28 Jun '17

I'm already a bit late, I think we should try to enter freeze at the end of the day, then push rc2 on friday end or w.e. which would then allow to have the final release on Monday or Tuesday. I assume US won't work those days but that should be fine if we don't have any blocker, hopefully that works for everybody, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] virsh: Fix --help problem for domxml-to-native DOMAIN COMMAND
by Daniel Liu 27 Jun '17

27 Jun '17

Resolves a bug in domxml-to-native command option, so that the following command displays the help information correctly: 'virsh domxml-to-native --help'. Signed-off-by: Daniel Liu <srwx4096(a)gmail.com> Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5311a57c2..55f4e14a4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9857,12 +9857,12 @@ static const vshCmdOptDef opts_domxmltonative[] = { .help = N_("target config data type format") }, {.name = "domain", - .type = VSH_OT_DATA, + .type = VSH_OT_STRING, .flags = VSH_OFLAG_REQ_OPT, .help = N_("domain name, id or uuid") }, {.name = "xml", - .type = VSH_OT_DATA, + .type = VSH_OT_ARGV, .help = N_("xml data file to export from") }, {.name = NULL} -- 2.13.1

3 2

[libvirt] [PATCH v6 0/5] Hyper-V method invocation
by Sri Ramanujam 27 Jun '17

27 Jun '17

Changes from v5: * Changes from review * Fixed memory leak in hypervDomainSetMemory where params would leak in failure case Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 237 +++++++++ src/hyperv/hyperv_wmi.c | 910 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 95 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1394 insertions(+), 2 deletions(-) -- 2.9.4

2 6

[libvirt] [PATCH v3] bhyve: add vga configuration for video driver
by Roman Bogorodskiy 27 Jun '17

27 Jun '17

Add support for vgaconf driver configuration. In domain xml it looks like this: <video> <driver vgaconf='io|on|off'> <model .../> </video> It was added with bhyve gop video in mind to allow users control how the video device is exposed to the guest, specifically, how VGA I/O is handled. One can refer to the bhyve manual page to get more detailed description of the possible VGA configuration options: https://www.freebsd.org/cgi/man.cgi?query=bhyve&manpath=FreeBSD+12-current The relevant part could be found using the 'vgaconf' keyword. Also, add some tests for this new feature. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- Changes from v1: * Rebased on top of current master. Specifically, the most important bit was merging with f5384fb4 which has added video/driver element * In conjunction with f5384fb4 use video/driver element instead of video/model/driver * Squash in conf and bhyve patches to make it easier to understand how it's used * Rename *Vgaconf* to *VGAConf* * Add a little more tests Changes from v2: * Add option description to formatdomain.html.in docs/formatdomain.html.in | 9 +++- docs/schemas/domaincommon.rng | 13 ++++- src/bhyve/bhyve_command.c | 4 ++ src/conf/domain_conf.c | 57 ++++++++++++++++++++-- src/conf/domain_conf.h | 17 +++++++ src/libvirt_private.syms | 2 + .../bhyvexml2argv-vnc-vgaconf-io.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-io.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-io.xml | 30 ++++++++++++ .../bhyvexml2argv-vnc-vgaconf-off.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-off.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-off.xml | 30 ++++++++++++ .../bhyvexml2argv-vnc-vgaconf-on.args | 12 +++++ .../bhyvexml2argv-vnc-vgaconf-on.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf-on.xml | 30 ++++++++++++ tests/bhyvexml2argvtest.c | 3 ++ .../bhyvexml2xmlout-vnc-vgaconf-io.xml | 41 ++++++++++++++++ .../bhyvexml2xmlout-vnc-vgaconf-off.xml | 42 ++++++++++++++++ .../bhyvexml2xmlout-vnc-vgaconf-on.xml | 42 ++++++++++++++++ tests/bhyvexml2xmltest.c | 3 ++ 20 files changed, 356 insertions(+), 6 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 52119f0a0..9e7bb51ba 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6151,7 +6151,14 @@ qemu-kvm -net nic,model=? /dev/null <dt>virtio options</dt> <dd> <a href="#elementsVirtio">Virtio-specific options</a> can also be - set. (<span class="since">Since 3.5.0</span>) + set (<span class="since">Since 3.5.0</span>) + </dd> + <dt>VGA configuration</dt> + <dd> + Control how the video devices exposed to the guest using the + <code>vgaconf</code> attribute which takes the value "io", "on" or "off". + At present, it's only applicable to the bhyve's "gop" video model type + (<span class="since">Since 3.5.0</span>) </dd> </dl> </dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4950ddc10..51acac3ee 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3220,7 +3220,18 @@ <element name="video"> <optional> <element name="driver"> - <ref name="virtioOptions"/> + <optional> + <ref name="virtioOptions"/> + </optional> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> </element> </optional> <optional> diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..b3ae315bd 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -408,6 +408,10 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, _("Unsupported listen type")); } + if (video->driver) + virBufferAsprintf(&opt, ",vga=%s", + virDomainVideoVGAConfTypeToString(video->driver->vgaconf)); + virCommandAddArg(cmd, "-s"); virCommandAddArgBuffer(cmd, &opt); return 0; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4f79d3825..1e9f91ca8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -560,6 +560,11 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "virtio", "gop") +VIR_ENUM_IMPL(virDomainVideoVGAConf, VIR_DOMAIN_VIDEO_VGACONF_LAST, + "io", + "on", + "off") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet", @@ -2355,6 +2360,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) VIR_FREE(def->accel); VIR_FREE(def->virtio); + VIR_FREE(def->driver); VIR_FREE(def); } @@ -13529,6 +13535,43 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) return def; } +static virDomainVideoDriverDefPtr +virDomainVideoDriverDefParseXML(xmlNodePtr node) +{ + xmlNodePtr cur; + virDomainVideoDriverDefPtr def; + char *vgaconf = NULL; + int val; + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (!vgaconf && + xmlStrEqual(cur->name, BAD_CAST "driver")) { + vgaconf = virXMLPropString(cur, "vgaconf"); + } + } + cur = cur->next; + } + + if (!vgaconf) + return NULL; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vgaconf value '%s'"), vgaconf); + goto cleanup; + } + def->vgaconf = val; + + cleanup: + VIR_FREE(vgaconf); + return def; +} + static virDomainVideoDefPtr virDomainVideoDefParseXML(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -13652,6 +13695,8 @@ virDomainVideoDefParseXML(xmlNodePtr node, if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) goto error; + def->driver = virDomainVideoDriverDefParseXML(node); + cleanup: ctxt->node = saved; @@ -23386,7 +23431,6 @@ virDomainVideoAccelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - static int virDomainVideoDefFormat(virBufferPtr buf, virDomainVideoDefPtr def, @@ -23406,9 +23450,13 @@ virDomainVideoDefFormat(virBufferPtr buf, virDomainVirtioOptionsFormat(&driverBuf, def->virtio); if (virBufferCheckError(&driverBuf) < 0) return -1; - if (virBufferUse(&driverBuf)) { + if (virBufferUse(&driverBuf) || (def->driver && def->driver->vgaconf)) { virBufferAddLit(buf, "<driver"); - virBufferAddBuffer(buf, &driverBuf); + if (virBufferUse(&driverBuf)) + virBufferAddBuffer(buf, &driverBuf); + if (def->driver && def->driver->vgaconf) + virBufferAsprintf(buf, " vgaconf='%s'", + virDomainVideoVGAConfTypeToString(def->driver->vgaconf)); virBufferAddLit(buf, "/>\n"); } virBufferAsprintf(buf, "<model type='%s'", @@ -23428,7 +23476,8 @@ virDomainVideoDefFormat(virBufferPtr buf, if (def->accel) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virDomainVideoAccelDefFormat(buf, def->accel); + if (def->accel) + virDomainVideoAccelDefFormat(buf, def->accel); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</model>\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6d9ee9787..964bc02f9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1359,6 +1359,16 @@ typedef enum { } virDomainVideoType; +typedef enum { + VIR_DOMAIN_VIDEO_VGACONF_IO = 0, + VIR_DOMAIN_VIDEO_VGACONF_ON, + VIR_DOMAIN_VIDEO_VGACONF_OFF, + + VIR_DOMAIN_VIDEO_VGACONF_LAST +} virDomainVideoVGAConf; + +VIR_ENUM_DECL(virDomainVideoVGAConf) + typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { @@ -1367,6 +1377,12 @@ struct _virDomainVideoAccelDef { }; +typedef struct _virDomainVideoDriverDef virDomainVideoDriverDef; +typedef virDomainVideoDriverDef *virDomainVideoDriverDefPtr; +struct _virDomainVideoDriverDef { + virDomainVideoVGAConf vgaconf; +}; + struct _virDomainVideoDef { int type; unsigned int ram; /* kibibytes (multiples of 1024) */ @@ -1376,6 +1392,7 @@ struct _virDomainVideoDef { unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; + virDomainVideoDriverDefPtr driver; virDomainDeviceInfo info; virDomainVirtioOptionsPtr virtio; }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 044510f09..41ca62631 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -530,6 +530,8 @@ virDomainVideoDefaultType; virDomainVideoDefFree; virDomainVideoTypeFromString; virDomainVideoTypeToString; +virDomainVideoVGAConfTypeFromString; +virDomainVideoVGAConfTypeToString; virDomainVirtTypeFromString; virDomainVirtTypeToString; virDomainWatchdogActionTypeFromString; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args new file mode 100644 index 000000000..da3797100 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml new file mode 100644 index 000000000..b1bb3793d --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="io"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args new file mode 100644 index 000000000..70347ee0b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml new file mode 100644 index 000000000..6e9582840 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="off"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args new file mode 100644 index 000000000..d0e1d81e2 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml new file mode 100644 index 000000000..a270f6334 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf="on"/> + <model type='gop' heads='1' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..72f10ebc1 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -193,6 +193,9 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-vgaconf-on"); + DO_TEST("vnc-vgaconf-off"); + DO_TEST("vnc-vgaconf-io"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml new file mode 100644 index 000000000..9e470e432 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-io.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml new file mode 100644 index 000000000..89c4ceac5 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-off.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='off'/> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml new file mode 100644 index 000000000..86d893936 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf-on.xml @@ -0,0 +1,42 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <driver vgaconf='on'/> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index b3759919e..8e41088a8 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,9 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-vgaconf-on"); + DO_TEST_DIFFERENT("vnc-vgaconf-off"); + DO_TEST_DIFFERENT("vnc-vgaconf-io"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.13.0

2 2

[libvirt] [RFC PATCH v1 0/4] numa: describe sibling nodes distances
by Wim Ten Have 27 Jun '17

27 Jun '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch extents guest domain administration adding support to advertise node sibling distances when configuring HVM numa guests. NUMA (non-uniform memory access), a method of configuring a cluster of nodes within a single multiprocessing system such that it shares processor local memory amongst others improving performance and the ability of the system to be expanded. A NUMA system could be illustrated as shown below. Within this 4-node system, every socket is equipped with its own distinct memory. The whole typically resembles a SMP (symmetric multiprocessing) system being a "tightly-coupled," "share everything" system in which multiple processors are working under a single operating system and can access each others' memory over multiple "Bus Interconnect" paths. +-----+-----+-----+ +-----+-----+-----+ | M | CPU | CPU | | CPU | CPU | M | | E | | | | | | E | | M +- Socket0 -+ +- Socket3 -+ M | | O | | | | | | O | | R | CPU | CPU <---------> CPU | CPU | R | | Y | | | | | | Y | +-----+--^--+-----+ +-----+--^--+-----+ | | | Bus Interconnect | | | +-----+--v--+-----+ +-----+--v--+-----+ | M | | | | | | M | | E | CPU | CPU <---------> CPU | CPU | E | | M | | | | | | M | | O +- Socket1 -+ +- Socket2 -+ O | | R | | | | | | R | | Y | CPU | CPU | | CPU | CPU | Y | +-----+-----+-----+ +-----+-----+-----+ In contrast there is the limitation of a flat SMP system, not illustrated. Here, as sockets are added, the bus (data and address path), under high activity, gets overloaded and easily becomes a performance bottleneck. NUMA adds an intermediate level of memory shared amongst a few cores per socket as illustrated above, so that data accesses do not have to travel over a single bus. Unfortunately the way NUMA does this adds its own limitations. This, as visualized in the illustration above, happens when data is stored in memory associated with Socket2 and is accessed by a CPU (core) in Socket0. The processors use the "Bus Interconnect" to create gateways between the sockets (nodes) enabling inter-socket access to memory. These "Bus Interconnect" hops add data access delays when a CPU (core) accesses memory associated with a remote socket (node). For terminology we refer to sockets as "nodes" where access to each others' distinct resources such as memory make them "siblings" with a designated "distance" between them. A specific design is described under the ACPI (Advanced Configuration and Power Interface Specification) within the chapter explaining the system's SLIT (System Locality Distance Information Table). These patches extend core libvirt's XML description of a virtual machine's hardware to include NUMA distance information for sibling nodes, which is then passed to Xen guests via libxl. Recently qemu landed support for constructing the SLIT since commit 0f203430dd ("numa: Allow setting NUMA distance for different NUMA nodes"), hence these core libvirt extensions can also help other drivers in supporting this feature. The XML changes made allow to describe the <cell> (or node/sockets) <distances> amongst <sibling> node identifiers and propagate these towards the numa domain functionality finally adding support to libxl. [below is an example illustrating a 4 node/socket <cell> setup] <cpu> <numa> <cell id='0' cpus='0,4-7' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='10'/> <sibling id='1' value='21'/> <sibling id='2' value='31'/> <sibling id='3' value='41'/> </distances> </cell> <cell id='1' cpus='1,8-10,12-15' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='21'/> <sibling id='1' value='10'/> <sibling id='2' value='21'/> <sibling id='3' value='31'/> </distances> </cell> <cell id='2' cpus='2,11' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='31'/> <sibling id='1' value='21'/> <sibling id='2' value='10'/> <sibling id='3' value='21'/> </distances> </cell> <cell id='3' cpus='3' memory='2097152' unit='KiB'> <distances> <sibling id='0' value='41'/> <sibling id='1' value='31'/> <sibling id='2' value='21'/> <sibling id='3' value='10'/> </distances> </cell> </numa> </cpu> By default on libxl, if no <distances> are given to describe the SLIT data between different <cell>s, this patch will default to a scheme using 10 for local and 21 for any remote node/socket, which is the assumption of guest OS when no SLIT is specified. While SLIT is optional, libxl requires that distances are set nonetheless. On Linux systems the SLIT detail can be listed with help of the 'numactl -H' command. An above HVM guest as described would on such prompt with below output. [root@f25 ~]# numactl -H available: 4 nodes (0-3) node 0 cpus: 0 4 5 6 7 node 0 size: 1988 MB node 0 free: 1743 MB node 1 cpus: 1 8 9 10 12 13 14 15 node 1 size: 1946 MB node 1 free: 1885 MB node 2 cpus: 2 11 node 2 size: 2011 MB node 2 free: 1912 MB node 3 cpus: 3 node 3 size: 2010 MB node 3 free: 1980 MB node distances: node 0 1 2 3 0: 10 21 31 41 1: 21 10 21 31 2: 31 21 10 21 3: 41 31 21 10 Wim ten Have (4): numa: describe siblings distances within cells libxl: vnuma support xenconfig: add domxml conversions for xen-xl xlconfigtest: add tests for numa cell sibling distances docs/schemas/basictypes.rng | 8 + docs/schemas/cputypes.rng | 18 ++ src/conf/cpu_conf.c | 2 +- src/conf/numa_conf.c | 260 +++++++++++++++++- src/conf/numa_conf.h | 25 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 128 +++++++++ src/xenconfig/xen_xl.c | 300 +++++++++++++++++++++ .../test-fullvirt-vnuma-nodistances.cfg | 26 ++ .../test-fullvirt-vnuma-nodistances.xml | 54 ++++ tests/xlconfigdata/test-fullvirt-vnuma.cfg | 26 ++ tests/xlconfigdata/test-fullvirt-vnuma.xml | 81 ++++++ tests/xlconfigtest.c | 4 + 13 files changed, 932 insertions(+), 6 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-vnuma.xml -- 2.9.4

5 11

[libvirt] [PATCH] conf: Copy loadparm in virDomainDeviceInfoCopy()
by Andrea Bolognani 27 Jun '17

27 Jun '17

Commit 54fa1b44afc8 added virDomainDeviceInfo::loadparm and updated virDomainDeviceInfoClear() accordingly, but omitted the necessary virDomainDeviceInfoCopy() changes. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e5595d7..8fabb89 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3812,12 +3812,14 @@ virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, /* first a shallow copy of *everything* */ *dst = *src; - /* then redo the two fields that are pointers */ + /* then copy whatever's left */ dst->alias = NULL; dst->romfile = NULL; + dst->loadparm = NULL; if (VIR_STRDUP(dst->alias, src->alias) < 0 || - VIR_STRDUP(dst->romfile, src->romfile) < 0) + VIR_STRDUP(dst->romfile, src->romfile) < 0 || + VIR_STRDUP(dst->loadparm, src->loadparm) < 0) return -1; return 0; } -- 2.7.5

3 3

[libvirt] [PATCH 0/4] Drop HACKING, improve README
by Andrea Bolognani 27 Jun '17

27 Jun '17

This has annoyed me for a very, very long time. Andrea Bolognani (4): HACKING: Drop from the git repository docs: Point to hacking.html from contribute.html README: Remove 'git send-email' mention README: Various minor style tweaks HACKING | 1112 ----------------------------------------------- Makefile.am | 11 - README-hacking | 3 +- README.md | 21 +- cfg.mk | 13 +- docs/Makefile.am | 2 +- docs/contribute.html.in | 4 +- docs/hacking1.xsl | 40 -- docs/hacking2.xsl | 140 ------ 9 files changed, 21 insertions(+), 1325 deletions(-) delete mode 100644 HACKING delete mode 100644 docs/hacking1.xsl delete mode 100644 docs/hacking2.xsl -- 2.7.5

4 17