- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix ATTRIBUTE_NONNULL for qemuMonitorAddObject
by John Ferlan 12 Jul '18

12 Jul '18

Commit id fac0dacd was trying to make things more robust; however, the ATTRIBUTE_NONNULL(1) would be for the @mon, not the intended (2) and the @props argument as described in the commit message. Found by Coverity build. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial and Coverity build breaker. src/qemu/qemu_monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index e8ed2d044c..81474a04f6 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -824,7 +824,7 @@ int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret, int qemuMonitorAddObject(qemuMonitorPtr mon, virJSONValuePtr *props, char **alias) - ATTRIBUTE_NONNULL(1); + ATTRIBUTE_NONNULL(2); int qemuMonitorDelObject(qemuMonitorPtr mon, const char *objalias); -- 2.17.1

1 0

[libvirt] [PATCH v2] New virsh feature: domif-setlink --domain --interface --state completer
by Simon Kobyda 12 Jul '18

12 Jul '18

After you go through command mentioned above, completer finds what state the device is currently in, and suggests an opposite state. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- Changes in V2: - Added "Signed-off-by" - Changed format of commit message to make it more readable tools/virsh-completer.c | 73 ++++++++++++++++++++++++++++++++++++++++- tools/virsh-completer.h | 4 +++ tools/virsh-domain.c | 1 + 3 files changed, 77 insertions(+), 1 deletion(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..e32fd82211 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -32,6 +32,7 @@ #include "internal.h" #include "virutil.h" #include "viralloc.h" +#include "virmacaddr.h" #include "virstring.h" #include "virxml.h" @@ -750,7 +751,6 @@ virshDomainEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } - char ** virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd ATTRIBUTE_UNUSED, @@ -776,6 +776,77 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, return NULL; } +char ** +virshDomainInterfaceStateCompleter(vshControl *ctl ATTRIBUTE_UNUSED, + const vshCmd *cmd ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virshControlPtr priv = ctl->privData; + const char *iface = NULL; + char **ret = NULL; + xmlDocPtr xml = NULL; + virMacAddr macaddr; + char *state = NULL; + char *xpath = NULL; + char macstr[18] = ""; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *interfaces = NULL; + int ninterfaces; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <= 0) + return NULL; + + if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) + goto cleanup; + + if (virshDomainGetXML(ctl, cmd, flags, &xml, &ctxt) < 0) + goto cleanup; + + /* normalize the mac addr */ + if (virMacAddrParse(iface, &macaddr) == 0) + virMacAddrFormat(&macaddr, macstr); + + if (virAsprintf(&xpath, "/domain/devices/interface[(mac/@address = '%s') or " + " (target/@dev = '%s')]", + macstr, iface) < 0) + goto cleanup; + + if ((ninterfaces = virXPathNodeSet(xpath, ctxt, &interfaces)) < 0) + goto cleanup; + + if (ninterfaces != 1) + goto cleanup; + + ctxt->node = interfaces[0]; + + if (VIR_ALLOC_N(ret, 2) < 0) + goto error; + + if ((state = virXPathString("string(./link/@state)", ctxt)) && + STREQ(state, "down")) { + if (VIR_STRDUP(ret[0], "up") < 0) + goto error; + } else { + if (VIR_STRDUP(ret[0], "down") < 0) + goto error; + } + + cleanup: + VIR_FREE(state); + VIR_FREE(interfaces); + VIR_FREE(xpath); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + return ret; + + error: + virStringListFree(ret); + ret = NULL; + goto cleanup; +} + char ** virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 1c14bb2a54..b4fd2a86c6 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -94,6 +94,10 @@ char ** virshPoolEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); +char ** virshDomainInterfaceStateCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); + char ** virshNodedevEventNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3959b5475b..8adec1d9b1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3064,6 +3064,7 @@ static const vshCmdOptDef opts_domif_setlink[] = { {.name = "state", .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, + .completer = virshDomainInterfaceStateCompleter, .help = N_("new state of the device") }, {.name = "persistent", -- 2.17.1

2 1

[libvirt] [PATCH 0/8] qemu: Sanitize monitor code to create snapshots
by Peter Krempa 12 Jul '18

12 Jul '18

Require that the 'transaction' command is present for external snapshots to work and remove the various hacks which were present to make it work without that. Peter Krempa (8): qemu: snapshot: Require support of 'transaction' command for external snapshots qemu: snapshot: Remove monitor code now that 'transaction' is always used qemu: snapshot: Unify conditions checking whether snapshot needs to be taken qemu: snapshot: Audit actual disk snapshot creation qemu: monitor: Add API to help creating 'transaction' arguments qemu: block: Create helper for creating data for legacy snapshots qemu: monitor: Remove old external snapshot code qemu: monitor: Remove old code for dual handling of 'transaction' data src/qemu/qemu_block.c | 37 +++++++++++++ src/qemu/qemu_block.h | 6 ++ src/qemu/qemu_driver.c | 128 ++++++++++++------------------------------- src/qemu/qemu_monitor.c | 17 ------ src/qemu/qemu_monitor.h | 6 -- src/qemu/qemu_monitor_json.c | 125 +++++++++++++++++++----------------------- src/qemu/qemu_monitor_json.h | 12 ++-- 7 files changed, 138 insertions(+), 193 deletions(-) -- 2.16.2

2 16

[libvirt] [PATCH v2] completer: Doesn't alloc enough space for null terminated array of strings
by Simon Kobyda 12 Jul '18

12 Jul '18

Functions virshSecretEventNameCompleter, virshPoolEventNameCompleter, virshNodedevEventNameCompleter allocates only enough space for array of N strings. However these are null terminated strings, so program needs to alloc space for array of N+1 strings. How to replicate error: valgrind virsh, use completer for '-nodedev-event --event' or '-pool-event --event' or '-secret-event --event'. Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- Changes in V2: - Added "Signed-off-by" - Changed format of commit message to make it more readable tools/virsh-completer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..be59ea2e82 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -709,7 +709,7 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) { @@ -761,7 +761,7 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) { @@ -787,7 +787,7 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { -- 2.17.1

2 1

[libvirt] [PATCH] completer: Doesn't alloc enough space for null terminated array of strings
by Simon Kobyda 12 Jul '18

12 Jul '18

Functions virshSecretEventNameCompleter, virshPoolEventNameCompleter, virshNodedevEventNameCompleter allocates only enough space for array of N strings. However these are null terminated strings, so program needs to alloc space for array of N+1 strings. How to replicate error: valgrind virsh, use completer for '-nodedev-event --event' or '-pool-event --event' or '-secret-event --event'. --- tools/virsh-completer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index 2327e08340..be59ea2e82 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -709,7 +709,7 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_SECRET_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_SECRET_EVENT_ID_LAST; i++) { @@ -761,7 +761,7 @@ virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_STORAGE_POOL_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_STORAGE_POOL_EVENT_ID_LAST; i++) { @@ -787,7 +787,7 @@ virshNodedevEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, virCheckFlags(0, NULL); - if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST) < 0) + if (VIR_ALLOC_N(ret, VIR_NODE_DEVICE_EVENT_ID_LAST + 1) < 0) goto error; for (i = 0; i < VIR_NODE_DEVICE_EVENT_ID_LAST; i++) { -- 2.17.1

2 1

[libvirt] [PATCH] examples: Add clean-traffic-gateway into nwfilters
by Ales Musil 12 Jul '18

12 Jul '18

This filter should be used to limit traffic between VMs based on their MAC adddresses. The MAC address can be set with GATEWAY_MAC and mask with GATEWAY_MAC_MASK variable. Signed-off-by: Ales Musil <amusil(a)redhat.com> --- examples/xml/nwfilter/clean-traffic-gateway.xml | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 examples/xml/nwfilter/clean-traffic-gateway.xml diff --git a/examples/xml/nwfilter/clean-traffic-gateway.xml b/examples/xml/nwfilter/clean-traffic-gateway.xml new file mode 100644 index 0000000..d1e7c81 --- /dev/null +++ b/examples/xml/nwfilter/clean-traffic-gateway.xml @@ -0,0 +1,36 @@ +<filter name='clean-traffic-gateway'> +  + <filterref filter='no-mac-spoofing'/> + +  + <filterref filter='no-ip-spoofing'/> + +  + <filterref filter='no-arp-spoofing'/> + +  + <rule action='accept' direction='inout' priority='-500'> + <mac protocolid='arp'/> + </rule> + +  + <rule action='accept' direction='in'> + <mac match='yes' srcmacaddr='$GATEWAY_MAC' + srcmacmask='$GATEWAY_MAC_MASK'/> + </rule> + +  + <rule action='accept' direction='out'> + <mac match='yes' dstmacaddr='$GATEWAY_MAC' + dstmacmask='$GATEWAY_MAC_MASK'/> + </rule> + +  + <filterref filter='no-other-l2-traffic'/> + +  + <filterref filter='qemu-announce-self'/> +</filter> -- 1.8.3.1

1 0

[libvirt] [PATCH v1] storage: prefer using newDef to save configfile
by Shichangkuo 12 Jul '18

12 Jul '18

When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile. Signed-off-by: shichangkuo <shi.changkuo(a)h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 254818e..8070d15 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -810,13 +810,14 @@ storagePoolDefineXML(virConnectPtr conn, if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj); - if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj = NULL; + newDef = NULL; goto cleanup; } @@ -826,6 +827,7 @@ storagePoolDefineXML(virConnectPtr conn, VIR_INFO("Defining storage pool '%s'", def->name); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); + newDef = NULL; cleanup: virObjectEventStateQueue(driver->storageEventState, event); -- 1.7.9.5 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

1 0

Re: [libvirt] opening tap devices that are created in a container
by Jason Baron 12 Jul '18

12 Jul '18

On 07/11/2018 06:10 AM, nert@wheatley wrote: > On Mon, Jul 09, 2018 at 05:00:49PM -0400, Jason Baron wrote: >> >> >> On 07/08/2018 02:01 AM, Martin Kletzander wrote: >>> On Thu, Jul 05, 2018 at 06:24:20PM +0200, Roman Mohr wrote: >>>> On Thu, Jul 5, 2018 at 4:20 PM Jason Baron <jbaron(a)akamai.com> wrote: >>>> >>>>> Hi, >>>>> >>>>> Opening tap devices, such as macvtap, that are created in >>>>> containers is >>>>> problematic because the interface for opening tap devices is via >>>>> /dev/tapNN and devtmpfs is not typically mounted inside a container as >>>>> its not namespace aware. It is possible to do a mknod() in the >>>>> container, once the tap devices are created, however, since the tap >>>>> devices are created dynamically its not possible to apriori allow >>>>> access >>>>> to certain major/minor numbers, since we don't know what these are >>>>> going >>>>> to be. In addition, its desirable to not allow the mknod capability in >>>>> containers. This behavior, I think is somewhat inconsistent with the >>>>> tuntap driver where one can create tuntap devices inside a >>>>> container by >>>>> first opening /dev/net/tun and then using them by supplying the tuntap >>>>> device name via the ioctl(TUNSETIFF). And since TUNSETIFF validates >>>>> the >>>>> network namespace, one is limited to opening network devices that >>>>> belong >>>>> to your current network namespace. >>>>> >>>>> Here are some options to this issue, that I wanted to get feedback >>>>> about, and just wondering if anybody else has run into this. >>>>> >>>>> 1) >>>>> >>>>> Don't create the tap device, such as macvtap in the container. >>>>> Instead, >>>>> create the tap device outside of the container and then move it >>>>> into the >>>>> desired container network namespace. In addition, do a mknod() for the >>>>> corresponding /dev/tapNN device from outside the container before >>>>> doing >>>>> chroot(). >>>>> >>>>> This solution still doesn't allow tap devices to be created inside the >>>>> container. Thus, in the case of kubevirt, which runs libvirtd >>>>> inside of >>>>> a container, it would mean changing libvirtd to open existing tap >>>>> devices (as opposed to the current behavior of creating new ones). >>>>> This >>>>> would not require any kernel changes, but as mentioned seems >>>>> inconsistent with the tuntap interface. >>>>> >>>> >>>> For KubeVirt, apart from how exactly the device ends up in the >>>> container, I >>>> would want to pursue a way where all network preparations which require >>>> privileges happens from a privileged process *outside* of the >>>> container. >>>> Like CNI solutions do it. They run outside, have privileges and then >>>> create >>>> devices in the right network/mount namespace or move them there. The >>>> final >>>> goal for KubeVirt is that our pod with the qemu process is completely >>>> unprivileged and privileged setup happens from outside. >>>> >>>> As a consequence, and depending on which route Dan pursues with the >>>> restructured libvirt, I would assume that either a privileged >>>> libvirtd-part >>>> outside of containers creates the devices by entering the right >>>> namespaces, >>>> or that libvirt in the container can consume pre-created tun/tap >>>> devices, >>>> like qemu. >>>> >>> >>> That would be nice, but as far as I understand there will always be a >>> need for >>> some privileges if you want to use a tap device. It's nice that CNI >>> does that >>> and all the containers can run unprivileged, but that's because they do >>> not open >>> the tap device and they do not do any privileged operations on it. But >>> QEMU >>> needs to. So the only way would be passing an opened fd to the >>> container or >>> opening the tap device there and making the fd usable for one process in >>> the >>> container. Is this already supported for some type of containers in >>> some way? >>> >>> Martin >> >> Hi, >> >> So another option here call it #3 is to pass open fds via unix sockets. >> If there are privileged operations that QEMU is trying to do with the fd >> though, how will opening it first and then passing it to an unprivileged >> QEMU address that? Is the opener doing those operations first? >> > > Sorry for the confusion, but QEMU is not doing any privileged > operations. I got > confused by the fact that anyone can open and do a R/W on a tap device. > But it > looks like that's on purpose. No capabilities are needed for opening > /dev/net/tun and calling ioctl(TUNSETIFF) with existing name and then > doing R/W > operations on it. It just works. > > Correct me if I'm wrong, but to sum it all up, the only things that we > need to > figure out (which might possibly be solved by ideas in the other thread) > are: > > tap: > - Existence of /dev/net/tun > - Having permissions to open it (0666 by default, shouldn't be a nig deal) > - Knowing the device name > > macvtap: > - Existence of /dev/tapXX > - Having permissions to open /dev/tapXX > - One of the following: > - Knowing the device name (and being able to translate it using a > netlink socket) > - Knowing the the device index > Right - from the device name one can grab the device index using SIOCGIFINDEX and then use that to access /dev/tap{device index}. Since devtmpfs is not mounted in containers (since its not namespaced) and mknod() is I think often not allowed, the mknod() has to happen by a privileged process when the the container is being created. In addition, libvirtd would need to be changed to open this existing device (currently it only opens macvtap devices that it creates). This is option #1. > The rest should be an implementation detail. > > Am I right? Did I miss anything? I don't think so, I'm interested if option #1 is workable or if there is interest in option #2 which is to do something like /dev/net/tun in the kernel for macvtap devices. Since as Daniel pointed out something like option #1 is going to be needed anyways to work on older kernels it seems like the best option? Thanks, -Jason

1 0

[libvirt] [PATCH] Changed LPC slot from 1 to 31
by Ivan Mishonov 11 Jul '18

11 Jul '18

--- src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 802997bd2d..e595b3d6c1 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -329,7 +329,7 @@ static int bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virCommandPtr cmd) { - virCommandAddArgList(cmd, "-s", "1,lpc", NULL); + virCommandAddArgList(cmd, "-s", "31,lpc", NULL); return 0; } diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 03aa6c93bd..2ed3013552 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -48,9 +48,9 @@ bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (addr->domain == 0 && addr->bus == 0) { if (addr->slot == 0) { return 0; - } else if (addr->slot == 1) { + } else if (addr->slot == 31) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PCI bus 0 slot 1 is reserved for the implicit " + _("PCI bus 0 slot 31 is reserved for the implicit " "LPC PCI-ISA bridge")); return -1; } -- 2.18.0

3 3

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Rewrite in Python
by Andrea Bolognani 11 Jul '18

11 Jul '18

While the previous implementation has served us well, it was very quickly cobbled together using a language that's not really suitable for the purpose; the fact that we had to embed a Perl (previously Python) script in there is a clear indication that we had outgrown the language pretty much from the get go, and while I'm weirdly proud of the hackish way I implemented inventory handling I'll take a proper YAML parser instead any day :) The new implementation is not quite a drop-in replacement, but getting used to it should take very little time; most importantly, the new command line syntax lends itself to being extended in ways that had simply been impossible previously, and we're going to take advantage of the fact very soon when we integrate the Dockerfile generator (see [1]) and [secret feature redacted]. We also get some minor but neat improvements like much better host list handling and XDG_CONFIG_HOME support. The script is compatible with both Python 2.7 and Python 3, and doesn't rely on any downstream patch being applied to the former. I'm absolutely not great at Python, so any input on style and such will be greatly appreciated. [1] https://www.redhat.com/archives/libvir-list/2018-June/msg01238.html Andrea Bolognani (8): lcitool: Drop shell implementation lcitool: Stub out Python implementation lcitool: Add tool configuration handling lcitool: Add inventory handling lcitool: Implement the 'list' action lcitool: Implement the 'install' action lcitool: Implement the 'update' action guests: Update documentation guests/README.markdown | 8 +- guests/lcitool | 585 +++++++++++++++++++++++++---------------- 2 files changed, 366 insertions(+), 227 deletions(-) -- 2.17.1

1 8