- Devel - libvirt List Archives

[libvirt] [PATCH] util: relax virNetDevSetCoalesce() stub
by Roman Bogorodskiy 24 Apr '17

24 Apr '17

Currently, virNetDevSetCoalesce() stub is always returning error. As it's used by virNetDevTapCreateInBridgePort(), it essentially breaks bridged networking if coalesce is not supported. To make it work, relax the stub to trigger error only when its coalesce argument is not NULL, otherwise report success. --- src/util/virnetdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 131a56a8d..131c4d983 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3155,8 +3155,11 @@ int virNetDevSetCoalesce(const char *ifname, } # else int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED) + virNetDevCoalescePtr coalesce) { + if (!coalesce) + return 0; + virReportSystemError(ENOSYS, _("Cannot set coalesce info on interface '%s'"), ifname); -- 2.11.0

2 2

[libvirt] [PATCH] Fix minor typos
by Yuri Chornoivan 24 Apr '17

24 Apr '17

Hi, Attached is a minor fix for the typos in libvirt's git/master. Best regards, Yuri P. S. Sorry for the lame format. My mail provider rejects direct sending emails from git send.

2 1

[libvirt] [PATCH go-xml] Support for filesystem devices
by Ryan Goodfellow 24 Apr '17

24 Apr '17

This commit adds filesystem device support. A new family of types DomainFilesystem* are introduced and plumbed into the DomainDeviceList struct. Testing has also been included. --- domain.go | 40 ++++++++++++++++++++++++++++++++++++++++ domain_test.go | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/domain.go b/domain.go index 307c71c..cccd9a6 100644 --- a/domain.go +++ b/domain.go @@ -81,6 +81,45 @@ type DomainDisk struct { Target *DomainDiskTarget `xml:"target"` } +type DomainFilesystemDriver struct { + Type string `xml:"type,attr"` + Name string `xml:"name,attr,omitempty"` + WRPolicy string `xml:"wrpolicy,attr,omitempty"` +} + +type DomainFilesystemSource struct { + Dir string `xml:"dir,attr,omitempty"` + File string `xml:"file,attr,omitempty"` +} + +type DomainFilesystemTarget struct { + Dir string `xml:"dir,attr"` +} + +type DomainFilesystemReadOnly struct { +} + +type DomainFilesystemSpaceHardLimit struct { + Value int `xml:",chardata"` + Unit string `xml:"unit,attr,omitempty"` +} + +type DomainFilesystemSpaceSoftLimit struct { + Value int `xml:",chardata"` + Unit string `xml:"unit,attr,omitempty"` +} + +type DomainFilesystem struct { + Type string `xml:"type,attr"` + AccessMode string `xml:"accessmode,attr"` + Driver *DomainFilesystemDriver `xml:"driver"` + Source *DomainFilesystemSource `xml:"source"` + Target *DomainFilesystemTarget `xml:"target"` + ReadOnly *DomainFilesystemReadOnly `xml:"readonly"` + SpaceHardLimit *DomainFilesystemSpaceHardLimit `xml:"space_hard_limit"` + SpaceSoftLimit *DomainFilesystemSpaceSoftLimit `xml:"space_soft_limit"` +} + type DomainInterfaceMAC struct { Address string `xml:"address,attr"` } @@ -212,6 +251,7 @@ type DomainVideo struct { type DomainDeviceList struct { Controllers []DomainController `xml:"controller"` Disks []DomainDisk `xml:"disk"` + Filesystems []DomainFilesystem `xml:"filesystem"` Interfaces []DomainInterface `xml:"interface"` Serials []DomainChardev `xml:"serial"` Consoles []DomainChardev `xml:"console"` diff --git a/domain_test.go b/domain_test.go index e5347ea..06d585c 100644 --- a/domain_test.go +++ b/domain_test.go @@ -690,6 +690,61 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Filesystems: []DomainFilesystem{ + DomainFilesystem{ + Type: "mount", + AccessMode: "mapped", + Driver: &DomainFilesystemDriver{ + Type: "path", + WRPolicy: "immediate", + }, + Source: &DomainFilesystemSource{ + Dir: "/home/user/test", + }, + Target: &DomainFilesystemTarget{ + Dir: "user-test-mount", + }, + }, + DomainFilesystem{ + Type: "file", + AccessMode: "passthrough", + Driver: &DomainFilesystemDriver{ + Name: "loop", + Type: "raw", + }, + Source: &DomainFilesystemSource{ + File: "/home/user/test.img", + }, + Target: &DomainFilesystemTarget{ + Dir: "user-file-test-mount", + }, + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <filesystem type="mount" accessmode="mapped">`, + ` <driver type="path" wrpolicy="immediate"></driver>`, + ` <source dir="/home/user/test"></source>`, + ` <target dir="user-test-mount"></target>`, + ` </filesystem>`, + ` <filesystem type="file" accessmode="passthrough">`, + ` <driver type="raw" name="loop"></driver>`, + ` <source file="/home/user/test.img"></source>`, + ` <target dir="user-file-test-mount"></target>`, + ` </filesystem>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.11.0

2 3

[libvirt] [PATCH] [PATCH] rpc: fix keep alive timer segfault
by Yi Wang 24 Apr '17

24 Apr '17

ka maybe have been freeed in virObjectUnref, application using virKeepAliveTimer will segfault when unlock ka. We should keep ka's refs positive before using it. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/rpc/virkeepalive.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index c9faf88..4f666fd 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -160,17 +160,17 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) bool dead; void *client; + virObjectRef(ka); virObjectLock(ka); client = ka->client; dead = virKeepAliveTimerInternal(ka, &msg); + virObjectUnlock(ka); + if (!dead && !msg) goto cleanup; - virObjectRef(ka); - virObjectUnlock(ka); - if (dead) { ka->deadCB(client); } else if (ka->sendCB(client, msg) < 0) { @@ -178,11 +178,8 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) virNetMessageFree(msg); } - virObjectLock(ka); - virObjectUnref(ka); - cleanup: - virObjectUnlock(ka); + virObjectUnref(ka); } -- 1.8.3.1

4 5

[libvirt] [PATCH v2 0/2] Fix possible use-after-free when sending event message
by John Ferlan 24 Apr '17

24 Apr '17

v1: https://www.redhat.com/archives/libvir-list/2017-March/msg01228.html Change since v1, add the derefFcn as an argument to the renamed macro (not quite sure how I missed that originally. John Ferlan (2): daemon: Rework remoteClientFreeFunc cleanup loops into C macro remote: Fix possible use-after-free when sending event message daemon/remote.c | 164 ++++++++++++++++++++------------------------------------ 1 file changed, 58 insertions(+), 106 deletions(-) -- 2.9.3

3 7

[libvirt] [PATCH] util: fix virNetDevSetCoalesce fallback on Win32/FreeBSD
by Daniel P. Berrange 23 Apr '17

23 Apr '17

The current fallback stub for virNetDevSetCoalesce is inside an earlier conditional block. This deals with the feature being missing on older Linux platforms. We need a second fallback stub though, outside the top level conditional, to ensure builds work on Win32/FreeBSD platforms too. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix src/util/virnetdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6ff1b48..27f1637 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3207,6 +3207,15 @@ virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED, ifname); return 0; } + +int virNetDevSetCoalesce(const char *ifname, + virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set coalesce info on interface '%s'"), + ifname); + return -1; +} #endif -- 2.9.3

3 3

[libvirt] [PATCH] Remove pointless check for !ret in virDomainNetDefCoalesceParseXML
by Martin Kletzander 22 Apr '17

22 Apr '17

It was left there after removing a macro it was part of in first version or so. Now it will always be NULL. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4a777d67bfad..7d3cf178eaf6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6789,7 +6789,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, if (!str) goto cleanup; - if (!ret && VIR_ALLOC(ret) < 0) + if (VIR_ALLOC(ret) < 0) goto cleanup; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { -- 2.12.2

1 0

[libvirt] [PATCH] Don't leak str in virDomainNetDefCoalesceParseXML
by Martin Kletzander 22 Apr '17

22 Apr '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cbeebdc56880..4a777d67bfad 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6811,6 +6811,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, ret->rx_max_coalesced_frames = tmp; cleanup: + VIR_FREE(str); ctxt->node = save; return ret; -- 2.12.2

1 0

[libvirt] [PATCH v2 0/3] Add support for coalesce settings on interfaces
by Martin Kletzander 22 Apr '17

22 Apr '17

In linux this is supported since 4.11-rc3, I tested it with 4.11.0-rc5-next-20170407. The particular patch can be found here: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?… Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414627 In this version the XML is different so that there are no underscores (and it's actually more readable, IMHO). Plus some minor adjustments needed after rebase. Martin Kletzander (3): util: Add virNetDevSetCoalesce function conf, docs: Add support for coalesce setting(s) Set coalesce settings for domain interfaces configure.ac | 3 +- docs/formatdomain.html.in | 24 ++++ docs/schemas/domaincommon.rng | 131 +++++++++++++++++++++ src/bhyve/bhyve_command.c | 2 +- src/conf/domain_conf.c | 80 +++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_domain.c | 31 +++++ src/qemu/qemu_interface.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/virnetdev.c | 83 +++++++++++++ src/util/virnetdev.h | 34 ++++++ src/util/virnetdevtap.c | 5 + src/util/virnetdevtap.h | 2 + tests/bhyvexml2argvmock.c | 1 + .../qemuxml2argvdata/qemuxml2argv-net-coalesce.xml | 68 +++++++++++ .../qemuxml2xmlout-net-coalesce.xml | 71 +++++++++++ tests/qemuxml2xmltest.c | 1 + 19 files changed, 540 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml -- 2.12.2

3 8

[libvirt] [PATCH v2 0/5] Hyper-V method invocation
by Sri Ramanujam 22 Apr '17

22 Apr '17

Changes from v1: * Removed unneeded util function Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 182 +++++++ src/hyperv/hyperv_wmi.c | 879 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 93 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1306 insertions(+), 2 deletions(-) -- 2.9.3

2 7