- Devel - libvirt List Archives

[libvirt] [PATCH] qemu:json: Fix daemon crash on handling domain shutdown event
by Erik Skultety 30 May '17

30 May '17

commit a8eba5036 added further checking of the guest shutdown cause, but this enhancement is available since qemu 2.10, causing a crash because of a NULL pointer dereference on older qemus. Thread 1 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007ffff72441af in virJSONValueObjectGet (object=0x0, key=0x7fffd5ef11bf "guest") at util/virjson.c:769 769 if (object->type != VIR_JSON_TYPE_OBJECT) (gdb) bt 0 in virJSONValueObjectGet 1 in virJSONValueObjectGetBoolean 2 in qemuMonitorJSONHandleShutdown 3 in qemuMonitorJSONIOProcessEvent 4 in qemuMonitorJSONIOProcessLine 5 in qemuMonitorJSONIOProcess 6 in qemuMonitorIOProcess 7 in qemuMonitorIO 8 in virEventPollDispatchHandles 9 in virEventPollRunOnce 10 in virEventRunDefaultImpl 11 in virNetDaemonRun 12 in main Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- 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 757595dd7..f208dd05a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -528,7 +528,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da bool guest = false; virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; - if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; qemuMonitorEmitShutdown(mon, guest_initiated); -- 2.13.0

2 2

[libvirt] [PATCH v3] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 30 May '17

30 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..c485a9721 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUGetCount(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

2 1

[libvirt] [libvirt-sandbox PATCH] mkinitrd: Add missing fscrypto module
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index bdec490..7204f71 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -186,6 +186,7 @@ static gchar *gvir_sandbox_builder_machine_mkinitrd(GVirSandboxConfig *config, /* In case ext4 is built as a module, include it and its deps * for the root mount */ + gvir_sandbox_config_initrd_add_module(initrd, "fscrypto.ko"); gvir_sandbox_config_initrd_add_module(initrd, "mbcache.ko"); gvir_sandbox_config_initrd_add_module(initrd, "jbd2.ko"); gvir_sandbox_config_initrd_add_module(initrd, "crc16.ko"); -- 2.11.0

2 2

[libvirt] [libvirt-sandbox PATCH] docker: Don't ignore qemu-img errors
by Guido Günther 30 May '17

30 May '17

--- libvirt-sandbox/image/sources/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/image/sources/docker.py b/libvirt-sandbox/image/sources/docker.py index 43e9c32..aa5675e 100755 --- a/libvirt-sandbox/image/sources/docker.py +++ b/libvirt-sandbox/image/sources/docker.py @@ -662,7 +662,7 @@ class DockerSource(base.Source): cmd.append("-o") cmd.append("backing_fmt=qcow2,backing_file=%s" % diskfile) cmd.append(tempfile) - subprocess.call(cmd) + subprocess.check_call(cmd) return tempfile def get_command(self, template, templatedir, userargs): -- 2.11.0

2 2

[libvirt] [PATCH] tools: make setvcpus --maximum imply --config
by Chen Hanxiao 29 May '17

29 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Currently --maximum was possible if and only if --config was specified. This patch makes setvcpus --maximum imply --config. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain.c | 7 ++++--- tools/virsh.pod | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5c42021..04ef816 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6819,8 +6819,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); VSH_EXCLUSIVE_OPTIONS_VAR(guest, config); - - VSH_REQUIRE_OPTION_VAR(maximum, config); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, live); + VSH_EXCLUSIVE_OPTIONS_VAR(maximum, current); if (config) flags |= VIR_DOMAIN_AFFECT_CONFIG; @@ -6829,7 +6829,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; if (maximum) - flags |= VIR_DOMAIN_VCPU_MAXIMUM; + flags |= VIR_DOMAIN_VCPU_MAXIMUM | + VIR_DOMAIN_AFFECT_CONFIG; if (hotpluggable) flags |= VIR_DOMAIN_VCPU_HOTPLUGGABLE; diff --git a/tools/virsh.pod b/tools/virsh.pod index e7c513b..bc8b539 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2501,10 +2501,11 @@ flag. Vcpus added to live domains supporting vcpu unplug are automatically marked as hotpluggable. The I<--maximum> flag controls the maximum number of virtual cpus that can -be hot-plugged the next time the domain is booted. As such, it must only be -used with the I<--config> flag, and not with the I<--live> or the I<--current> -flag. Note that it may not be possible to change the maximum vcpu count if -the processor topology is specified for the guest. +be hot-plugged the next time the domain is booted. As such, it implies +I<--config> be set. Also it can be used with the I<--config> flag, +but not with the I<--live> or the I<--current> flag. Note that it may not +be possible to change the maximum vcpu count if the processor topology +is specified for the guest. =item B<setvcpu> I<domain> I<vcpulist> [I<--enable>] | [I<--disable>] [[I<--live>] [I<--config>] | [I<--current>]] -- 2.7.4

3 4

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak @cpus
by Michal Privoznik 29 May '17

29 May '17

The @cpus is allocated by virFileReadValueBitmap() but never freed: ==21274== 40 (32 direct, 8 indirect) bytes in 1 blocks are definitely lost in loss record 808 of 1,004 ==21274== at 0x4C2E080: calloc (vg_replace_malloc.c:711) ==21274== by 0x54BA561: virAlloc (viralloc.c:144) ==21274== by 0x54BC604: virBitmapNewEmpty (virbitmap.c:126) ==21274== by 0x54BD059: virBitmapParseUnlimited (virbitmap.c:570) ==21274== by 0x54EECE9: virFileReadValueBitmap (virfile.c:4113) ==21274== by 0x5563132: virCapabilitiesInitCaches (capabilities.c:1548) ==21274== by 0x2BB86E59: virQEMUCapsInit (qemu_capabilities.c:1132) ==21274== by 0x2BBEC067: virQEMUDriverCreateCapabilities (qemu_conf.c:928) ==21274== by 0x2BC3DEAA: qemuStateInitialize (qemu_driver.c:845) ==21274== by 0x5625AAC: virStateInitialize (libvirt.c:770) ==21274== by 0x124519: daemonRunStateInit (libvirtd.c:881) ==21274== by 0x554C927: virThreadHelper (virthread.c:206) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a35..43b15761a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1643,5 +1643,6 @@ virCapabilitiesInitCaches(virCapsPtr caps) VIR_FREE(path); VIR_DIR_CLOSE(dirp); virCapsHostCacheBankFree(bank); + virBitmapFree(cpus); return ret; } -- 2.13.0

2 1

[libvirt] [PATCH] fix memory leak in daemonUnixSocketPaths and qemuMonitorJSONAttachCharDevCommand
by Yi Wang 29 May '17

29 May '17

From: Xi Xu <xu.xi8(a)zte.com.cn> The @rundir is allocated in virGetUserRuntimeDirectory, may lost when virFileMakePath failed. The tlsalias allocated in qemuAliasTLSObjFromSrcAlias may lost when append string to json. --- daemon/libvirtd.c | 1 + src/qemu/qemu_monitor_json.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 891238b..2447d78 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -288,6 +288,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); + VIR_FREE(rundir); goto error; } umask(old_umask); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0837290..66f3f87 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6481,6 +6481,8 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto error; + + VIR_FREE(tlsalias); } break; -- 1.8.3.1

2 1

[libvirt] [PATCH] util: fix virfcp build on non-Linux
by Roman Bogorodskiy 29 May '17

29 May '17

- Include virerror.h for virReportSystemError - Rename stub functions to match original function names --- Pushed under the build breaker rule. src/util/virfcp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 3c7fab917..7660ba720 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -26,6 +26,7 @@ #include "viralloc.h" #include "virfile.h" +#include "virerror.h" #include "virstring.h" #include "virfcp.h" @@ -80,14 +81,14 @@ virFCReadRportValue(const char *rport, #else bool -virSysfsIsCapableFCRport(const char *rport ATTRIBUTE_UNUSED) +virFCIsCapableRport(const char *rport ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); return false; } int -virSysfsReadFCRport(const char *rport ATTRIBUTE_UNUSED, +virFCReadRportValue(const char *rport ATTRIBUTE_UNUSED, const char *entry ATTRIBUTE_UNUSED, char **result ATTRIBUTE_UNUSED) { -- 2.13.0

3 2

[libvirt] [PATCH] CI: show the log in case of failure
by claudioandre.br＠gmail.com 27 May '17

27 May '17

From: Claudio André <claudioandre.br(a)gmail.com> Disclosure the content of the 'test-suite.log' file (if available) in case of failures inside Travis-CI. This is needed to understand what happened and to provide hints about the proper fix (if applicable). --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 266ffff..5a3e765 100644 --- a/.travis.yml +++ b/.travis.yml @@ -83,3 +83,11 @@ matrix: # many unit tests fail & so does syntax-check, so skip for now # one day we must fix it though.... - make -j3 + +after_failure: + - echo '============================================================================' + - 'if [ -f $(pwd)/tests/test-suite.log ]; then + cat $(pwd)/tests/test-suite.log; + else + echo "=== NO LOG FILE FOUND ==="; + fi' -- 2.11.0

3 7

[libvirt] [libvirt-php PATCH] use proper arginfo for libvirt_domain_create
by Dawid Zamirski 27 May '17

27 May '17

this function takes only resource argument. --- src/libvirt-php.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index bfc9b7d..99d6397 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -629,7 +629,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_lookup_by_uuid, arginfo_libvirt_conn_uuid) PHP_FE(libvirt_domain_lookup_by_uuid_string, arginfo_libvirt_conn_uuid) PHP_FE(libvirt_domain_destroy, arginfo_libvirt_conn) - PHP_FE(libvirt_domain_create, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_domain_create, arginfo_libvirt_conn) PHP_FE(libvirt_domain_resume, arginfo_libvirt_conn) PHP_FE(libvirt_domain_core_dump, arginfo_libvirt_domain_core_dump) PHP_FE(libvirt_domain_shutdown, arginfo_libvirt_conn) -- 2.13.0

2 1

[libvirt] libvirt-php changing release strategy
by Michal Privoznik 27 May '17

27 May '17

Dear list, as you've noticed, libvirt changed the versioning strategy and slowly other subprojects are adapting it too. I mean, the version number is changed right after the release and not just before it. It makes sense and therefore I'm letting you know that libvirt-php is adapting this scheme too: commit 3bdbd3175d159a96731bbb95bfd4bbeff7952f16 Author: Michal Privoznik <mprivozn(a)redhat.com> AuthorDate: Sat May 27 11:25:47 2017 +0200 Commit: Michal Privoznik <mprivozn(a)redhat.com> CommitDate: Sat May 27 11:25:47 2017 +0200 Post-release version bump to 0.5.4 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Michal

1 0

[libvirt] [PATCH 0/7] extend node_device for CCW and fc_remote_port
by Bjoern Walk 26 May '17

26 May '17

Let's introduce two new capabilities to the node_device driver and fix two smaller issues on the way. The first is for CCW devices, most common on the S390 architecture. We expose the relevant cssid, ssid and devno values. The second is for fibre channel-backed SCSI devices, where we introduce the fc_remote_port subcapability for SCSI targets. Here we expose the relevant rport name as well as the port_name (WWPN). Bjoern Walk (5): node_device: detect CCW devices virsh: nodedev: ability to filter CCW capabilities util: helper functions for fibre channel devices node_device: introduce new capability FC_RPORT docs: update news.xml Marc Hartmayer (2): node_device: Use the iterator variable node_device: Unlock obj in case of an error too docs/formatnode.html.in | 12 ++ docs/news.xml | 11 ++ docs/schemas/basictypes.rng | 31 +++++ docs/schemas/domaincommon.rng | 30 ----- docs/schemas/nodedev.rng | 36 ++++++ include/libvirt/libvirt-nodedev.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/node_device_conf.c | 150 +++++++++++++++++++++- src/conf/node_device_conf.h | 21 ++- src/conf/virnodedeviceobj.c | 3 +- src/libvirt-nodedev.c | 1 + src/libvirt_private.syms | 5 + src/node_device/node_device_driver.c | 16 ++- src/node_device/node_device_linux_sysfs.c | 56 ++++++++ src/node_device/node_device_linux_sysfs.h | 2 + src/node_device/node_device_udev.c | 39 +++++- src/util/virfcp.c | 96 ++++++++++++++ src/util/virfcp.h | 32 +++++ tests/nodedevschemadata/ccw_0_0_10000-invalid.xml | 10 ++ tests/nodedevschemadata/ccw_0_0_ffff.xml | 10 ++ tests/nodedevschemadata/scsi_target1_0_0.xml | 12 ++ tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 3 + tools/virsh.pod | 2 +- 25 files changed, 539 insertions(+), 44 deletions(-) create mode 100644 src/util/virfcp.c create mode 100644 src/util/virfcp.h create mode 100644 tests/nodedevschemadata/ccw_0_0_10000-invalid.xml create mode 100644 tests/nodedevschemadata/ccw_0_0_ffff.xml create mode 100644 tests/nodedevschemadata/scsi_target1_0_0.xml -- 2.11.2

5 27

[libvirt] [PATCH v2 00/11] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 26 May '17

26 May '17

v1: https://www.redhat.com/archives/libvir-list/2017-April/msg01225.html I've been informed via internal IRC that the patches 9, 10, and 11 don't apply cleanly - so here's a clean series. John John Ferlan (11): interface: Consistently use 'obj' for a virInterfaceObjPtr interface: Remove some unnecessary goto's for Interface tests interface: Use virInterfaceDefPtr rather than deref from virInterfaceObjPtr interface: Make _virInterfaceObj struct private interface: Make _virInterfaceObjList struct private interface: Rename some virInterfaceObj* API's interface: Clean up virInterfaceObjListFindByMACString interface: Introduce virInterfaceObjNew interface: Introduce virInterfaceObjEndAPI interface: Convert virInterfaceObj to use virObjectLockable interface: Alter virInterfaceObjListAssignDef @def param po/POTFILES.in | 1 - src/conf/virinterfaceobj.c | 277 +++++++++++++++++++++++++++++---------------- src/conf/virinterfaceobj.h | 72 ++++++------ src/libvirt_private.syms | 19 ++-- src/test/test_driver.c | 145 ++++++++++++------------ 5 files changed, 295 insertions(+), 219 deletions(-) -- 2.9.4

2 17

[libvirt] [PATCH go-xml] add support for disk cache and io add support for controller model extend DomainAddress struct for PCI address and target&unit
by zhenwei.pi 26 May '17

26 May '17

--- domain.go | 13 +++++++++++-- domain_test.go | 31 ++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/domain.go b/domain.go index 848835a..1382cd0 100644 --- a/domain.go +++ b/domain.go @@ -30,8 +30,10 @@ import ( ) type DomainController struct { - Type string `xml:"type,attr"` - Index string `xml:"index,attr"` + Type string `xml:"type,attr"` + Index string `xml:"index,attr"` + Model string `xml:"model,attr,omitempty"` + Address *DomainAddress `xml:"address"` } type DomainDiskSecret struct { @@ -77,6 +79,8 @@ type DomainDisk struct { Type string `xml:"type,attr"` Device string `xml:"device,attr"` Snapshot string `xml:"snapshot,attr,omitempty"` + Cache string `xml:"cache,attr,omitempty"` + Io string `xml:"io,attr,omitempty"` Driver *DomainDiskDriver `xml:"driver"` Auth *DomainDiskAuth `xml:"auth"` Source *DomainDiskSource `xml:"source"` @@ -196,8 +200,13 @@ type DomainAlias struct { type DomainAddress struct { Type string `xml:"type,attr"` Controller *uint `xml:"controller,attr"` + Domain *uint `xml:"domain,attr"` Bus *uint `xml:"bus,attr"` Port *uint `xml:"port,attr"` + Slot *uint `xml:"slot,attr"` + Function *uint `xml:"function,attr"` + Target *uint `xml:"target,attr"` + Unit *uint `xml:"unit,attr"` } type DomainChardev struct { diff --git a/domain_test.go b/domain_test.go index 265cf80..fd6914e 100644 --- a/domain_test.go +++ b/domain_test.go @@ -130,10 +130,12 @@ var domainTestData = []struct { }, }, DomainDisk{ - Type: "volume", + Type: "volume", Device: "cdrom", + Cache: "none", + Io: "native", Source: &DomainDiskSource{ - Pool: "default", + Pool: "default", Volume: "myvolume", }, Target: &DomainDiskTarget{ @@ -174,7 +176,7 @@ var domainTestData = []struct { ` </source>`, ` <target dev="vdd" bus="virtio"></target>`, ` </disk>`, - ` <disk type="volume" device="cdrom">`, + ` <disk type="volume" device="cdrom" cache="none" io="native">`, ` <source pool="default" volume="myvolume"></source>`, ` <target dev="vde" bus="virtio"></target>`, ` </disk>`, @@ -820,6 +822,29 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Controllers: []DomainController{ + DomainController{ + Type: "usb", + Index: "0", + Model: "piix3-uhci", + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <controller type="usb" index="0" model="piix3-uhci"></controller>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.7.4

2 1

[libvirt] Double deference error in libvirt_virConnectDomainEventRegisterAny
by fangying 26 May '17

26 May '17

Hi, We'd like to report a double dereference error of 'pyobj_cbData' in libvirt_virConnectDomainEventRegisterAny. The bug can be triggered in the situation where 'domainEventRegisterAny' (the python interface of libvirt_virConnectDomainEventRegisterAny) is invoked and network connection is coincidently lost (likely libvirtd restarted) at same time. We get the following stacktrace when the bug is hit. Program terminated with signal 6, Aborted. #0 0x00007fc45cba15d7 in raise () from /usr/lib64/libc.so.6 #1 0x00007fc45cba2cc8 in abort () from /usr/lib64/libc.so.6 #2 0x00007fc45cbe12f7 in __libc_message () from /usr/lib64/libc.so.6 #3 0x00007fc45cbe86d3 in _int_free () from /usr/lib64/libc.so.6 #4 0x00007fc45d8d292c in PyDict_Fini () from /usr/lib64/libpython2.7.so.1.0 #5 0x00007fc45d94f46a in Py_Finalize () from /usr/lib64/libpython2.7.so.1.0 #6 0x00007fc45d960735 in Py_Main () from /usr/lib64/libpython2.7.so.1.0 #7 0x00007fc45cb8daf5 in __libc_start_main () from /usr/lib64/libc.so.6 #8 0x0000000000400721 in _start () The double dereference of 'pyobj_cbData' is triggered in the following way: (1) libvirt_virConnectDomainEventRegisterAny is invoked. (2) the event is successfully added to the event callback list (virDomainEventStateRegisterClient in remoteConnectDomainEventRegisterAny returns 1 which means ok). (3) when function remoteConnectDomainEventRegisterAny is hit, network connection disconnected coincidently (or libvirtd is restarted) in the context of function 'call' then the connection is lost and the function 'call' failed, the branch virObjectEventStateDeregisterID is therefore taken. (4) 'pyobj_conn' is dereferenced the 1st time in libvirt_virConnectDomainEventFreeFunc. (5) 'pyobj_cbData' (refered to pyobj_conn) is dereferenced the 2nd time in libvirt_virConnectDomainEventRegisterAny. (6) the double free error is triggered. static void libvirt_virConnectDomainEventFreeFunc(void *opaque) { PyObject *pyobj_conn = (PyObject*)opaque; LIBVIRT_ENSURE_THREAD_STATE; Py_DECREF(pyobj_conn); /* 1st dereference comes here */ LIBVIRT_RELEASE_THREAD_STATE; } static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { ... Py_INCREF(pyobj_cbData); LIBVIRT_BEGIN_ALLOW_THREADS; ret = virConnectDomainEventRegisterAny(conn, dom, eventID, cb, pyobj_cbData, libvirt_virConnectDomainEventFreeFunc); if (ret < 0) { Py_DECREF(pyobj_cbData); /* 2nd dereference comes here */ } } Currently we cannot find a good solution to fix this problem, could anyone guide us to fix it ?

2 1

[libvirt] [PATCH v2] rpc: Allow up to 256K records to be returned per domain from virConnectGetAllDomainStats.
by Richard W.M. Jones 26 May '17

26 May '17

The number of records that virConnectGetAllDomainStats can return per domain is currently limited to 4096. This is quite low -- for example, a single guest with ~320 disks will hit this limit. This increases the limit to make it much larger. Note that VIR_NET_MESSAGE_MAX still protects the total message size in the case where there are many domains and many disks per domain. I tested this using a guest with 500 disks with no issues. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1440683 --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 25e62a181..aa0aa38b6 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -233,7 +233,7 @@ const REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX = 256; const REMOTE_NETWORK_DHCP_LEASES_MAX = 65536; /* Upper limit on count of parameters returned via bulk stats API */ -const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 4096; +const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 262144; /* Upper limit of message size for tunable event. */ const REMOTE_DOMAIN_EVENT_TUNABLE_MAX = 2048; -- 2.13.0

2 1

[libvirt] [PATCH] rpc: Allow up to 256K records to be returned from virConnectGetAllDomainStats.
by Richard W.M. Jones 26 May '17

26 May '17

In commit 89a706681cb3a4aa003d920db3163b809cfbc9ca, the returned array of stats is limited to REMOTE_DOMAIN_LIST_MAX entries (4096). As well as being far too low -- this breaks if a single guest is added with 320 disks -- it also seems as if use of REMOTE_DOMAIN_LIST_MAX was a mistake, and it should be using REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX instead. However REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX is also too low (also 4096), so this patch also increases the limit to something more sensible, allowing us to cope with lots of stats from lots of domains in future. (This limit could be increased further quite easily since each stats record takes about 32 bytes, and the maximum message size is currently 32 MB, so we could increase the limit by another factor of 4 without touching the maximum message size). I tested this using a guest with 320, 500 and 1000 disks with no issues. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1440683 --- src/remote/remote_protocol.x | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 25e62a181..142508713 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -233,7 +233,7 @@ const REMOTE_DOMAIN_FSFREEZE_MOUNTPOINTS_MAX = 256; const REMOTE_NETWORK_DHCP_LEASES_MAX = 65536; /* Upper limit on count of parameters returned via bulk stats API */ -const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 4096; +const REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX = 262144; /* Upper limit of message size for tunable event. */ const REMOTE_DOMAIN_EVENT_TUNABLE_MAX = 2048; @@ -3264,7 +3264,7 @@ struct remote_domain_event_callback_agent_lifecycle_msg { }; struct remote_connect_get_all_domain_stats_ret { - remote_domain_stats_record retStats<REMOTE_DOMAIN_LIST_MAX>; + remote_domain_stats_record retStats<REMOTE_CONNECT_GET_ALL_DOMAIN_STATS_MAX>; }; struct remote_domain_fsinfo { -- 2.13.0

3 2

[libvirt] [PATCH] rpc: Double buffer size instead of quadrupling buffer size.
by Richard W.M. Jones 26 May '17

26 May '17

When increasing the buffer size up to VIR_NET_MESSAGE_MAX, we currently quadruple it each time. This unfortunately means that we cannot allow certain buffer sizes -- for example the current VIR_NET_MESSAGE_MAX == 33554432 can never be "hit" since ‘newlen’ jumps from 16MB to 64MB. Instead of quadrupling, double it each time. Thanks: Daniel Berrange. --- src/rpc/virnetmessage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index c3a2e595c..5908b074a 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -358,7 +358,8 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, /* Try to encode the payload. If the buffer is too small increase it. */ while (!(*filter)(&xdr, data, 0)) { - unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4; + unsigned int newlen = msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX; + newlen *= 2; if (newlen > VIR_NET_MESSAGE_MAX) { virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); -- 2.13.0

2 1

[libvirt] [PATCH] node: Don't return invalid pointers
by Peter Krempa 26 May '17

26 May '17

Commit 4337bc57be introduced code that would in certain error paths unref the last reference of a pointer, but return it. Clear the pointers before returning them --- src/node_device/node_device_driver.c | 8 ++++++-- src/test/test_driver.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index ba3da6288..3a6eeaaae 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -241,8 +241,10 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) goto cleanup; if ((ret = virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) { virObjectUnref(ret); + ret = NULL; + } } cleanup: @@ -285,8 +287,10 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, goto out; if ((dev = virGetNodeDevice(conn, obj->def->name))) { - if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) + if (VIR_STRDUP(dev->parent, obj->def->parent) < 0) { virObjectUnref(dev); + dev = NULL; + } } virNodeDeviceObjUnlock(obj); goto out; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2db3f7ddf..9330d9ea6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5331,8 +5331,10 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) goto cleanup; if ((ret = virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) + if (VIR_STRDUP(ret->parent, obj->def->parent) < 0) { virObjectUnref(ret); + ret = NULL; + } } cleanup: -- 2.12.2

2 1

[libvirt] [PATCH] node_device: fix memory leak in nodeDeviceSysfsGetSCSIHostCaps
by Yi Wang 26 May '17

26 May '17

The @tmp is allocated in virVHBAGetConfig in virVHBAIsVportCapable condition, it will lost when virVHBAGetConfig called again. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/node_device/node_device_linux_sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 1b7aa94..a9c7c9c 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -95,7 +95,8 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host) goto cleanup; } - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + VIR_FREE(tmp); + if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, "npiv_vports_inuse"))) { VIR_WARN("Failed to read npiv_vports_inuse for host%d", scsi_host->host); -- 1.8.3.1

2 1

[libvirt] [PATCH] util: fix memory leak in virSocketAddrFormatFull
by Yi Wang 26 May '17

26 May '17

The @ipv6_host allocated in virAsprintf may be lost when virAsprintf addrstr failed. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/util/virsocketaddr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 9dffbc7..95b5274 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -417,8 +417,10 @@ virSocketAddrFormatFull(const virSocketAddr *addr, if (virAsprintf(&addrstr, "%s%s%s", ipv6_host ? ipv6_host : host, - separator ? separator : ":", port) == -1) + separator ? separator : ":", port) == -1) { + VIR_FREE(ipv6_host); goto error; + } VIR_FREE(ipv6_host); } else { -- 1.8.3.1

2 1

[libvirt] [PATCH 2/2] lxc: fixing wrong VIR_FREE after a return statement.
by Julio Faracco 26 May '17

26 May '17

There is a VIR_FREE after a return statement. That code section is never executed and for this reason the "tty" variable is not being freed. This commit rearrange the logic. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a936342..af02b54 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1143,8 +1143,8 @@ static int lxcContainerSetupDevices(char **ttyPaths, size_t nttyPaths) return -1; if (virFileBindMountDevice(ttyPaths[i], tty) < 0) { - return -1; VIR_FREE(tty); + return -1; } VIR_FREE(tty); -- 1.8.3.1

2 1

[libvirt] [PATCH 1/2] configure: fixing acl missing variable.
by Julio Faracco 26 May '17

26 May '17

This commit fixes an acl missing variable. The virt-acl.m4 inside the macro directory does not contain the variable 'with_acl'. So, it is being set as an empty string "with_acl=''". This is causing a missing option during the configuration, even if you have acl libs installed. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- m4/virt-acl.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/virt-acl.m4 b/m4/virt-acl.m4 index f7d1c6d..d548729 100644 --- a/m4/virt-acl.m4 +++ b/m4/virt-acl.m4 @@ -23,8 +23,10 @@ AC_DEFUN([LIBVIRT_CHECK_ACL], [ ACL_CFLAGS="" ACL_LIBS="" + with_acl=no if test "x$ac_cv_header_sys_acl_h:x$with_linux" = "xyes:xyes"; then ACL_LIBS="-lacl" + with_acl=yes fi AC_SUBST([ACL_CFLAGS]) AC_SUBST([ACL_LIBS]) -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/3] Check for <memoryBacking/>
by Michal Privoznik 26 May '17

26 May '17

Technically this is v2 of: https://www.redhat.com/archives/libvir-list/2017-May/msg00626.html diff to v1: - Patches split and reworked as suggested by Peter in the review Michal Privoznik (3): virDomainDefCheckABIStabilityFlags: move memtune checks into a separate function virDomainXMLOption: Introduce virDomainABIStabilityDomain virQEMUDriverDomainABIStability: Check for memoryBacking src/conf/domain_conf.c | 93 ++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 16 +++++++- src/conf/snapshot_conf.c | 5 ++- src/conf/snapshot_conf.h | 3 +- src/libvirt_private.syms | 6 +++ src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 4 +- src/lxc/lxc_conf.c | 3 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 41 +++++++++++++++++++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 7 ++-- src/test/test_driver.c | 8 ++-- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 2 +- src/xen/xen_driver.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/sexpr2xmltest.c | 2 +- tests/testutils.c | 4 +- tests/vmx2xmltest.c | 2 +- tests/xlconfigtest.c | 2 +- tests/xmconfigtest.c | 2 +- tests/xml2sexprtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 31 files changed, 167 insertions(+), 63 deletions(-) -- 2.13.0

3 8

[libvirt] Remotable Libvirt
by Peter Volpe 25 May '17

25 May '17

Hi Everyone, We are working towards building on the virtualization management functionality in cockpit (http://cockpit-project.org/) and wanted to get some feedback on the best way to integrate with libvirt. As a quick overview, cockpit aims to talk to existing remotable system APIs. Usually these API’s take the form of dbus, REST or executable commands. The majority of cockpit is implemented in javascript. There is no cockpit backend that knows how to change a hostname for example. The cockpit backend knows how to handle a dbus payload. The javascript running in the users browser knows how to use the systemd dbus API at org.freedesktop.hostname1 to manage the system hostname. Right now some of the basics have been implemented by spawning commands on the system. This isn't ideal because it involves parsing / screen scraping output and doesn't support receiving events so we have to poll (ei run the command again) to keep the UI up to date. As far as I know libvirt doesn't currently have a remoteable API. It does have a daemon that communicates with clients via a XDR RPC. (https://libvirt.org/internals/rpc.html) However from what I'm hearing the RPC is considered an internal implementation and shouldn't be used by external applications. Is that still the case? Is there any chance of getting talking the daemon directly using the XDR standard for a subset of methods blessed as part of the externally supported API? An alternative is to implement a standards based remotable API, using something like dbus or REST, that can be used by external applications. I imagine that this would be at a bit of a higher level than the current RPC and contain at least some of the logic around the actions it performs rather than being a direct passthrough to the daemon. Of course that is a pretty big undertaking and would, in my opinion, only be worth it if there is broader interest in the community and use cases beyond what cockpit would like to.

1 0

[libvirt] RFE: virsh list improvement (--description and --details)
by Przemysław Sztoch 25 May '17

25 May '17

Hello, 1. Please add —description parameter to virsh list command. It should be similar to —title. It will be very helpful for administrators who like to leave the order and documentation after their work. 2. Please add new columns to virsh list (for —details): a) CPUs b) MaxMem c) Flags: p-persistent, t-transient, a-autostart, m-managed save, s-with snapshot(s) and total sum for column vCPUs and Mem. In my opinion it is very popular use case. It will help you control vCPU and memory overcommiting in very simple and fast way. Put flags on list will prevents many additional commands from being executed. You will get all important information in one place. 3. Please add —domtime parameter to virsh list command. It should show column with domain’s system time similar to virsh domtime domname --pretty. It will be very helpful for fast guest-agent checking for every domain. 4. Please add column Parent and Metadata to virsh snapshot-list. — Przemyslaw Sztoch

5 9

[libvirt] [PATCH 0/8] Multiple cleanups within interfaceobj and interface driver
by John Ferlan 25 May '17

25 May '17

Sensing a theme lately yet? More adjustments in preparation for having virobject code handle the bulk of the object management code. Far less in this series than the other two... The Clone code was a bit unique and required more of a rewrite than a refigure since now we have two allocated lists rather than two static lists. John Ferlan (8): interface: Consistently use 'obj' for a virInterfaceObjPtr interface: Remove some unnecessary goto's for Interface tests interface: Use virInterfaceDefPtr rather than deref from virInterfaceObjPtr interface: Make _virInterfaceObj struct private interface: Make _virInterfaceObjList struct private interface: Rename some virInterfaceObj* API's interface: Clean up virInterfaceObjListFindByMACString interface: Introduce virInterfaceObjNew src/conf/virinterfaceobj.c | 232 +++++++++++++++++++++++++++++---------------- src/conf/virinterfaceobj.h | 65 ++++++------- src/libvirt_private.syms | 15 +-- src/test/test_driver.c | 143 ++++++++++++++-------------- 4 files changed, 262 insertions(+), 193 deletions(-) -- 2.9.3

2 22

Re: [libvirt] [virt-tools-list] Problem with firewalls on Arch Linux
by Cole Robinson 25 May '17

25 May '17

On 05/25/2017 06:08 AM, Derek Richline wrote: > Hi all: > > I noticed that Virt Manager will not start the network "default" unless > it detects a running firewalld. Arch Linux only ships with iptables by > default. Can Virt-Manager be patched to not check as aggressively for a > firewall (or just issue a warning)? > virt-manager doesn't have any specific firewalld checking so this is likely coming from libvirt. I don't know anything about arch packaging, but if the libvirt package doesn't pull in firewalld then maybe libvirt should be built --without-firewalld What libvirt version is this? And what's the exact error message you are seeing? - Cole

2 1

[libvirt] [PATCH] qemu: Fix memory leak in qemuDomainUpdateMemoryDeviceInfo
by Yi Wang 25 May '17

25 May '17

The @meminfo allocated in qemuMonitorGetMemoryDeviceInfo may be lost when exit monitor failed. Luckily we can free it according to rc. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8dc748..c34ec5a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5767,8 +5767,11 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver, rc = qemuMonitorGetMemoryDeviceInfo(priv->mon, &meminfo); - if (qemuDomainObjExitMonitor(driver, vm) < 0) + if (qemuDomainObjExitMonitor(driver, vm) < 0) { + if (0 == rc) + virHashFree(meminfo); return -1; + } /* if qemu doesn't support the info request, just carry on */ if (rc == -2) -- 1.8.3.1

3 2

[libvirt] [PATCH v2 RFC 0/4] qemu: replace nested job with interruptible async job state
by Nikolay Shirokovskiy 25 May '17

25 May '17

This is the next version of RFC [1] 'drop nested job concept'. Actually it is quite different from the first. Patches that accomodate callers to use functions to enter/exit monitor with without driver and asyncJob arguments are moved out of this series. I guess this can be done as soon as this series is upstream. Most of approach details are in the first patch. Pros: - better async job and concurrent regular job isolation - more straightforward implementation - more simple to use - no need to pass async job argument down the stack - safer to use - no warnings to be fixed if function is started to be used from asynchronous job context. TODO: - replace qemuDomainObjEnterMonitorAsync with qemuDomainObjEnterMonitor - accomodate callers to qemuDomainObjExitMonitor became returning void - remove passing driver and asyncJob down the stack - reflect changes in THREADS.txt [1] https://www.redhat.com/archives/libvir-list/2016-November/msg01357.html Nikolay Shirokovskiy (4): qemu: replace nested job with interruptible async job state qemu: remove liveness check from qemuDomainObjExitMonitor qemu: remove nesting job usage from qemuProcessStop qemu: remove the rest of nested job parts src/conf/domain_conf.c | 19 ---- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 253 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_domain.h | 29 ++++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 70 +++++++------ src/qemu/qemu_process.c | 31 ++---- 8 files changed, 225 insertions(+), 181 deletions(-) -- 1.8.3.1

1 5

[libvirt] [PATCH] qemu: Use correct variable in qemuDomainSetBlockIoTune
by Peter Krempa 25 May '17

25 May '17

'param' contains the correct element from 'params'. If the group name would not be the first element libvirtd would crash. Introduced in c53bd25b13. --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd513ff9f..67f54282a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17443,7 +17443,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, /* NB: Cannot use macro since this is a value.s not a value.ul */ if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) { - if (VIR_STRDUP(info.group_name, params->value.s) < 0) + if (VIR_STRDUP(info.group_name, param->value.s) < 0) goto endjob; set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME; if (virTypedParamsAddString(&eventParams, &eventNparams, -- 2.12.2

3 3

[libvirt] [PATCH v2] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

On executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue by reporting the current number of CPUs present. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/util/virhostcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index aa9cfeac2..6d7e8b4f4 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1093,7 +1093,7 @@ virHostCPUGetMap(unsigned char **cpumap, if (online) *online = virBitmapCountBits(cpus); - ret = virBitmapSize(cpus); + ret = virHostCPUParseCountLinux(); cleanup: if (ret < 0 && cpumap) -- 2.11.0

3 3

Re: [libvirt] [PATCH v2] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

Yes I did, limited to my knowledge. On Thu, May 25, 2017 at 2:08 PM, Nitesh Konkar < niteshkonkar.libvirt(a)gmail.com> wrote: > Yes I did. > > On Thu, May 25, 2017 at 2:07 PM, Peter Krempa <pkrempa(a)redhat.com> wrote: > >> On Thu, May 25, 2017 at 14:04:16 +0530, Nitesh Konkar wrote: >> > On executing the virsh nodecpumap command, the number >> > of CPUs present was shown as (last cpu online id + 1). This >> > patch fixes the issue by reporting the current number of >> > CPUs present. >> > >> > Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> >> > --- >> > src/util/virhostcpu.c | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> >> Did you test it? I did not. >> > >

1 0

[libvirt] [PATCH] Regression: Report correct CPUs present on executing virsh nodecpumap
by Nitesh Konkar 25 May '17

25 May '17

Recent changes to virbitmap.c file created a regression where on executing the virsh nodecpumap command, the number of CPUs present was shown as (last cpu online id + 1). This patch fixes the issue. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 ++ src/util/virbitmap.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index f95f30e2f..96c541c9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3303,6 +3303,8 @@ libvirt_nss_la_SOURCES = \ util/viratomic.h \ util/virbitmap.c \ util/virbitmap.h \ + util/virhostcpu.c \ + util/virhostcpu.h \ util/virbuffer.c \ util/virbuffer.h \ util/vircommand.c \ diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index eac63d997..dc427f430 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -37,6 +37,7 @@ #include "count-one-bits.h" #include "virstring.h" #include "virerror.h" +#include "virhostcpu.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -565,9 +566,14 @@ virBitmapParseUnlimited(const char *str) const char *cur = str; char *tmp; size_t i; - int start, last; + int start, last, bitmapSize; + + bitmapSize = virHostCPUGetCount(); + + if (bitmapSize < 0) + return NULL; - if (!(bitmap = virBitmapNewEmpty())) + if (!(bitmap = virBitmapNew(bitmapSize))) return NULL; if (!str) -- 2.11.0

3 4

[libvirt] [PATCH v2] lib: Add note that bulk stats API queries may overrun RPC buffers
by Peter Krempa 25 May '17

25 May '17

Hint that the users should limit the number of VMs queried in the bulk stats API. --- v2: - added a suggestion of the number of queried VMs (valid after bump to 32M message) src/libvirt-domain.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 310b91b37..aef061943 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11315,6 +11315,10 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * VIR_CONNECT_GET_ALL_DOMAINS_STATS_SHUTOFF and/or * VIR_CONNECT_GET_ALL_DOMAINS_STATS_OTHER for all other states. * + * Note that this API is prone to exceeding maximum RPC message size on hosts + * with lots of VMs so it's suggested to use virDomainListGetStats with a + * reasonable list of VMs as the argument. + * * Returns the count of returned statistics structures on success, -1 on error. * The requested data are returned in the @retStats parameter. The returned * array should be freed by the caller. See virDomainStatsRecordListFree. @@ -11386,6 +11390,10 @@ virConnectGetAllDomainStats(virConnectPtr conn, * Note that any of the domain list filtering flags in @flags may be rejected * by this function. * + * Note that this API is prone to exceeding maximum RPC if querying too many VMs + * with lots of statistics. It's suggested to query in batches of 10VMs, which + * should be good enough for VMs with 3000 disks + networks. + * * Returns the count of returned statistics structures on success, -1 on error. * The requested data are returned in the @retStats parameter. The returned * array should be freed by the caller. See virDomainStatsRecordListFree. -- 2.12.2

4 22

[libvirt] [V4 RESEND PATCH] Expose resource control capabilites on cache bank
by Eli Qiao 25 May '17

25 May '17

* This patch amends the cache bank capability as follow: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> <control min='768' unit='KiB' scope='both' max_allocation='4'/> </bank> </cache> For CDP enabled on x86 arch, we will have: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' scope='code' max_allocation='4'/> <control min='768' unit='KiB' scope='data' max_allocation='4'/> </bank> ... * Added a new testdata directory `linux-resctrl-cdp` to test CDP enabled case. * Along with vircaps2xmltest case updated. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- docs/schemas/capability.rng | 20 +++ src/conf/capabilities.c | 138 ++++++++++++++++++++- src/conf/capabilities.h | 12 ++ .../vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus | 1 + .../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 1 + .../resctrl/info/L3CODE/min_cbm_bits | 1 + .../resctrl/info/L3CODE/num_closids | 1 + .../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 1 + .../resctrl/info/L3DATA/min_cbm_bits | 1 + .../resctrl/info/L3DATA/num_closids | 1 + .../linux-resctrl-cdp/resctrl/manualres/cpus | 1 + .../linux-resctrl-cdp/resctrl/manualres/schemata | 2 + .../linux-resctrl-cdp/resctrl/manualres/tasks | 0 .../linux-resctrl-cdp/resctrl/schemata | 2 + .../linux-resctrl-cdp/resctrl/tasks | 0 tests/vircaps2xmldata/linux-resctrl-cdp/system | 1 + .../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 55 ++++++++ tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 +- tests/vircaps2xmltest.c | 10 +- 19 files changed, 252 insertions(+), 4 deletions(-) create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits create mode 100755 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata create mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks create mode 120000 tests/vircaps2xmldata/linux-resctrl-cdp/system create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 26f0aa2..927fc18 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -277,6 +277,26 @@ <attribute name='cpus'> <ref name='cpuset'/> </attribute> + <zeroOrMore> + <element name='control'> + <attribute name='min'> + <ref name='unsignedInt'/> + </attribute> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + <attribute name='scope'> + <choice> + <value>both</value> + <value>code</value> + <value>data</value> + </choice> + </attribute> + <attribute name='max_allocation'> + <ref name='unsignedInt'/> + </attribute> + </element> + </zeroOrMore> </element> </oneOrMore> </element> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index a91a72a..0888605 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -51,6 +51,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define SYSFS_SYSTEM_PATH "/sys/devices/system" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl" VIR_LOG_INIT("conf.capabilities") @@ -872,6 +873,9 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i = 0; + size_t j = 0; + int indent = virBufferGetIndent(buf, false); + virBuffer controlBuf = VIR_BUFFER_INITIALIZER; if (!ncaches) return 0; @@ -893,13 +897,35 @@ virCapabilitiesFormatCaches(virBufferPtr buf, */ virBufferAsprintf(buf, "<bank id='%u' level='%u' type='%s' " - "size='%llu' unit='%s' cpus='%s'/>\n", + "size='%llu' unit='%s' cpus='%s'", bank->id, bank->level, virCacheTypeToString(bank->type), bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + virBufferAdjustIndent(&controlBuf, indent + 4); + for (j = 0; j < bank->ncontrols; j++) { + bool min_kilos = !(bank->controls[j]->min % 1024); + virBufferAsprintf(&controlBuf, + "<control min='%llu' unit='%s' " + "scope='%s' max_allocation='%u'/>\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->scope), + bank->controls[j]->max_allocation); + } + + if (virBufferUse(&controlBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &controlBuf); + virBufferAddLit(buf, "</bank>\n"); + + } else { + virBufferAddLit(buf, "/>\n"); + } + + virBufferFreeAndReset(&controlBuf); VIR_FREE(cpus_str); } @@ -1519,13 +1545,102 @@ virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) { + size_t i; + if (!ptr) return; virBitmapFree(ptr->cpus); + for (i = 0; i < ptr->ncontrols; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } +/* test which TYPE of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret = -1; + char *path = NULL; + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%u", + bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret = 0; + } else { + VIR_FREE(path); + /* for CDP enabled case, CODE and DATA will show together */ + if (virAsprintf(&path, + SYSFS_RESCTRL_PATH "/info/L%uCODE", + bank->level) < 0) + return -1; + if (virFileExists(path)) + ret = 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, + virCacheType scope) +{ + int ret = -1; + char *path = NULL; + char *cbm_mask = NULL; + char *type_upper = NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if ((scope > VIR_CACHE_TYPE_BOTH) + && (virStringToUpper(&type_upper, virCacheTypeToString(scope)) < 0)) + goto cleanup; + + if (virFileReadValueUint(&control->max_allocation, + SYSFS_RESCTRL_PATH "/info/L%u%s/num_closids", + bank->level, + type_upper ? type_upper : "") < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "/info/L%u%s/cbm_mask", + bank->level, + type_upper ? type_upper: "") < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + /* cbm_mask: cache bit mask, it's in hex, eg: fffff */ + control->min = bank->size / (strlen(cbm_mask) * 4); + + control->scope = scope; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrols, + control) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(path); + VIR_FREE(cbm_mask); + VIR_FREE(type_upper); + VIR_FREE(control); + return ret; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1534,6 +1649,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) ssize_t pos = -1; DIR *dirp = NULL; int ret = -1; + int typeret; char *path = NULL; char *type = NULL; struct dirent *ent = NULL; @@ -1609,6 +1725,26 @@ virCapabilitiesInitCaches(virCapsPtr caps) SYSFS_SYSTEM_PATH, pos, ent->d_name) < 0) goto cleanup; + typeret = virCapabilitiesGetCacheControlType(bank); + + if ((bank->level >= cache_min_level) || (typeret >= 0)) { + if (typeret == 0) { + if (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_BOTH) < 0) + goto cleanup; + } else if (typeret == 1) { + if ((virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_CODE) < 0) || + (virCapabilitiesGetCacheControl(bank, + VIR_CACHE_TYPE_DATA) < 0)) + goto cleanup; + } + } else { + virCapsHostCacheBankFree(bank); + bank = NULL; + continue; + } + kernel_type = virCacheKernelTypeFromString(type); if (kernel_type < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index a8cccf7..598016d 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -146,6 +146,16 @@ typedef enum { VIR_CACHE_TYPE_LAST } virCacheType; +VIR_ENUM_DECL(virResctrlCache); + +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* minimum cache control size in B */ + virCacheType scope; /* data, code or both */ + unsigned int max_allocation; /* max number of supported allocations */ +}; + VIR_ENUM_DECL(virCache); typedef struct _virCapsHostCacheBank virCapsHostCacheBank; @@ -156,6 +166,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrols; + virCapsHostCacheControlPtr *controls; }; typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus new file mode 100644 index 0000000..b3a79aa --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus @@ -0,0 +1 @@ +ffffff,ffffffff,ffffffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask new file mode 100755 index 0000000..78031da --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask @@ -0,0 +1 @@ +fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits new file mode 100755 index 0000000..d00491f --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits @@ -0,0 +1 @@ +1 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids new file mode 100755 index 0000000..45a4fb7 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids @@ -0,0 +1 @@ +8 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus new file mode 100644 index 0000000..ede4cc2 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/cpus @@ -0,0 +1 @@ +000000,00000000,00000000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata new file mode 100644 index 0000000..a0ef381 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/schemata @@ -0,0 +1,2 @@ +L3DATA:0=c0000;1=c0000 +L3CODE:0=30000;1=30000 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/manualres/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata new file mode 100644 index 0000000..89dc76b --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/schemata @@ -0,0 +1,2 @@ +L3DATA:0=fffff;1=fffff +L3CODE:0=fffff;1=fffff diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks new file mode 100644 index 0000000..e69de29 diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/system b/tests/vircaps2xmldata/linux-resctrl-cdp/system new file mode 120000 index 0000000..2f3a1d9 --- /dev/null +++ b/tests/vircaps2xmldata/linux-resctrl-cdp/system @@ -0,0 +1 @@ +../linux-resctrl/system/ \ No newline at end of file diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml new file mode 100644 index 0000000..c9f460d --- /dev/null +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml @@ -0,0 +1,55 @@ +<capabilities> + + <host> + <cpu> + <arch>x86_64</arch> + </cpu> + <power_management/> + <migration_features> + <live/> + </migration_features> + <topology> + <cells num='2'> + <cell id='0'> + <memory unit='KiB'>1048576</memory> + <pages unit='KiB' size='4'>2048</pages> + <pages unit='KiB' size='2048'>4096</pages> + <pages unit='KiB' size='1048576'>6144</pages> + <cpus num='6'> + <cpu id='0' socket_id='0' core_id='0' siblings='0'/> + <cpu id='1' socket_id='0' core_id='1' siblings='1'/> + <cpu id='2' socket_id='0' core_id='2' siblings='2'/> + <cpu id='3' socket_id='0' core_id='3' siblings='3'/> + <cpu id='4' socket_id='0' core_id='4' siblings='4'/> + <cpu id='5' socket_id='0' core_id='5' siblings='5'/> + </cpus> + </cell> + <cell id='1'> + <memory unit='KiB'>2097152</memory> + <pages unit='KiB' size='4'>4096</pages> + <pages unit='KiB' size='2048'>6144</pages> + <pages unit='KiB' size='1048576'>8192</pages> + <cpus num='6'> + <cpu id='6' socket_id='1' core_id='0' siblings='6'/> + <cpu id='7' socket_id='1' core_id='1' siblings='7'/> + <cpu id='8' socket_id='1' core_id='2' siblings='8'/> + <cpu id='9' socket_id='1' core_id='3' siblings='9'/> + <cpu id='10' socket_id='1' core_id='4' siblings='10'/> + <cpu id='11' socket_id='1' core_id='5' siblings='11'/> + </cpus> + </cell> + </cells> + </topology> + <cache> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='code' max_allocation='8'/> + <control min='768' unit='KiB' scope='data' max_allocation='8'/> + </bank> + </cache> + </host> + +</capabilities> diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index 6677791..04a5eb8 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -41,8 +41,12 @@ </cells> </topology> <cache> - <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'/> - <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'/> + <bank id='0' level='3' type='both' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> + <bank id='1' level='3' type='both' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' scope='both' max_allocation='4'/> + </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 137598e..c5887af 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML = NULL; char *path = NULL; char *dir = NULL; + char *resctrl = NULL; int ret = -1; /* @@ -58,7 +59,12 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; - virFileWrapperAddPrefix("/sys/devices/system", dir); + if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + +virFileWrapperAddPrefix("/sys/devices/system", dir); +virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); if (!caps) @@ -84,6 +90,7 @@ test_virCapabilities(const void *opaque) cleanup: VIR_FREE(dir); + VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); @@ -112,6 +119,7 @@ mymain(void) DO_TEST("caches", VIR_ARCH_X86_64); DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); return ret; } -- 1.9.1

1 0

[libvirt] [PATCH 0/2] Fix issue with attempting to use polkit
by John Ferlan 25 May '17

25 May '17

The "issue" is when using a remote URI and authn when attempting to connect to the local system when a local URI and usage of pkttyagent was "expected" for local authn. The current bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1374126 which was "forked off" from: https://bugzilla.redhat.com/show_bug.cgi?id=986365 which added the support for pkttyagent processing for "local" authn when the GUI option wasn't available (e.g. when ssh@localhost, run virsh) in order to perform the authn of the user. This is one of those "either" patch 1 or patch 2 will fix the problem, but I really couldn't decide which I liked better. I'm leaning towards the second one only because of the one authn failure; however, I'm not sure I like the escape path comparison to ":///". With only the first patch one would get two challenge/responses before failure, e.g.: $ virsh -c qemu+ssh://someuser@localhost/system list --all someuser@localhost's password: someuser@localhost's password: error: failed to connect to the hypervisor error: authentication unavailable: no polkit agent available to authenticate action 'org.libvirt.unix.manage' $ With the second patch one would get one challenge/reponse before failure e.g.: $ virsh -c qemu+ssh://someuser@localhost/system list --all someuser@localhost's password: error: failed to connect to the hypervisor error: authentication unavailable: no polkit agent available to authenticate action 'org.libvirt.unix.manage' $ Going with #2 restores essentially older (e.g. 1.3.4) processing when the pkttyagent processing loop didn't exist. The challenge/response in either case comes from ssh and is successful; however, code in remoteDispatchAuthList doesn't let a non root user to take this URI option for a local authn/authz because the callerUid is not 0 (root). Although, I suppose it would be possible to check whether the @callerUid was authorized (e.g. part of some group), but that I think "outside" the scope of what the bz is reporting, so I didn't take that route. The reality is the bug is mostly a problem for non UI type processing where providing that ctrl-c to quit isn't as likely/possible. John Ferlan (2): virsh: Track when create pkttyagent virsh: Don't attempt polkit processing for non local authn/authz tools/virsh.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.9.3

2 8

[libvirt] [PATCH] usb: keep leading zeros of vendor/product id in USB device
by Chen Hanxiao 24 May '17

24 May '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Some vendor id or product id may have leading zeros. We should show them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virusb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virusb.c b/src/util/virusb.c index 8cd2f57..6359235 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -221,7 +221,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x", + VIR_DEBUG("Did not find USB device %04x:%04x", vendor, product); if (devices) *devices = NULL; @@ -229,7 +229,7 @@ virUSBDeviceFindByVendor(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x"), vendor, product); + _("Did not find USB device %04x:%04x"), vendor, product); return -1; } @@ -300,7 +300,7 @@ virUSBDeviceFind(unsigned int vendor, if (list->count == 0) { virObjectUnref(list); if (!mandatory) { - VIR_DEBUG("Did not find USB device %x:%x bus:%u device:%u", + VIR_DEBUG("Did not find USB device %04x:%04x bus:%u device:%u", vendor, product, bus, devno); if (usb) *usb = NULL; @@ -308,7 +308,7 @@ virUSBDeviceFind(unsigned int vendor, } virReportError(VIR_ERR_INTERNAL_ERROR, - _("Did not find USB device %x:%x bus:%u device:%u"), + _("Did not find USB device %04x:%04x bus:%u device:%u"), vendor, product, bus, devno); return -1; } -- 2.7.4

2 2

[libvirt] [PATCH 00/13] Make the virNodeDeviceObjPtr private
by John Ferlan 24 May '17

24 May '17

All part of the effort I have to have a common object model. This series is node device test, driver, and virnodedevobj related. There's also a couple of bug fixes at the beginning of the series from things I have found during this effort. There's still a few more patches in local branches to make the virNodeDeviceObjListPtr private as well, but those have some merge needs with other patches currently on list elsewhere, so I'll hold onto them for now. John Ferlan (13): test: Adjust cleanup/error paths for nodedev test APIs nodedev: Fix locking in virNodeDeviceObjRemove nodedev: Need to check for vport capable scsi_host for vHBA searches nodedev: Move node_device_linux_sysfs from node_driver to conf nodedev: Use common naming for virnodedeviceobj nodedev: Cleanup driver code and prototypes nodedev: Alter param to nodeDeviceUpdateDriverName nodedev: Alter param to nodeDeviceUpdateCaps nodedev: Create helper for finding by name in driver nodedev: Use consistent names for driver variables nodedev: Introduce virNodeDeviceObjGetDef nodedev: Remove privateData from virNodeDeviceObj nodedev: Introduce virNodeDeviceObjNew src/Makefile.am | 8 +- src/conf/node_device_conf.h | 2 - .../node_device_linux_sysfs.c | 24 +- .../node_device_linux_sysfs.h | 9 +- src/conf/virnodedeviceobj.c | 170 ++++++----- src/conf/virnodedeviceobj.h | 2 + src/libvirt_private.syms | 6 + src/node_device/node_device_driver.c | 235 +++++++-------- src/node_device/node_device_driver.h | 93 ++++-- src/node_device/node_device_hal.c | 60 ++-- src/node_device/node_device_udev.c | 323 ++++++++++++--------- src/test/test_driver.c | 113 ++++--- 12 files changed, 576 insertions(+), 469 deletions(-) rename src/{node_device => conf}/node_device_linux_sysfs.c (89%) rename src/{node_device => conf}/node_device_linux_sysfs.h (82%) -- 2.9.3

3 21

[libvirt] [PATCH 0/2] Add eim attribute to iommu device
by Ján Tomko 24 May '17

24 May '17

Extended interrupt mode allows >255 vCPUs with q35-based machine types. https://bugzilla.redhat.com/show_bug.cgi?id=1451282 Ján Tomko (2): conf: add eim attribute to <iommu><driver> qemu: format eim on intel-iommu command line docs/formatdomain.html.in | 10 +++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 20 ++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++++ src/qemu/qemu_domain.c | 20 ++++++++++++++ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argv-intel-iommu-eim.args | 19 +++++++++++++ .../qemuxml2argv-intel-iommu-eim.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 7 +++++ .../qemuxml2xmlout-intel-iommu-eim.xml | 1 + tests/qemuxml2xmltest.c | 1 + 15 files changed, 131 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-intel-iommu-eim.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-intel-iommu-eim.xml -- 2.10.2

2 5

[libvirt] [PATCH python] Fix error check for virDomainGetTime method
by Daniel P. Berrange 24 May '17

24 May '17

The virDomainGetTime returns either a dict or None, but the python glue layer for checking for '-1'. Thus it failed to raise an exception on error. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-override-virDomain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index fa5f75f..7c417b8 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -63,7 +63,7 @@ def getTime(self, flags=0): """Extract information about guest time """ ret = libvirtmod.virDomainGetTime(self._o, flags) - if ret == -1: raise libvirtError ('virDomainGetTime() failed', dom=self) + if ret == None: raise libvirtError ('virDomainGetTime() failed', dom=self) return ret def setTime(self, time=None, flags=0): -- 2.9.3

2 1

[libvirt] [PATCH] conf: Resolve corner case on fc_host deletion
by John Ferlan 24 May '17

24 May '17

https://bugzilla.redhat.com/show_bug.cgi?id=1420740 Testing found an inventive way to cause an error at shutdown by providing the parent name for the fc host creation using the "same name" as the HBA. Since the code thus assumed the parent host name provided was the parent HBA and just extracted out the host number and sent that along to the vport_destroy this avoided checks made for equality. So just add the equality check to that path to resolve. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/node_device_conf.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 85cfd83..3f995da 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2127,17 +2127,25 @@ virNodeDeviceDeleteVport(virConnectPtr conn, goto cleanup; } + if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) + goto cleanup; + /* If at startup time we provided a parent, then use that to * get the parent_host value; otherwise, we have to determine * the parent scsi_host which we did not save at startup time */ if (fchost->parent) { + /* Someone provided a parent string at startup time that + * was the same as the scsi_host - meaning we have a pool + * backed to an HBA, so there won't be a vHBA to delete */ + if (STREQ(scsi_host_name, fchost->parent)) { + ret = 0; + goto cleanup; + } + if (virSCSIHostGetNumber(fchost->parent, &parent_host) < 0) goto cleanup; } else { - if (virAsprintf(&scsi_host_name, "scsi_%s", name) < 0) - goto cleanup; - if (!(vhba_parent = virNodeDeviceGetParentName(conn, scsi_host_name))) goto cleanup; -- 2.9.3

2 3

[libvirt] [PATCH] conf: fix build issue caused by shadowing global declaration
by Pavel Hrdina 24 May '17

24 May '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 32234e8a54..d3c6e9c0ab 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3525,12 +3525,12 @@ void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info) static bool virDomainSkipBackcompatConsole(virDomainDefPtr def, - size_t index, + size_t idx, bool all) { - virDomainChrDefPtr console = def->consoles[index]; + virDomainChrDefPtr console = def->consoles[idx]; - if (!all && index == 0 && + if (!all && idx == 0 && (console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL || console->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) && def->os.type == VIR_DOMAIN_OSTYPE_HVM) { -- 2.13.0

1 0

[libvirt] not able install libvirt
by Eric Blake 24 May '17

24 May '17

[moderator note: re-posting to list with screenshot deleted, in order to meet list policy size constraints] hello, i am am trying to install libvmi tool on my xen hypervisor but some where is asking to install libvirt packages. i am following your code and your instruction but its showing some error here is screenshot. how i can resolve it ??

2 1

[libvirt] [PATCH 0/2] fix labeling for chardev source path
by Pavel Hrdina 24 May '17

24 May '17

Pavel Hrdina (2): conf: don't iterate over backcompat console in virDomainChrDefForeach qemu: don't relabel chardev source file if virtlogd is used src/conf/domain_conf.c | 46 ++++++++++++++++++++++++++++++++++++----- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 12 +++++++---- src/security/security_dac.c | 6 ++++++ src/security/security_selinux.c | 16 ++++++-------- 5 files changed, 62 insertions(+), 19 deletions(-) -- 2.13.0

4 13

[libvirt] [RFC PATCH 0/2] Bandaid to "fix" bulk stats API on big hosts
by Peter Krempa 24 May '17

24 May '17

Make the API fail less often by bumping the RPC message size and telling users not to request stats for too many VMs until we figure out a better solution to get a lot of stats. Peter Krempa (2): rpc: Bump maximum message size to 32M lib: Add note that bulk stats API queries may overrun RPC buffers src/libvirt-domain.c | 7 +++++++ src/rpc/virnetprotocol.x | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) -- 2.12.2

3 12

[libvirt] [PATCH 1/1] vz: fix raise in vzDomainBlock
by Konstantin Neumoin 24 May '17

24 May '17

Need begin job before lookup disk in config, because it can be edited at this moment. Signed-off-by: Konstantin Neumoin <kneumoin(a)virtuozzo.com> --- src/vz/vz_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 8f94326..954ca6a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4000,12 +4000,6 @@ vzDomainBlockResize(virDomainPtr domain, size /= 1024; size /= 1024; - if (!(disk = virDomainDiskByName(dom->def, path, false))) { - virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); - goto cleanup; - } - if (vzDomainObjBeginJob(dom) < 0) goto cleanup; job = true; @@ -4019,6 +4013,12 @@ vzDomainBlockResize(virDomainPtr domain, goto cleanup; } + if (!(disk = virDomainDiskByName(dom->def, path, false))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); + goto cleanup; + } + ret = prlsdkResizeImage(dom, disk, size); cleanup: -- 2.7.4

3 6

[libvirt] [PATCH 1/1] vz: unlock dom until resize operation
by Konstantin Neumoin 24 May '17

24 May '17

We have to use waitDomainJob instead of waitJob, because of it unlock the domain until job has finished, so domain will be available for other clients. Signed-off-by: Konstantin Neumoin <kneumoin(a)virtuozzo.com> --- src/vz/vz_sdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index bc1a9eb..79b356d 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -4993,7 +4993,7 @@ int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, job = PrlVmDev_ResizeImage(prldisk, newsize, PRIF_RESIZE_LAST_PARTITION); - if (PRL_FAILED(waitJob(job))) + if (PRL_FAILED(waitDomainJob(job, dom))) goto cleanup; ret = 0; -- 2.7.4

3 2

[libvirt] [libvirt-perl][PATCH 0/7] Implement sparse streams
by Michal Privoznik 24 May '17

24 May '17

*** BLURB HERE *** Michal Privoznik (7): Fix send_all() callback helper Introduce flags to Stream::recv() Introduce Stream::recvHole() and Stream::sendHole() Introduce Stream::sparse_recv_all() Introduce Stream::sparse_send_all() Register VOL_DOWNLOAD_SPARSE_STREAM & VOL_UPLOAD_SPARSE_STREAM constants examples: Introduce vol-sparse.pl Changes | 9 ++ Virt.xs | 241 ++++++++++++++++++++++++++++++++++++++++++++- examples/vol-sparse.pl | 142 ++++++++++++++++++++++++++ lib/Sys/Virt/StorageVol.pm | 30 +++++- lib/Sys/Virt/Stream.pm | 70 ++++++++++++- t/030-api-coverage.t | 3 + 6 files changed, 483 insertions(+), 12 deletions(-) create mode 100755 examples/vol-sparse.pl -- 2.13.0

2 11

[libvirt] Plans for next release
by Daniel Veillard 24 May '17

24 May '17

we are getting close to the end of the month, so in order to ship on time I suggest we enter freeze on Friday (late or w.e.) then plan an RC2 around Tuesday, for a final release on Thursday if everything goes well, hope this works for everybody, there is a few days to push patches in time for 3.4.0 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 V2] libxl: add default controllers for USB devices
by Jim Fehlig 23 May '17

23 May '17

Attempting to start a domain with USB hostdevs but no USB controllers fails with the rather cryptic error libxl: error: libxl_qmp.c:287:qmp_handle_error_response: received an error message from QMP server: Bus 'xenusb-0.0' not found This can be fixed by creating default USB controllers. When no USB controllers are defined, create the number of 8 port controllers necessary to accommodate the number of defined USB devices. Note that USB controllers are already created as needed in the domainAttachDevice code path. E.g. a USB controller will be created, if necessary, when attaching a USB device with 'virsh attach-device dom usbdev.xml'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V1 here https://www.redhat.com/archives/libvir-list/2017-April/msg00965.html While further testing of V1 found a libvirtd segfault due to incorrectly using virDomainControllerInsertPreAlloced instead of virDomainControllerInsert. src/libxl/libxl_conf.c | 82 +++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 56bc09719..cdf6ec9f3 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1822,34 +1822,94 @@ libxlMakeUSBController(virDomainControllerDefPtr controller, } static int +libxlMakeDefaultUSBControllers(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + virDomainControllerDefPtr l_controller = NULL; + libxl_device_usbctrl *x_controllers = NULL; + size_t nusbdevs = 0; + size_t ncontrollers; + size_t i; + + for (i = 0; i < def->nhostdevs; i++) { + if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) + nusbdevs++; + } + + /* No controllers needed if there are no USB devs */ + if (nusbdevs == 0) + return 0; + + /* Create USB controllers with 8 ports */ + ncontrollers = VIR_DIV_UP(nusbdevs, 8); + if (VIR_ALLOC_N(x_controllers, ncontrollers) < 0) + return -1; + + for (i = 0; i < ncontrollers; i++) { + if (!(l_controller = virDomainControllerDefNew(VIR_DOMAIN_CONTROLLER_TYPE_USB))) + goto error; + + l_controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2; + l_controller->idx = i; + l_controller->opts.usbopts.ports = 8; + + libxl_device_usbctrl_init(&x_controllers[i]); + + if (libxlMakeUSBController(l_controller, &x_controllers[i]) < 0) + goto error; + + if (virDomainControllerInsert(def, l_controller) < 0) + goto error; + + l_controller = NULL; + } + + d_config->usbctrls = x_controllers; + d_config->num_usbctrls = ncontrollers; + return 0; + + error: + virDomainControllerDefFree(l_controller); + for (i = 0; i < ncontrollers; i++) + libxl_device_usbctrl_dispose(&x_controllers[i]); + VIR_FREE(x_controllers); + return -1; +} + +static int libxlMakeUSBControllerList(virDomainDefPtr def, libxl_domain_config *d_config) { virDomainControllerDefPtr *l_controllers = def->controllers; size_t ncontrollers = def->ncontrollers; size_t nusbctrls = 0; libxl_device_usbctrl *x_usbctrls; - size_t i; - - if (ncontrollers == 0) - return 0; - - if (VIR_ALLOC_N(x_usbctrls, ncontrollers) < 0) - return -1; + size_t i, j; for (i = 0; i < ncontrollers; i++) { + if (l_controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) + nusbctrls++; + } + + if (nusbctrls == 0) + return libxlMakeDefaultUSBControllers(def, d_config); + + if (VIR_ALLOC_N(x_usbctrls, nusbctrls) < 0) + return -1; + + for (i = 0, j = 0; i < ncontrollers && j < nusbctrls; i++) { if (l_controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) continue; - libxl_device_usbctrl_init(&x_usbctrls[nusbctrls]); + libxl_device_usbctrl_init(&x_usbctrls[j]); if (libxlMakeUSBController(l_controllers[i], - &x_usbctrls[nusbctrls]) < 0) + &x_usbctrls[j]) < 0) goto error; - nusbctrls++; + j++; } - VIR_SHRINK_N(x_usbctrls, ncontrollers, ncontrollers - nusbctrls); d_config->usbctrls = x_usbctrls; d_config->num_usbctrls = nusbctrls; -- 2.11.0

2 3

[libvirt] [PATCH] qemu: Properly check return value of VIR_STRDUP in qemuDomainGetBlockIoTune
by Peter Krempa 23 May '17

23 May '17

Setting the 'group_name' for a disk would falsely trigger a error path as in commit 4b57f76502 we did not properly check the return value of VIR_STRDUP. --- I must have forgotten to commit this change, as I'm sure I've tested it prior to sending the patch mentioned above. src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6c79d4fe3..cd513ff9f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17748,7 +17748,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, /* Group name needs to be copied since qemuMonitorGetBlockIoThrottle * allocates it as well */ - if (VIR_STRDUP(reply.group_name, disk->blkdeviotune.group_name)) + if (VIR_STRDUP(reply.group_name, disk->blkdeviotune.group_name) < 0) goto endjob; } -- 2.12.2

2 1

[libvirt] [libvirt-python][PATCH v2 0/4] Implement sparse streams
by Michal Privoznik 23 May '17

23 May '17

diff to v1: - Martin's review worked in. Patches 1-3 were ACKed already. Well, conditionally. Patch 4/4 wasn't. I'm sending them again to make sure I've worked in the review as expected. Michal Privoznik (4): Implement virStreamSendHole/virStreamRecvHole virStream: Introduce virStreamRecvFlags virStream: Introduce virStreamSparse{Recv,Send}All examples: Introduce sparsestream.py examples/sparsestream.py | 117 +++++++++++++++++++++++++++++++++ generator.py | 5 ++ libvirt-override-virStream.py | 146 ++++++++++++++++++++++++++++++++++++++++++ libvirt-override.c | 102 +++++++++++++++++++++++++++++ sanitytest.py | 6 +- 5 files changed, 374 insertions(+), 2 deletions(-) create mode 100755 examples/sparsestream.py -- 2.13.0

2 5

[libvirt] [PATCH] qemu: process: Clear priv->namespaces on VM shutdown
by Peter Krempa 23 May '17

23 May '17

Otherwise the private data entry would be kept across instances of the same VM even if it's not configured to do so. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1453142 --- src/qemu/qemu_process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c19bd2925..ac17da668 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6449,6 +6449,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, /* clean up migration data */ VIR_FREE(priv->migTLSAlias); + /* clear previously used namespaces */ + virBitmapFree(priv->namespaces); + priv->namespaces = NULL; + /* The "release" hook cleans up additional resources */ if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) { char *xml = qemuDomainDefFormatXML(driver, vm->def, 0); -- 2.12.2

3 3

[libvirt] [libvirt-python][PATCH 0/4] Implement sparse streams
by Michal Privoznik 23 May '17

23 May '17

*** BLURB HERE *** Michal Privoznik (4): Implement virStreamSendHole/virStreamRecvHole virStream: Introduce virStreamRecvFlags virStream: Introduce virStreamSparse{Recv,Send}All examples: Introduce sparsestream.py examples/sparsestream.py | 119 ++++++++++++++++++++++++++++++++ generator.py | 5 ++ libvirt-override-virStream.py | 156 ++++++++++++++++++++++++++++++++++++++++++ libvirt-override.c | 102 +++++++++++++++++++++++++++ 4 files changed, 382 insertions(+) create mode 100755 examples/sparsestream.py -- 2.13.0

2 11

[libvirt] libvirt-question
by zhunxun＠gmail.com 23 May '17

23 May '17

Hello,does libvirt provides API to get qemu process ID by vm ID or name??or is there any methods to do this?? thanks!! zhunxun(a)gmail.com

3 4

[libvirt] [PATCH] test: fixing variable names for test suite inside configure.ac.
by Julio Faracco 22 May '17

22 May '17

Both variables for gcov and oom have wrong names inside configure.ac. For this reason, the Test Suite configuration is not showing the current configuration. Before patching: configure: windres: no configure: configure: Test suite configure: configure: Coverage: configure: Alloc OOM: configure: configure: Miscellaneous After patching (using --enable-test-coverage and --enable-test-oom): configure: windres: no configure: configure: Test suite configure: configure: Coverage: yes configure: Alloc OOM: yes configure: configure: Miscellaneous Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2e60513..246f4e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1005,8 +1005,8 @@ LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Coverage: $enable_coverage]) -AC_MSG_NOTICE([ Alloc OOM: $enable_oom]) +AC_MSG_NOTICE([ Coverage: $enable_test_coverage]) +AC_MSG_NOTICE([ Alloc OOM: $enable_test_oom]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) -- 2.7.4

2 2

[libvirt] [PATCH] qemu: Remove unused variables in qemuDomainUpdateDeviceConfig
by Kothapally Madhu Pavan 22 May '17

22 May '17

priv and qemuCaps variables are not used anymore. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1c4873e..4721356 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8172,8 +8172,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; - virQEMUCapsPtr qemuCaps = NULL; - qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -8192,8 +8190,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - priv = vm->privateData; - if (virDomainUpdateDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; @@ -8220,12 +8216,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, goto endjob; } - if (priv->qemuCaps) - qemuCaps = virObjectRef(priv->qemuCaps); - else if (!(qemuCaps = virQEMUCapsCacheLookup(caps, driver->qemuCapsCache, - vm->def->emulator))) - goto endjob; - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -8273,7 +8263,6 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: - virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy);

2 1

[libvirt] [RFC] Fixing a regression caused by recent CPU driver changes
by Jiri Denemark 22 May '17

22 May '17

Hi all, when I was enhancing libvirt's guest CPU configuration code to be able to really ensure stable guest CPU ABI, I added a new attribute //cpu/@check which is nicely backward compatible... an old libvirt will just ignore it. However, even if check='full' will be ignored, an old libvirt will still see the updated CPU definition (features added or removed by the hypervisor will be shown there). And because we need QEMU 2.9.0 to check what features are going to be added or removed before we actually start the domain, migrating such domain to an older libvirt or QEMU may fail if QEMU enables a feature which is not supported by the host CPU. Known features causing problems are, e.g., x2apic, hypervisor, and arat. To make things even worse, updating a CPU definition with the automatically added/removed features can be done since QEMU 1.5.0. Even save/restore or snapshot revert on a single host running new libvirt and QEMU < 2.9.0 is now affected by this regression. The big question is how to fix the regression in a backward compatible way and still keep the ability to properly check guest CPU ABI with new enough libvirt and QEMU. Clearly, we need to keep both the original and the updated CPU definition (or one of them and a diff against the other). I came up with the following options: 1. When migrating a domain, the domain XML would contain the original CPU def while the updated one would be transferred in a migration cookie. - doesn't fix save/restore or snapshot revert - could be fixed by not updating the CPU with QEMU < 2.9.0, but it won't work when restore is done on a different host with older QEMU (and yes, this happens in real life, e.g., with oVirt) - doesn't even fix migration after save/restore or snapshot revert 2. Use migration cookie and change the save image format to contain additional data (something like migration cookie) which a new libvirt could make use of while old libvirt would ignore any additional data it doesn't know about - snapshot XML would need to be updated too, but that's trivial - cleanly changing save image format requires its version to be increased and old libvirt will just refuse to read such image - this would fix save/restore on the same host or on a host with older QEMU - doesn't fix restore on a different host running older libvirt - even this is done by oVirt 3. Use migration cookie and change the save image format without increasing its version (and update snapshot XML) - this fixes all cases - technically possible by using one of the unused 32b ints and adding \0 at the end of the domain XML followed by anothe XML with the additional data (pointed to by the formerly unused uint32_t) - very ugly hack 4. Format both CPUs in domain XML by adding a new subelement in <cpu> which would list all extra features disabled or enabled by QEMU - fixes all cases without the need to use migration cookie, change save image format, or snapshot XML - but it may be very confusing for users and it would need to be documented as "output only, don't touch staff" 5. Add the additional data in <metadata> - a bad joke really So my preferred solution is 2. It breaks restore on a host with older libvirt, but it was never guaranteed to work, even though it usually just worked. And we could just tell oVirt to fix there usage :-) Also additional data in save image header may be very useful in the future; I think I remember someone sighing about the inability to store more than just domain XML in a saved image when they were trying to fix some compatibility issues. Any thoughts about the options or even completely new ideas are very welcome. Thanks, Jirka

4 3

[libvirt] [PATCH V2 0/2] Define macro for IPv4 loopback address and use it in libxl
by Jim Fehlig 22 May '17

22 May '17

V2 of https://www.redhat.com/archives/libvir-list/2017-May/msg00616.html While reviewing V1, Joao suggesting adding a macro for the various hardcoded "127.0.0.1" used throughout the code. Patch 1 does that. Patch2 is improved in V2 to include setting the listen address for spice as well as VNC. Jim Fehlig (2): maint: define a macro for IPv4 loopback address libxl: add default listen address for VNC and spice src/internal.h | 2 ++ src/libxl/libxl_conf.c | 31 +++++++++++++++++++++---------- src/qemu/qemu_conf.c | 4 ++-- src/util/virsocketaddr.c | 4 ++-- src/vz/vz_sdk.c | 2 +- 5 files changed, 28 insertions(+), 15 deletions(-) -- 2.11.0

2 5

[libvirt] Various apparmor related changes (part 1), version 2
by Stefan Bader 22 May '17

22 May '17

> Over the years there have been a bunch of changes to the > apparmor profiles and/or virt-aa-helper which have been > carried in Debian/Ubuntu but never made it upstream. > > In an attempt to clean this up and generally improve the > apparmor based environments, we (Christian and I) went > over the changes, cleaned out cruft as much as possible > and would be sending out hunks of changes to this list > for upstream inclusion. > > I hope doing multiple but smaller rounds of submissions > will make it simpler to get those reviewed and hopefully > accepted. For the second version I added acks, merged the patches related to explicit device denials and local apparmor profiles, and split the 9p support one (holding back the part allowing link access for later or to be replaced by a safer solution). I also tried to improve the explanation in the description of patch #1 (virt-aa-helper: Ask for no deny rule for readonly disk elements). Thanks, Stefan

5 22

[libvirt] [PATCH v3] Provide a useful README file
by Daniel P. Berrange 22 May '17

22 May '17

The current README file contents has almost no useful info, and that which does exist is very outdated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Makefile.am | 1 + README | 14 +---------- README.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 13 deletions(-) mode change 100644 => 120000 README create mode 100644 README.md diff --git a/Makefile.am b/Makefile.am index 333ec5a..db991ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ EXTRA_DIST = \ autogen.sh \ cfg.mk \ run.in \ + README.md \ AUTHORS.in pkgconfigdir = $(libdir)/pkgconfig diff --git a/README b/README deleted file mode 100644 index 3d5167d..0000000 --- a/README +++ /dev/null @@ -1,13 +0,0 @@ - - LibVirt : simple API for virtualization - - Libvirt is a C toolkit to interact with the virtualization capabilities -of recent versions of Linux (and other OSes). It is free software -available under the GNU Lesser General Public License. Virtualization of -the Linux Operating System means the ability to run multiple instances of -Operating Systems concurrently on a single hardware system where the basic -resources are driven by a Linux instance. The library aim at providing -long term stable C API initially for the Xen paravirtualization but -should be able to integrate other virtualization mechanisms if needed. - -Daniel Veillard <veillard(a)redhat.com> diff --git a/README b/README new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/README @@ -0,0 +1 @@ +README.md \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..f5d4cd2 --- /dev/null +++ b/README.md @@ -0,0 +1,80 @@ +[![Build Status](https://travis-ci.org/libvirt/libvirt.svg)](https://travis-ci.org/l… + +Libvirt API for virtualization +============================== + +Libvirt provides a portable, long term stable C API for managing the +virtualization technologies provided by many operating systems. It +includes support for QEMU, KVM, Xen, LXC, bhyve, Virtuozzo, VMware +vCenter and ESX, VMware Desktop, Hyper-V, VirtualBox and the POWER +Hypervisor. + +For some of these hypervisors, it provides a stateful management +daemon which runs on the virtualization host allowing access to the +API both by non-privileged local users and remote users. + +Layered packages provide bindings of the libvirt C API into other +languages including Python, Perl, PHP, Go, Java, OCaml, as well as +mappings into object systems such as GObject, CIM and SNMP. + +Further information about the libvirt project can be found on the +website: + +* <https://libvirt.org> + +License +------- + +The libvirt C API is distributed under the terms of GNU Lesser General +Public License, version 2.1 (or later). Some parts of the code that are +not part of the C library may have the more restrictive GNU General +Public License, version 2.1 (or later). See the files COPYING.LESSER +and COPYING for full license terms & conditions. + +Installation +------------ + +Libvirt uses the GNU Autotools build system, so in general can be built +and installed with the usual commands. For example, to build in a manner +that is suitable for installing as root, use: + +``` +$ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +$ make +$ sudo make install +``` + +While to build & install as an unprivileged user + +``` +$ ./configure --prefix=$HOME/usr +$ make +$ make install +``` + + +The libvirt code relies on a large number of 3rd party libraries. These will +be detected during execution of the configure script and a summary printed +which lists any missing (optional) dependencies. + +Contributing +------------ + +The libvirt project welcomes contributions in many ways. For most components +the best way to contribute is to send patches to the primary development +mailing list, using the `git send-email` command. Further guidance on this +can be found in the `HACKING` file, or the project website + +* <https://libvirt.org/contribute.html> + +Contact +------- + +The libvirt project has two primary mailing lists: + + * libvirt-users(a)redhat.com (**for user discussions**) + * libvir-list(a)redhat.com (**for development only**) + +Further details on contacting the project are available on the website + +* <https://libvirt.org/contact.html> -- 2.9.3

2 1

[libvirt] [PATCH v2] Provide a useful README file
by Daniel P. Berrange 22 May '17

22 May '17

The current README file contents has almost no useful info, and that which does exist is very outdated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- In v2: - Use markdown syntax - Use README.md file - Symlink README to README.md - Include travis build status README | 14 +---------- README.md | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 13 deletions(-) mode change 100644 => 120000 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 3d5167d..0000000 --- a/README +++ /dev/null @@ -1,13 +0,0 @@ - - LibVirt : simple API for virtualization - - Libvirt is a C toolkit to interact with the virtualization capabilities -of recent versions of Linux (and other OSes). It is free software -available under the GNU Lesser General Public License. Virtualization of -the Linux Operating System means the ability to run multiple instances of -Operating Systems concurrently on a single hardware system where the basic -resources are driven by a Linux instance. The library aim at providing -long term stable C API initially for the Xen paravirtualization but -should be able to integrate other virtualization mechanisms if needed. - -Daniel Veillard <veillard(a)redhat.com> diff --git a/README b/README new file mode 120000 index 0000000..42061c0 --- /dev/null +++ b/README @@ -0,0 +1 @@ +README.md \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..c2bd2f8 --- /dev/null +++ b/README.md @@ -0,0 +1,79 @@ +[![Build Status](https://travis-ci.org/libvirt/libvirt.svg)](https://travis-ci.org/l… + +Libvirt API for virtualization +============================== + +Libvirt provides a portable, long term stable C API for managing the +virtualization technologies provided by many operating systems. It +includes support for QEMU, KVM, Xen, LXC, BHyve, Virtuozzo, VMWare +vCenter and ESX, VMWare Desktop, Hyper-V, VirtualBox and PowerHyp. + +For some of these hypervisors, it provides a stateful management +daemon runs on the virtualization host allowing access to the API +both by non-privileged local users and remote users. + +Layered packages provide bindings of the Libvirt C API into other +languages including Python, Perl, Php, Go, Java, OCaml, as well as +mappings into object systems such as GObject, CIM and SNMP. + +Further information about the libvirt project can be found on the +website: + +* <https://libvirt.org> + +License +------- + +The libvirt C API is distributed under the terms of GNU Lesser General +Public License, version 2.1 (or later). Some parts of the code that are +not part of the C library, may have the more restricted GNU General +Public License, version 2.1 (or later). See the files COPYING.LESSER +and COPYING for full license terms & conditions. + +Installation +------------ + +Libvirt uses the GNU Autotools build system, so in general can be built +and installed with the normal commands. For example, to build in a manner +that is suitable for installing as root, use: + +``` +# ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +# make +# sudo make install +``` + +While to build & install as an unprivileged user + +``` +# ./configure --prefix=$HOME/usr +# make +# make install +``` + + +The libvirt code relies on a large number of 3rd party libraries. These will +be detected during execution of the configure script and a summary printed +which lists any missing (optional) dependancies. + +Contributing +------------ + +The libvirt project welcomes contributors from all. For most components +the best way to contributor is to send patches to the primary development +mailing list, using the 'git send-email' command. Further guidance on this +can be found in the HACKING file, or the project website + +* <https://libvirt.org/contribute.html> + +Contact +------- + +The libvirt project has two primary mailing lists: + + * libvir-list(a)redhat.com (**for development**) + * libvirt-users(a)redhat.com (**for users**) + +Further details on contacting the project are available on the website + +* <https://libvirt.org/contact.html> -- 2.9.3

2 4

[libvirt] [libvirt-perl][PATCH] Add LIST_CAP_MDEV & LIST_CAP_MDEV_TYPES constants
by Michal Privoznik 22 May '17

22 May '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- The sparse streams are still missing. Working on that. Changes | 2 +- Virt.xs | 2 ++ lib/Sys/Virt/NodeDevice.pm | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 975de40..2e5bfe4 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 3.4.0 2017-06-00 - - XXX + - Add LIST_CAP_MDEV & LIST_CAP_MDEV_TYPES constants 3.3.0 2017-05-08 diff --git a/Virt.xs b/Virt.xs index 99d0db9..9ccdc1f 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8938,6 +8938,8 @@ BOOT: REGISTER_CONSTANT(VIR_CONNECT_LIST_NODE_DEVICES_CAP_VPORTS, LIST_CAP_VPORTS); REGISTER_CONSTANT(VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_GENERIC, LIST_CAP_SCSI_GENERIC); REGISTER_CONSTANT(VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM, LIST_CAP_DRM); + REGISTER_CONSTANT(VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV, LIST_CAP_MDEV); + REGISTER_CONSTANT(VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV_TYPES, LIST_CAP_MDEV_TYPES); REGISTER_CONSTANT(VIR_NODE_DEVICE_EVENT_ID_LIFECYCLE, EVENT_ID_LIFECYCLE); REGISTER_CONSTANT(VIR_NODE_DEVICE_EVENT_ID_UPDATE, EVENT_ID_UPDATE); diff --git a/lib/Sys/Virt/NodeDevice.pm b/lib/Sys/Virt/NodeDevice.pm index 3528c41..32bc75c 100644 --- a/lib/Sys/Virt/NodeDevice.pm +++ b/lib/Sys/Virt/NodeDevice.pm @@ -169,6 +169,14 @@ Include devices with the SCSI generic capability Include devices with the DRM capability +=item Sys::Virt::NodeDevice::LIST_CAP_MDEV + +Include mediated devices + +=item Sys::Virt::NodeDevice::LIST_CAP_MDEV_TYPES + +Include devices capable of mediated devices + =back =head2 EVENT ID CONSTANTS -- 2.13.0

2 1

[libvirt] [PATCH] virStreamSparseSendAll: Reset @want in each iteration
by Michal Privoznik 22 May '17

22 May '17

There's a slight problem with the current function. Assume we are currently in a data section and we have say 42 bytes until next section (okay, in reality sections are capped to the sector size, but bear with me). Therefore, just before (handler) is called to fill up the buffer with data, @want is changed to 42 to match the amount of data left in the current section. However, after hole is processed, we are back in data section but with incredibly small @want size. Nobody will ever reset it back. This results in incredible data fragmentation. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-stream.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index ed0ed7325..d7a8f5816 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -698,7 +698,7 @@ int virStreamSparseSendAll(virStreamPtr stream, void *opaque) { char *bytes = NULL; - size_t want = VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX; + size_t bufLen = VIR_NET_MESSAGE_LEGACY_PAYLOAD_MAX; int ret = -1; unsigned long long dataLen = 0; @@ -718,12 +718,13 @@ int virStreamSparseSendAll(virStreamPtr stream, goto cleanup; } - if (VIR_ALLOC_N(bytes, want) < 0) + if (VIR_ALLOC_N(bytes, bufLen) < 0) goto cleanup; for (;;) { int inData, got, offset = 0; long long sectionLen; + size_t want = bufLen; const unsigned int skipFlags = 0; if (!dataLen) { -- 2.13.0

2 1

[libvirt] Various apparmor related changes (part 1)
by Stefan Bader 22 May '17

22 May '17

Over the years there have been a bunch of changes to the apparmor profiles and/or virt-aa-helper which have been carried in Debian/Ubuntu but never made it upstream. In an attempt to clean this up and generally improve the apparmor based environments, we (Christian and I) went over the changes, cleaned out cruft as much as possible and would be sending out hunks of changes to this list for upstream inclusion. I hope doing multiple but smaller rounds of submissions will make it simpler to get those reviewed and hopefully accepted. This first batch contains a mix of changes from Debian and Ubuntu. Thanks, Stefan

5 30

[libvirt] [PATCH] virCapabilitiesInitCaches: Don't leak cache dir
by Michal Privoznik 22 May '17

22 May '17

To every virDirOpen we must have VIR_DIR_CLOSE otherwise FD is leaked. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d699b0817..a91a72a35 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1555,6 +1555,8 @@ virCapabilitiesInitCaches(virCapsPtr caps) if (virAsprintf(&path, "%s/cpu/cpu%zd/cache/", SYSFS_SYSTEM_PATH, pos) < 0) goto cleanup; + VIR_DIR_CLOSE(dirp); + rv = virDirOpenIfExists(&dirp, path); if (rv < 0) goto cleanup; @@ -1639,7 +1641,7 @@ virCapabilitiesInitCaches(virCapsPtr caps) cleanup: VIR_FREE(type); VIR_FREE(path); - virDirClose(&dirp); + VIR_DIR_CLOSE(dirp); virCapsHostCacheBankFree(bank); return ret; } -- 2.13.0

2 1

[libvirt] [PATCH] Revert "qemu: propagate bridge MTU into qemu "host_mtu" option"
by Laine Stump 22 May '17

22 May '17

This reverts commit 2841e675. It turns out that adding the host_mtu field to the PCI capabilities in the guest bumps the length of PCI capabilities beyond the 32 byte boundary, so the virtio-net device gets 64 bytes of ioport space instead of 32, which offsets the address of all the other following devices. Migration doesn't work very well when the location and length of PCI capabilities of devices is changed between source and destination. This means that we need to make sure that the absence/presence of host_mtu on the qemu commandline always matches between source and destination, which means that we need to make setting of host_mtu an opt-in thing (it can't happen automatically when the bridge being used has a non-default MTU, which is what commit 2841e675 implemented). I do want to re-implement this feature with an <mtu auto='on'/> setting, but probably won't backport that to any stable branches, so I'm first reverting the original commit, and that revert can be pushed to the few releases that have been made since the original (3.1.0 - 3.3.0) Resolves: https://bugzilla.redhat.com/1449346 --- src/qemu/qemu_command.c | 32 ++++++++++---------------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 5 ++--- src/qemu/qemu_interface.c | 5 ++--- src/qemu/qemu_interface.h | 3 +-- 5 files changed, 16 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4c1a266..aa66e3d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3633,8 +3633,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, int vlan, unsigned int bootindex, size_t vhostfdSize, - virQEMUCapsPtr qemuCaps, - unsigned int mtu) + virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; const char *nic = net->model; @@ -3758,23 +3757,13 @@ qemuBuildNicDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } - if (usingVirtio && mtu) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { - - virBufferAsprintf(&buf, ",host_mtu=%u", mtu); - - } else { - /* log an error if mtu was requested specifically for this - * interface, otherwise, if it's just what was reported by - * the attached network, ignore it. - */ - if (net->mtu) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting MTU is not supported with " - "this QEMU binary")); - goto error; - } + if (usingVirtio && net->mtu) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("setting MTU is not supported with this QEMU binary")); + goto error; } + virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu); } if (vlan == -1) @@ -8320,7 +8309,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, VIR_FREE(netdev); if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, - queues, qemuCaps, net->mtu))) { + queues, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); goto error; @@ -8366,7 +8355,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virDomainNetType actualType = virDomainNetGetActualType(net); virNetDevBandwidthPtr actualBandwidth; size_t i; - unsigned int mtu = net->mtu; if (!bootindex) @@ -8421,7 +8409,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); if (qemuInterfaceBridgeConnect(def, driver, net, - tapfd, &tapfdSize, &mtu) < 0) + tapfd, &tapfdSize) < 0) goto cleanup; break; @@ -8601,7 +8589,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, } if (qemuDomainSupportsNicdev(def, net)) { if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, - vhostfdSize, qemuCaps, mtu))) + vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 7da92c8..09cb00e 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -101,8 +101,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def, int vlan, unsigned int bootindex, size_t vhostfdSize, - virQEMUCapsPtr qemuCaps, - unsigned int mtu); + virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e8d2918..a1909e3 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -968,7 +968,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, bool charDevPlugged = false; bool netdevPlugged = false; bool hostPlugged = false; - unsigned int mtu = net->mtu; /* preallocate new slot for device */ if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0) @@ -1025,7 +1024,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize); if (qemuInterfaceBridgeConnect(vm->def, driver, net, - tapfd, &tapfdSize, &mtu) < 0) + tapfd, &tapfdSize) < 0) goto cleanup; iface_connected = true; if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps, @@ -1239,7 +1238,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, VIR_FORCE_CLOSE(vhostfd[i]); if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, - queueSize, priv->qemuCaps, mtu))) + queueSize, priv->qemuCaps))) goto try_remove; qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index d8a678b..cebb490 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -503,8 +503,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, int *tapfd, - size_t *tapfdSize, - unsigned int *mtu) + size_t *tapfdSize) { const char *brname; int ret = -1; @@ -545,7 +544,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, def->uuid, tunpath, tapfd, *tapfdSize, virDomainNetGetActualVirtPortProfile(net), virDomainNetGetActualVlan(net), - net->coalesce, net->mtu, mtu, + net->coalesce, 0, NULL, tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index ba74ac2..a7faa0b 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -51,8 +51,7 @@ int qemuInterfaceBridgeConnect(virDomainDefPtr def, virQEMUDriverPtr driver, virDomainNetDefPtr net, int *tapfd, - size_t *tapfdSize, - unsigned int *mtu) + size_t *tapfdSize) ATTRIBUTE_NONNULL(2); int qemuInterfaceOpenVhostNet(virDomainDefPtr def, -- 2.9.4

2 1

[libvirt] [PATCH] util: Don't leak @replay in virSystemdGetMachineNameByPID
by Wang King 22 May '17

22 May '17

@reply is a DBusMessage object returned by virDBusCallMethod in get machine object call path, dereference it before calling virDBusCallMethod again to get machine name. --- src/util/virsystemd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 83737a2..5d9746f 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -247,6 +247,9 @@ virSystemdGetMachineNameByPID(pid_t pid) if (virDBusMessageRead(reply, "o", &object) < 0) goto cleanup; + virDBusMessageUnref(reply); + reply = NULL; + VIR_DEBUG("Domain with pid %lld has object path '%s'", (long long) pid, object); -- 2.8.3

2 1

[libvirt] [PATCH] allow to control host side link status of ethernet network device
by Vasiliy Tolstov 22 May '17

22 May '17

Back to old thread with Laine Stump with message title: "qemu: remove unnecessary setting of tap device online state" I'm not tested ip and route assign in case of up/down link and device update on the fly. But host side link status tested and worked fine. Vasiliy Tolstov (1): qemu: allow to control host side link status of network device docs/formatdomain.html.in | 21 +++++++++++++++++++++ docs/schemas/domaincommon.rng | 11 +++++++++++ src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_hotplug.c | 17 +++++++++++++++++ src/qemu/qemu_interface.c | 8 ++++---- 6 files changed, 82 insertions(+), 4 deletions(-) -- 2.9.3

4 13

[libvirt] [PATCH] Do not release unreserved address in qemuDomainAttachRNGDevice
by Ján Tomko 21 May '17

21 May '17

Only set releaseaddr to true after the address has been reserved successfully. https://bugzilla.redhat.com/show_bug.cgi?id=1452581 --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e8d2918..22759d4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2090,7 +2090,6 @@ qemuDomainAttachRNGDevice(virConnectPtr conn, rng->source.file)) goto cleanup; } - releaseaddr = true; if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { @@ -2103,6 +2102,7 @@ qemuDomainAttachRNGDevice(virConnectPtr conn, !rng->info.addr.ccw.assigned) < 0) goto cleanup; } + releaseaddr = true; if (qemuDomainNamespaceSetupRNG(driver, vm, rng) < 0) goto cleanup; -- 2.10.2

2 1

[libvirt] [PATCH] libxl: add default VNC listen address
by Jim Fehlig 20 May '17

20 May '17

If a VNC listen address is not specified in domXML, libxl will default to 127.0.0.1, but this is never reflected in the domXML. If not specified, set the listen address in virDomainGraphicsDef struct to the libxl default when creating the frame buffer device. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1334562 Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 56bc09719..0c5d7a700 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1227,12 +1227,16 @@ libxlMakeVfb(virPortAllocatorPtr graphicsports, } x_vfb->vnc.display = l_vfb->data.vnc.port - LIBXL_VNC_PORT_MIN; - if ((glisten = virDomainGraphicsGetListen(l_vfb, 0)) && - glisten->address) { - /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */ - VIR_FREE(x_vfb->vnc.listen); - if (VIR_STRDUP(x_vfb->vnc.listen, glisten->address) < 0) - return -1; + if ((glisten = virDomainGraphicsGetListen(l_vfb, 0))) { + if (glisten->address) { + /* libxl_device_vfb_init() does VIR_STRDUP("127.0.0.1") */ + VIR_FREE(x_vfb->vnc.listen); + if (VIR_STRDUP(x_vfb->vnc.listen, glisten->address) < 0) + return -1; + } else { + if (VIR_STRDUP(glisten->address, "127.0.0.1") < 0) + return -1; + } } if (VIR_STRDUP(x_vfb->vnc.passwd, l_vfb->data.vnc.auth.passwd) < 0) return -1; -- 2.11.0

2 2

[libvirt] [PATCH v1 0/3] Loadparm support
by Farhan Ali 19 May '17

19 May '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (3): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string tests : Testcases for loadparm docs/formatdomain.html.in | 8 ++- docs/news.xml | 9 +++ docs/schemas/domaincommon.rng | 7 +++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 37 ++++++++++++ ...-machine-loadparm-multiple-disks-nets-s390.args | 28 +++++++++ ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 ++++++++++++++ .../qemuxml2argv-machine-loadparm-net-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 ++++++++ ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 ++++++++ ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 ++++++++ .../qemuxml2argv-machine-loadparm-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-s390.xml | 26 ++++++++ tests/qemuxml2argvtest.c | 19 ++++++ 17 files changed, 364 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml -- 1.9.1

3 9

[libvirt] [PATCH v1 0/3] Loadparm support
by Farhan Ali 19 May '17

19 May '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html Thanks Farhan Ali Farhan Ali (3): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string tests : Testcases for loadparm docs/formatdomain.html.in | 8 ++- docs/news.xml | 9 +++ docs/schemas/domaincommon.rng | 7 +++ src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +++++++++++++++++++++- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 37 ++++++++++++ ...-machine-loadparm-multiple-disks-nets-s390.args | 28 +++++++++ ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 ++++++++++++++ .../qemuxml2argv-machine-loadparm-net-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 ++++++++ ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 ++++++++ ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 ++++++++ .../qemuxml2argv-machine-loadparm-s390.args | 20 +++++++ .../qemuxml2argv-machine-loadparm-s390.xml | 26 ++++++++ tests/qemuxml2argvtest.c | 19 ++++++ 17 files changed, 367 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml -- 1.9.1

2 6

[libvirt] [PATCH v2] xenconfig: fix handling of NULL disk source
by Wim Ten Have 19 May '17

19 May '17

From: Wim ten Have <wim.ten.have(a)oracle.com> It is possible to crash libvirtd when converting xl native config to domXML when the xl config contains an empty disk source, e.g. an empty CDROM. Fix by checking that the disk source is non-NULL before parsing it. Wim ten Have (1): xenconfig: fix handling of NULL disk source src/xenconfig/xen_xl.c | 4 ++++ tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) -- 2.9.4

2 2

[libvirt] [PATCH v1] xenParseXLDiskSrc: protect against a NULL pointer reference
by Wim Ten Have 19 May '17

19 May '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch protects against a NULL pointer dereference leading to a SEGV and that way taking out libvirtd while performing domain conversion requests per domxml-from-native xen-xl xl.cfg within xenParseXLDiskSrc() when partial disk parameters are provided. Wim ten Have (1): xenParseXLDiskSrc: protect against a NULL pointer reference src/xenconfig/xen_xl.c | 3 ++- tests/xlconfigdata/test-disk-positional-parms-partial.cfg | 2 +- tests/xlconfigdata/test-disk-positional-parms-partial.xml | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) -- 2.9.4

3 3

[libvirt] [PATCH 0/3] Couple of build fixes after sparse streams
by Michal Privoznik 19 May '17

19 May '17

Some systems lack the symbols we need or have them in different header files. Michal Privoznik (3): virfile: Provide stub for virFileInData virfiletest: Test virFileInData iff SEEK_HOLE is defined virfiletest: include linux/falloc.h configure.ac | 5 +++++ src/util/virfile.c | 15 +++++++++++++++ tests/virfiletest.c | 40 +++++++++++++++++++++++++++------------- 3 files changed, 47 insertions(+), 13 deletions(-) -- 2.13.0

3 11

[libvirt] [PATCH] qemu: hotplug: print correct vcpu when validating hot(un)plug config
by Peter Krempa 19 May '17

19 May '17

The error message would contain first vcpu id after the list of vcpus selected for modification. To print the proper vcpu id remember the first vcpu selected to be modified. --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e8d29186e..1d7f2cc71 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5866,6 +5866,7 @@ qemuDomainVcpuValidateConfig(virDomainDefPtr def, 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)) { @@ -5880,13 +5881,17 @@ qemuDomainVcpuValidateConfig(virDomainDefPtr def, continue; /* skip vcpus being modified */ - if (virBitmapIsBitSet(map, next)) + if (virBitmapIsBitSet(map, next)) { + if (firstvcpu < 0) + firstvcpu = next; + continue; + } if (vcpu->online && vcpu->hotpluggable == VIR_TRISTATE_BOOL_NO) { virReportError(VIR_ERR_INVALID_ARG, _("vcpu '%zd' can't be modified as it is followed " - "by non-hotpluggable online vcpus"), next); + "by non-hotpluggable online vcpus"), firstvcpu); return -1; } } -- 2.12.2

2 1

[libvirt] [PATCH] conf: Don't assign value from ..TypeFromString directly to enum
by Peter Krempa 19 May '17

19 May '17

Enums are unsigned, so it's impossible to check whether the helper returned -1 for invalid conversions. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452454 --- src/conf/domain_conf.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9eba70a95..54d87666b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14083,6 +14083,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, xmlNodePtr save = ctxt->node; xmlNodePtr node; virDomainMemoryDefPtr def; + int accessval; ctxt->node = memdevNode; @@ -14102,12 +14103,14 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, } VIR_FREE(tmp); - tmp = virXMLPropString(memdevNode, "access"); - if (tmp && - (def->access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid access mode '%s'"), tmp); - goto error; + if ((tmp = virXMLPropString(memdevNode, "access"))) { + if ((accessval = virDomainMemoryAccessTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid access mode '%s'"), tmp); + goto error; + } + + def->access = accessval; } VIR_FREE(tmp); -- 2.12.2

3 2

[libvirt] libvirt question
by zhunxun＠gmail.com 19 May '17

19 May '17

Hello，I wrote a program using libvirt API to get vm information like this: /*dom is virDomainPtr type*/ dom=virDomainLookupByID(conn,activeDomains[i]); if(dom!=NULL) printf("%d ----------%s\n",activeDomains[i],dom->name); ...... but when compile it,error occured like this: vm_eraser_detect.c:125:54: error: dereferencing pointer to incomplete type printf("%d ----------%s\n",activeDomains[i],dom->name); what is the reason of it??? thanka a lot! zhunxun(a)gmail.com

2 2

[libvirt] [PATCH] datatypes: removing unnecessary return statement.
by Julio Faracco 19 May '17

19 May '17

There is a wrong 'return' statement after a 'goto' statement inside the function virConnectCloseCallbackDataRegister(). This commit only removes the 'return'. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/datatypes.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/datatypes.c b/src/datatypes.c index 59ba956..46414ae 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -193,7 +193,6 @@ void virConnectCloseCallbackDataRegister(virConnectCloseCallbackDataPtr closeDat VIR_WARN("Attempt to register callback on armed" " close callback object %p", closeData); goto cleanup; - return; } closeData->conn = virObjectRef(conn); -- 2.7.4

2 1

[libvirt] [PATCH] nodedev: mdev: Fix build caused by symbol shadowing
by Erik Skultety 18 May '17

18 May '17

GCC 4.6 complains about a local declaration shadowing a global symbol. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as build breaker. src/node_device/node_device_udev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 8288be1cb..4ecb0b18f 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1076,16 +1076,16 @@ udevProcessMediatedDevice(struct udev_device *dev, const char *uuidstr = NULL; int iommugrp = -1; char *linkpath = NULL; - char *realpath = NULL; + char *canonicalpath = NULL; virNodeDevCapMdevPtr data = &def->caps->data.mdev; if (virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)) < 0) goto cleanup; - if (virFileResolveLink(linkpath, &realpath) < 0) + if (virFileResolveLink(linkpath, &canonicalpath) < 0) goto cleanup; - if (VIR_STRDUP(data->type, last_component(realpath)) < 0) + if (VIR_STRDUP(data->type, last_component(canonicalpath)) < 0) goto cleanup; uuidstr = udev_device_get_sysname(dev); @@ -1100,7 +1100,7 @@ udevProcessMediatedDevice(struct udev_device *dev, ret = 0; cleanup: VIR_FREE(linkpath); - VIR_FREE(realpath); + VIR_FREE(canonicalpath); return ret; } -- 2.13.0

1 0

[libvirt] [PATCH] qemu: monitor: Don't bother extracting vCPU halted state in text monitor
by Peter Krempa 18 May '17

18 May '17

The code causes the 'offset' variable to be overwritten (possibly with NULL if neither of the vCPUs is halted) which causes a crash since the variable is still used after that part. Additionally there's a bug, since strstr() would look up the '(halted)' string in the whole string rather than just the currently processed line the returned data is completely bogus. Rather than switching to single line parsing let's remove the code altogether since it has a commonly used JSON monitor alternative and the data itself is not very useful to report. The code was introduced in commit cc5e695bde Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452106 --- src/qemu/qemu_monitor_text.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 9c9eeea01..66c94fbcd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -552,12 +552,6 @@ qemuMonitorTextQueryCPUs(qemuMonitorPtr mon, cpu.qemu_id = cpuid; cpu.tid = tid; - /* Extract halted indicator */ - if ((offset = strstr(line, "(halted)")) != NULL) - cpu.halted = true; - else - cpu.halted = false; - if (VIR_APPEND_ELEMENT_COPY(cpus, ncpus, cpu) < 0) { ret = -1; goto cleanup; -- 2.12.2

2 2

[libvirt] [PATCH 0/2] Couple of sparse streams improvements
by Michal Privoznik 18 May '17

18 May '17

News entry & one simple fix. Michal Privoznik (2): news: Document sparse streams virStream: Forbid negative seeks docs/news.xml | 10 ++++++++++ src/internal.h | 7 +++++++ src/rpc/virnetclientstream.c | 1 + src/util/virfdstream.c | 1 + 4 files changed, 19 insertions(+) -- 2.13.0

2 3

[libvirt] [PATCH v2 1/2] util: Deduplicate code in virNetlinkEventServiceStopAll
by Wang King 18 May '17

18 May '17

Commit 15a71e60 introduced the virNetlinkEventServiceStopAll function, and the code in virNetlinkEventServiceStop is copied to this function. can use virNetlinkEventServiceStop instead. --- src/util/virnetlink.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 92ecf77..fad1e8e 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -775,32 +775,13 @@ virNetlinkEventServiceStop(unsigned int protocol) int virNetlinkEventServiceStopAll(void) { - size_t i, j; + size_t i; virNetlinkEventSrvPrivatePtr srv = NULL; VIR_INFO("stopping all netlink event services"); - for (i = 0; i < MAX_LINKS; i++) { - srv = server[i]; - if (!srv) - continue; - - virNetlinkEventServerLock(srv); - nl_close(srv->netlinknh); - virNetlinkFree(srv->netlinknh); - virEventRemoveHandle(srv->eventwatch); - - for (j = 0; j < srv->handlesCount; j++) { - if (srv->handles[j].deleted == VIR_NETLINK_HANDLE_VALID) - virNetlinkEventRemoveClientPrimitive(j, i); - } - - server[i] = NULL; - virNetlinkEventServerUnlock(srv); - - virMutexDestroy(&srv->lock); - VIR_FREE(srv); - } + for (i = 0; i < MAX_LINKS; i++) + virNetlinkEventServiceStop(i); return 0; } -- 2.8.3

2 3

[libvirt] [PATCH v4 0/6] Add mdev reporting capability to the nodedev driver
by Erik Skultety 18 May '17

18 May '17

since v1: - dropped the <description> element from the parent device nested capability - added missing RNG schema and tests - updated the documentation to describe the MDEV elements in both the parent and the child since v2: - I further split our PCI sub-capability parser into more blocks as suggested - instead of one capability 'mdev' for both mdev device and physical parent I introduced 2, so we can do virsh nodedev-list --cap 'mdev_types' | 'mdev' to see either parent devices or the mediated devices themselves - other minor adjustments pointed out during review. since v3: - fixed nits - updated virsh man page to include mdev and mdev_types within the list of supported capabilities Erik Skultety (6): mdev: Pass a uuidstr rather than an mdev object to some util functions nodedev: conf: Split PCI sub-capability parsing to separate methods nodedev: Introduce new mdev_types and mdev nodedev capabilities nodedev: Introduce the mdev capability to a PCI parent device nodedev: Introduce mdev capability for mediated devices docs: Document the mediated devices within the nodedev driver docs/drvnodedev.html.in | 168 +++++++++++- docs/schemas/nodedev.rng | 43 +++ include/libvirt/libvirt-nodedev.h | 2 + src/conf/node_device_conf.c | 290 ++++++++++++++++----- src/conf/node_device_conf.h | 29 ++- src/conf/virnodedeviceobj.c | 11 +- src/libvirt-nodedev.c | 2 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 165 +++++++++++- src/qemu/qemu_domain.c | 8 +- src/security/security_apparmor.c | 10 +- src/security/security_dac.c | 20 +- src/security/security_selinux.c | 20 +- src/util/virmdev.c | 21 +- src/util/virmdev.h | 4 +- .../mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 8 + .../pci_0000_02_10_7_mdev_types.xml | 32 +++ tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 6 + tools/virsh.pod | 7 +- 21 files changed, 722 insertions(+), 129 deletions(-) create mode 100644 tests/nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml -- 2.13.0

2 15

[libvirt] [PATCH] pci: fix link maximum speed detection
by Marek Marczykowski-Górecki 18 May '17

18 May '17

Commit 8e09663 "pci: recognize/report GEN4 (PCIe 4.0) card 16GT/s Link speed" introduced another speed into enum, but mistakenly also altered field width, so one bit of link width was included there. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 83c7e74..2c1b758 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -147,7 +147,7 @@ struct _virPCIDeviceList { #define PCI_EXP_DEVCAP 0x4 /* Device capabilities */ #define PCI_EXP_DEVCAP_FLR (1<<28) /* Function Level Reset */ #define PCI_EXP_LNKCAP 0xc /* Link Capabilities */ -#define PCI_EXP_LNKCAP_SPEED 0x0001f /* Maximum Link Speed */ +#define PCI_EXP_LNKCAP_SPEED 0x0000f /* Maximum Link Speed */ #define PCI_EXP_LNKCAP_WIDTH 0x003f0 /* Maximum Link Width */ #define PCI_EXP_LNKSTA 0x12 /* Link Status */ #define PCI_EXP_LNKSTA_SPEED 0x000f /* Negotiated Link Speed */ -- 2.7.4

2 1

[libvirt] [PATCH] virDomainDefCheckABIStabilityFlags: Check for memoryBacking
by Michal Privoznik 18 May '17

18 May '17

https://bugzilla.redhat.com/show_bug.cgi?id=1450349 Problem is, memoryBacking is part of guest ABI. Therefore changing it on migration/restore from an image can lead qemu/guest to rejecting the image. At the same time, move other partial checks of virDomainMemtune into the same function: virDomainMemtuneCheckABIStability. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 101 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9eba70a95..89b93f4ad 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19786,6 +19786,80 @@ virDomainTPMDefCheckABIStability(virDomainTPMDefPtr src, return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); } + +static bool +virDomainMemtuneCheckABIStability(const virDomainDef *src, + const virDomainDef *dst, + unsigned int flags) +{ + if (virDomainDefGetMemoryInitial(src) != virDomainDefGetMemoryInitial(dst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain max memory %lld " + "does not match source %lld"), + virDomainDefGetMemoryInitial(dst), + virDomainDefGetMemoryInitial(src)); + return false; + } + + if (!(flags & VIR_DOMAIN_DEF_ABI_CHECK_SKIP_VOLATILE) && + src->mem.cur_balloon != dst->mem.cur_balloon) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain current memory %lld " + "does not match source %lld"), + dst->mem.cur_balloon, + src->mem.cur_balloon); + return false; + } + + if (src->mem.max_memory != dst->mem.max_memory) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target maximum memory size '%llu' " + "doesn't match source '%llu'"), + dst->mem.max_memory, + src->mem.max_memory); + return false; + } + + if (src->mem.memory_slots != dst->mem.memory_slots) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain memory slots " + "count '%u' doesn't match source '%u'"), + dst->mem.memory_slots, + src->mem.memory_slots); + return false; + } + + if (src->mem.source != dst->mem.source) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking source '%s' doesn't " + "match source memoryBacking source'%s'"), + virDomainMemorySourceTypeToString(dst->mem.source), + virDomainMemorySourceTypeToString(src->mem.source)); + return false; + } + + if (src->mem.access != dst->mem.access) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking access '%s' doesn't " + "match access memoryBacking access'%s'"), + virDomainMemoryAccessTypeToString(dst->mem.access), + virDomainMemoryAccessTypeToString(src->mem.access)); + return false; + } + + if (src->mem.allocation != dst->mem.allocation) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking allocation '%s' doesn't " + "match allocation memoryBacking allocation'%s'"), + virDomainMemoryAllocationTypeToString(dst->mem.allocation), + virDomainMemoryAllocationTypeToString(src->mem.allocation)); + return false; + } + + return true; +} + + static bool virDomainMemoryDefCheckABIStability(virDomainMemoryDefPtr src, virDomainMemoryDefPtr dst) @@ -19940,37 +20014,12 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, goto error; } - if (virDomainDefGetMemoryInitial(src) != virDomainDefGetMemoryInitial(dst)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain max memory %lld does not match source %lld"), - virDomainDefGetMemoryInitial(dst), - virDomainDefGetMemoryInitial(src)); + if (!virDomainMemtuneCheckABIStability(src, dst, flags)) goto error; - } - if (!(flags & VIR_DOMAIN_DEF_ABI_CHECK_SKIP_VOLATILE) && - src->mem.cur_balloon != dst->mem.cur_balloon) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain current memory %lld does not match source %lld"), - dst->mem.cur_balloon, src->mem.cur_balloon); - goto error; - } if (!virDomainNumaCheckABIStability(src->numa, dst->numa)) goto error; - if (src->mem.memory_slots != dst->mem.memory_slots) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory slots count '%u' doesn't match source '%u'"), - dst->mem.memory_slots, src->mem.memory_slots); - goto error; - } - if (src->mem.max_memory != dst->mem.max_memory) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target maximum memory size '%llu' doesn't match source '%llu'"), - dst->mem.max_memory, src->mem.max_memory); - goto error; - } - if (!virDomainDefVcpuCheckAbiStability(src, dst)) goto error; -- 2.13.0

2 1

[libvirt] [PATCH] docs: Update pointer to networking information
by Andrea Bolognani 18 May '17

18 May '17

Commit 6fb5dd4fd804 removed docs/archnetwork.html.in, but left behind a pointer to it in docs/formatnetwork.html.in. Update it so that it points to the wiki, which contains more detailed and recent information anyway. --- docs/formatnetwork.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 777c341..b410dd6 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -8,9 +8,9 @@ </ul> <p> - This page provides an introduction to the network XML format. For background - information on the concepts referred to here, consult the <a href="archnetwork.html">network driver architecture</a> - page. + This page provides an introduction to the network XML format. For + background information on the concepts referred to here, consult the + <a href="https://wiki.libvirt.org/page/Networking">relevant wiki page</a>. </p> <h2><a name="elements">Element and attribute overview</a></h2> -- 2.7.4

2 1

[libvirt] [PATCH v3 00/31] Implement sparse streams for libvirt
by Michal Privoznik 17 May '17

17 May '17

v3 of: https://www.redhat.com/archives/libvir-list/2017-April/msg00671.html All the patches can be found on my github: https://github.com/zippy2/libvirt/tree/sparse_streams2 diff to v2: - renamed APIs from Skip & GetHoleSize to SendHole & RecvHole - switched from 'unsigned long long len' to 'long long len' (where len is size of a hole) - introduced @flags to public APIs for future extensibility - couple of coding style fixes - couple of fixes suggested by John in review of v2 As expressed earlier, a lot of these patches should have Reviewed-by tag as John reviewed majority of them. But we don't have a clear agreement when to use the tag, so I'm not putting it in just yet. However, will do before pushing. Some patches were ACKed. However, changes described above changed them, so I'm not sure ACK still stands. Michal Privoznik (31): virfdstream: Use messages instead of pipe util: Introduce virFileInData Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSendHole Introduce virStreamRecvHole Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Add new flag to daemonCreateClientStream and virNetClientStreamNew RPC: Introduce virNetStreamHole Introduce VIR_NET_STREAM_HOLE message type Teach wireshark plugin about VIR_NET_STREAM_HOLE daemon: Introduce virNetServerProgramSendStreamHole virnetclientstream: Introduce virNetClientStreamSendHole daemon: Implement VIR_NET_STREAM_HOLE handling virnetclientstream: Introduce virNetClientStreamHandleHole remote_driver: Implement virStreamSendHole virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamRecvHole remote: Implement virStreamRecvHole virNetClientStream: Wire up VIR_NET_STREAM_HOLE remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream fdstream: Implement sparse stream gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload daemon/remote.c | 2 +- daemon/stream.c | 148 ++++++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 115 ++++++- src/driver-stream.h | 25 ++ src/esx/esx_stream.c | 16 +- src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 526 ++++++++++++++++++++++++++++++ src/libvirt_internal.h | 4 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 9 + src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 99 +++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 238 +++++++++++++- src/rpc/virnetclientstream.h | 18 +- src/rpc/virnetprotocol.x | 17 +- src/rpc/virnetserverprogram.c | 35 ++ src/rpc/virnetserverprogram.h | 8 + src/storage/storage_driver.c | 4 +- src/storage/storage_util.c | 10 +- src/util/virfdstream.c | 609 +++++++++++++++++++++++++++++++---- src/util/virfdstream.h | 1 + src/util/virfile.c | 82 +++++ src/util/virfile.h | 4 + src/virnetprotocol-structs | 5 + tests/virfiletest.c | 203 ++++++++++++ tools/virsh-util.c | 65 ++++ tools/virsh-util.h | 29 ++ tools/virsh-volume.c | 50 ++- tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 52 +++ tools/wireshark/src/packet-libvirt.h | 2 + 36 files changed, 2301 insertions(+), 126 deletions(-) -- 2.13.0

2 73

[libvirt] [PATCH] util: do not leak handles in stop netlink event service
by Wang King 17 May '17

17 May '17

handles stored in virNetlinkEventSrvPrivatePtr should be freed when stop netlink event service. --- src/util/virnetlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 92ecf77..b782cfa 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -758,6 +758,7 @@ virNetlinkEventServiceStop(unsigned int protocol) } server[protocol] = NULL; + VIR_FREE(srv->handles); virNetlinkEventServerUnlock(srv); virMutexDestroy(&srv->lock); @@ -796,6 +797,7 @@ virNetlinkEventServiceStopAll(void) } server[i] = NULL; + VIR_FREE(srv->handles); virNetlinkEventServerUnlock(srv); virMutexDestroy(&srv->lock); -- 2.8.3

2 1

[libvirt] [PATCH] virsh: add --io when attaching disks to guests
by Gordon Messmer 17 May '17

17 May '17

virt-install and virt-manager both default to explicitly setting "io='native'" in the disk "driver" tag. virsh, however, does not and also does not provide an option to specify that setting at all. As a result, disks use a different IO mechanism (the default, "threads") when attached post-setup using virsh. Adding this option allows users to keep disk performance consistent for disks attached at install, and those attached afterward. --- tools/virsh-domain.c | 14 +++++++++++--- tools/virsh.pod | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e..5c42021 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -267,6 +267,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("cache mode of disk device") }, + {.name = "io", + .type = VSH_OT_STRING, + .help = N_("io policy of disk device") + }, {.name = "type", .type = VSH_OT_STRING, .help = N_("target device type") @@ -504,8 +508,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *serial = NULL, - *straddr = NULL, *wwn = NULL, *targetbus = NULL; + *iothread = NULL, *cache = NULL, *io = NULL, + *serial = NULL, *straddr = NULL, *wwn = NULL, + *targetbus = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -537,6 +542,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || vshCommandOptStringReq(ctl, cmd, "iothread", &iothread) < 0 || vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || + vshCommandOptStringReq(ctl, cmd, "io", &io) < 0 || vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || @@ -579,7 +585,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, ">\n"); virBufferAdjustIndent(&buf, 2); - if (driver || subdriver || iothread || cache) { + if (driver || subdriver || iothread || cache || io) { virBufferAddLit(&buf, "<driver"); if (driver) @@ -590,6 +596,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, " iothread='%s'", iothread); if (cache) virBufferAsprintf(&buf, " cache='%s'", cache); + if (io) + virBufferAsprintf(&buf, " io='%s'", io); virBufferAddLit(&buf, "/>\n"); } diff --git a/tools/virsh.pod b/tools/virsh.pod index 727acf6..f46fb4a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2838,7 +2838,7 @@ expected. =item B<attach-disk> I<domain> I<source> I<target> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--targetbus bus>] [I<--driver driver>] [I<--subdriver subdriver>] [I<--iothread iothread>] -[I<--cache cache>] [I<--type type>] +[I<--cache cache>] [I<--io io>] [I<--type type>] [I<--mode mode>] [I<--sourcetype sourcetype>] [I<--serial serial>] [I<--wwn wwn>] [I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>] @@ -2865,6 +2865,7 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". +I<io> controls specific policies on I/O; qemu guests support "threads" and "native". I<iothread> is the number within the range of domain IOThreads to which this disk may be attached (QEMU only). I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. -- 2.9.3

2 3

[libvirt] [PATCH v2] qemu: Adding 'downscript' feature for QEMU network interfaces.
by Julio Faracco 17 May '17

17 May '17

This commit adds the support for 'downscript' feature: - For QEMU command line with the option: '-net downscript=/etc/qemu-ifdown,...'. - For Domains with a network interface description: '<interface type='ethernet'> ... <downscript path='/etc/qemu-ifdown'/> ... </interface>' The options 'script' and 'downscript' accept the argument 'no' to disable the script executions. The way that the code was implemented, the XML file accepts '<[down]script path='no'>' to solve this problem. This commit updates the tests and documentation too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=825939 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/formatdomain.html.in | 1 + docs/schemas/domaincommon.rng | 8 ++++++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_parse_command.c | 4 ++++ tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml | 1 + tests/qemuargv2xmldata/qemuargv2xml-net-eth.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 1 + 13 files changed, 35 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8c884f4..89fe86d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4663,6 +4663,7 @@ <interface type='ethernet'> <target dev='vnet7'/> <script path='/etc/qemu-ifup-mynet'/> + <downscript path='/etc/qemu-ifdown-mynet'/> </interface> </devices> ...</pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 281309e..2f88dda 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2609,6 +2609,14 @@ </element> </optional> <optional> + <element name="downscript"> + <attribute name="path"> + <ref name="filePath"/> + </attribute> + <empty/> + </element> + </optional> + <optional> <element name="backenddomain"> <attribute name="name"> <ref name="domainName"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ff216e..32d5720 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1935,6 +1935,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->backend.vhost); VIR_FREE(def->virtPortProfile); VIR_FREE(def->script); + VIR_FREE(def->downscript); VIR_FREE(def->domain_name); VIR_FREE(def->ifname); VIR_FREE(def->ifname_guest); @@ -9589,6 +9590,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *ifname_guest = NULL; char *ifname_guest_actual = NULL; char *script = NULL; + char *downscript = NULL; char *address = NULL; char *port = NULL; char *localaddr = NULL; @@ -9761,6 +9763,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); + } else if (!downscript && + xmlStrEqual(cur->name, BAD_CAST "downscript")) { + downscript = virXMLPropString(cur, "path"); } else if (!domain_name && xmlStrEqual(cur->name, BAD_CAST "backenddomain")) { domain_name = virXMLPropString(cur, "name"); @@ -10074,6 +10079,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->script = script; script = NULL; } + if (downscript != NULL) { + def->downscript = downscript; + downscript = NULL; + } if (domain_name != NULL) { def->domain_name = domain_name; domain_name = NULL; @@ -10356,6 +10365,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(dev); virDomainActualNetDefFree(actual); VIR_FREE(script); + VIR_FREE(downscript); VIR_FREE(bridge); VIR_FREE(model); VIR_FREE(backend); @@ -22158,6 +22168,9 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<script path='%s'/>\n", def->script); + if (def->downscript) + virBufferEscapeString(buf, "<downscript path='%s'/>\n", + def->downscript); virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name); if (def->ifname && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09fb7aa..9deca76 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1024,6 +1024,7 @@ struct _virDomainNetDef { unsigned long sndbuf; } tune; char *script; + char *downscript; char *domain_name; /* backend domain name */ char *ifname; /* interface name on the host (<target dev='x'/>) */ virNetDevIPInfo hostIP; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index af9063c..d773917 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1060,6 +1060,10 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, def->script = values[i]; values[i] = NULL; } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + STREQ(keywords[i], "downscript") && STRNEQ(values[i], "")) { + def->downscript = values[i]; + values[i] = NULL; + } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && STREQ(keywords[i], "ifname")) { def->ifname = values[i]; values[i] = NULL; diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args index 4d74ae4..5d7129c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,ifname=nic02,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml index fa9a892..8e04efb 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args index 89eb4c1..0e3fa21 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml index 57c4be8..d177ca8 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index dd0d752..21d8259 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 48acadf..9f40122 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml index c36baa0..b71fd5a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml index 898bda6..c55cd68 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> -- 2.7.4

3 6

[libvirt] [PATCH] qemu: driver: Allow passing disk target as top image with block commit
by Peter Krempa 17 May '17

17 May '17

Since we allow active layer block commit the users are allowed to commit the top of the chain (e.g. vda) into the backing image. The API would not accept that parameter, as it tried to look up the image in the backing chain. Add the ability to use the top level image target name explicitly as the top image of the block commit operation. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451394 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1c4873e48..36d8a701a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16942,7 +16942,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (qemuDomainDiskBlockJobIsActive(disk)) goto endjob; - if (!top) + if (!top || STREQ(top, disk->dst)) topSource = disk->src; else if (virStorageFileParseChainIndex(disk->dst, top, &topIndex) < 0 || !(topSource = virStorageFileChainLookup(disk->src, NULL, -- 2.12.2

2 2

Re: [libvirt] [PATCH v3 08/31] Introduce virStreamSparseRecvAll
by Michal Privoznik 17 May '17

17 May '17

On 05/16/2017 11:34 PM, John Ferlan wrote: > > > On 05/16/2017 10:03 AM, Michal Privoznik wrote: >> This is just a wrapper over new functions that have been just >> introduced: virStreamRecvFlags(), virStreamRecvHole(). It's very >> similar to virStreamRecvAll() except it handles sparse streams >> well. >> >> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> >> --- >> include/libvirt/libvirt-stream.h | 33 ++++++++++- >> src/libvirt-stream.c | 123 +++++++++++++++++++++++++++++++++++++++ >> src/libvirt_public.syms | 1 + >> 3 files changed, 154 insertions(+), 3 deletions(-) >> > > [...] > >> diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c >> index bedb6159a..6bf4c4f29 100644 >> --- a/src/libvirt-stream.c >> +++ b/src/libvirt-stream.c >> @@ -668,6 +668,129 @@ virStreamRecvAll(virStreamPtr stream, >> } >> >> >> +/** >> + * virStreamSparseRecvAll: >> + * @stream: pointer to the stream object >> + * @handler: sink callback for writing data to application >> + * @holeHandler: stream hole callback for skipping holes >> + * @opaque: application defined data >> + * >> + * Receive the entire data stream, sending the data to the >> + * requested data sink @handler and calling the skip @holeHandler >> + * to generate holes for sparse stream targets. This is simply a >> + * convenient alternative to virStreamRecvFlags, for apps that do >> + * blocking-I/O. >> + * >> + * An example using this with a hypothetical file download >> + * API looks like: >> + * >> + * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { >> + * int *fd = opaque; >> + * >> + * return write(*fd, buf, nbytes); >> + * } >> + * >> + * int myskip(virStreamPtr st, long long offset, void *opaque) { >> + * int *fd = opaque; >> + * > > I think this is where perhaps the example of lseek in "off_t" chunks of > "long long offset" would be applicable... Perhaps why I ended up in the > off_t rathole before. Not sure what you mean. long long is the same size as off_t for any application that enables large file support (libvirt does that) or is compiled on 64bits. Any 32bit virt mgmt application should really enable large file support, otherwise is pretty useless. > >> + * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; >> + * } >> + * >> + * virStreamPtr st = virStreamNew(conn, 0); >> + * int fd = open("demo.iso", O_WRONLY); >> + * >> + * virConnectDownloadSparseFile(conn, st); > > ^^ This API doesn't exist... Of course neither did > virConnectDownloadFile from whence you copied the example. Maybe both > should be 'adjusted'. Maybe. One day. For now I'm happy with this example as-is. The example should show how to set up virStreamSparseRecvAll. Michal

2 1

[libvirt] [PATCH python] Fix virStream.sendAll for Python 3
by Xavier Fernandez 17 May '17

17 May '17

In Python 3, if the file is open in binary mode, ``got`` will end up being equal to b"" and b"" != "" in Python 3. --- libvirt-override-virStream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py index c328154..2e77cc7 100644 --- a/libvirt-override-virStream.py +++ b/libvirt-override-virStream.py @@ -83,7 +83,7 @@ pass raise e - if got == "": + if not got: break ret = self.send(got) -- 2.12.2

2 2

[libvirt] [PATCH 0/1] Enable Travis build status icon
by Claudio André 17 May '17

17 May '17

Follow up of the recent 'work in progress' announced in "Enable CI build testing with Travis" mailing message. Claudio André (1): Enable Travis CI build status icon README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 README.md -- 2.11.0

3 6

Re: [libvirt] [PATCH v3 08/31] Introduce virStreamSparseRecvAll
by John Ferlan 17 May '17

17 May '17

I was wondering why this never made it to the list - seems I just sent it to Michal... So here's what I sent... John On 05/16/2017 05:34 PM, John Ferlan wrote: > > > On 05/16/2017 10:03 AM, Michal Privoznik wrote: >> This is just a wrapper over new functions that have been just >> introduced: virStreamRecvFlags(), virStreamRecvHole(). It's very >> similar to virStreamRecvAll() except it handles sparse streams >> well. >> >> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> >> --- >> include/libvirt/libvirt-stream.h | 33 ++++++++++- >> src/libvirt-stream.c | 123 +++++++++++++++++++++++++++++++++++++++ >> src/libvirt_public.syms | 1 + >> 3 files changed, 154 insertions(+), 3 deletions(-) >> > > [...] > >> diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c >> index bedb6159a..6bf4c4f29 100644 >> --- a/src/libvirt-stream.c >> +++ b/src/libvirt-stream.c >> @@ -668,6 +668,129 @@ virStreamRecvAll(virStreamPtr stream, >> } >> >> >> +/** >> + * virStreamSparseRecvAll: >> + * @stream: pointer to the stream object >> + * @handler: sink callback for writing data to application >> + * @holeHandler: stream hole callback for skipping holes >> + * @opaque: application defined data >> + * >> + * Receive the entire data stream, sending the data to the >> + * requested data sink @handler and calling the skip @holeHandler >> + * to generate holes for sparse stream targets. This is simply a >> + * convenient alternative to virStreamRecvFlags, for apps that do >> + * blocking-I/O. >> + * >> + * An example using this with a hypothetical file download >> + * API looks like: >> + * >> + * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { >> + * int *fd = opaque; >> + * >> + * return write(*fd, buf, nbytes); >> + * } >> + * >> + * int myskip(virStreamPtr st, long long offset, void *opaque) { >> + * int *fd = opaque; >> + * > > I think this is where perhaps the example of lseek in "off_t" chunks of > "long long offset" would be applicable... Perhaps why I ended up in the > off_t rathole before. > >> + * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; >> + * } >> + * >> + * virStreamPtr st = virStreamNew(conn, 0); >> + * int fd = open("demo.iso", O_WRONLY); >> + * >> + * virConnectDownloadSparseFile(conn, st); > > ^^ This API doesn't exist... Of course neither did > virConnectDownloadFile from whence you copied the example. Maybe both > should be 'adjusted'. > > > Reviewed-by: John Ferlan <jferlan(a)redhat.com> > > John > >> + * if (virStreamSparseRecvAll(st, mysink, myskip, &fd) < 0) { >> + * ...report an error ... >> + * goto done; >> + * } >> + * if (virStreamFinish(st) < 0) >> + * ...report an error... >> + * virStreamFree(st); >> + * close(fd); >> + * >> + * Note that @opaque data is shared between both @handler and >> + * @holeHandler callbacks. >> + * >> + * Returns 0 if all the data was successfully received. The caller >> + * should invoke virStreamFinish(st) to flush the stream upon >> + * success and then virStreamFree(st). >> + * >> + * Returns -1 upon any error, with virStreamAbort() already >> + * having been called, so the caller need only call virStreamFree(). >> + */ > > > [...] >

1 0

[libvirt] set link state for ethernet network devices
by Vasiliy Tolstov 17 May '17

17 May '17

Hi! Sometimes ago i'm write patch for setting link state of network interface for ethernet type (tap). Now i'm try libvirt 3.3.0 and see, that tap interfaces is up but in xml i'm try to specify <link state='down'> also i'm try <source><link state='down'></source> Nothing changed. Laine says, that link state is only for internal representation, and to modify link state on host side i need to specify <source><link state='down'></source>. For history please check email thread "qemu: remove unnecessary setting of tap device online state" So does this bug or it my mistake? Thanks! -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 2

[libvirt] [PATCH v3] qemu: Report shutdown event details
by Martin Kletzander 16 May '17

16 May '17

QEMU will likely report the details of it shutting down, particularly whether the shutdown was initiated by the guest or host. We should forward that information along, at least for shutdown events. Reset has that as well, however that is not a lifecycle event and would add extra constants that might not be used. It can be added later on. Since the only way we can extend information provided to the user is adding event details, we might as well emit multiple events (one with the reason for the shutdown and keep the one for the shutdown being finished for clarity and compatibility). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1384007 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - don't send two events, just change the detail for the existing one v2: - adapt to newer patches This is not in qemu master yet; if ACKed it will not be pushed before the appropriate patches hit qemu master. examples/object-events/event-test.c | 6 ++++++ include/libvirt/libvirt-domain.h | 11 ++++++++++- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 10 ++++++++-- src/qemu/qemu_process.c | 21 +++++++++++++++++++-- tools/virsh-domain.c | 4 +++- 7 files changed, 51 insertions(+), 10 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 12690cac09ce..78d200806601 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -240,6 +240,12 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; + case VIR_DOMAIN_EVENT_SHUTDOWN_GUEST: + return "Guest request"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_HOST: + return "Host request"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c9e96a6c90bc..720db32f7663 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2983,7 +2983,16 @@ typedef enum { * Details on the cause of a 'shutdown' lifecycle event */ typedef enum { - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ + /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, + + /* Domain finished shutting down after request from the guest itself + * (e.g. hardware-specific action) */ + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST = 1, + + /* Domain finished shutting down after request from the host (e.g. killed by + * a signal) */ + VIR_DOMAIN_EVENT_SHUTDOWN_HOST = 2, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_SHUTDOWN_LAST diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2148d483ed6a..a2de1a6c5bad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1326,13 +1326,13 @@ qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int -qemuMonitorEmitShutdown(qemuMonitorPtr mon) +qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; - VIR_DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p guest=%u", mon, guest); mon->willhangup = 1; - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12f98beba763..8956bf929aaa 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -130,6 +130,7 @@ typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + virTristateBool guest, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -344,7 +345,7 @@ int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); -int qemuMonitorEmitShutdown(qemuMonitorPtr mon); +int qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 083729003ba3..757595dd7472 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -523,9 +523,15 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorEmitShutdown(mon); + bool guest = false; + virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; + + if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + + qemuMonitorEmitShutdown(mon, guest_initiated); } static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c19bd292596a..e9c4e38abfb2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,12 +634,14 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int detail = 0; VIR_DEBUG("vm=%p", vm); @@ -662,9 +664,24 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST; + break; + + case VIR_TRISTATE_BOOL_NO: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST; + break; + + default: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED; + break; + } + event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SHUTDOWN, - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); + VIR_DOMAIN_EVENT_SHUTDOWN, + detail); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e0126e..0e5d8e3c242c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12249,7 +12249,9 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Finished after guest request"), + N_("Finished after host request")) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.13.0

2 1