- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Rework qemuhotplugtest
by Tomasz Flendrich 21 Sep '16

21 Sep '16

This series requires another one: https://www.redhat.com/archives/libvir-list/2016-July/msg01205.html Tomasz Flendrich (2): qemuhotplugtest: handle xml files more precisely qemuhotplugtest: change indentation tests/qemuhotplugtest.c | 254 +++++++++++---------- .../qemuhotplug-ccw-virtio-1-reverse.xml | 7 - ...ach.xml => qemuhotplug-qemu-agent-nosource.xml} | 1 - .../qemuhotplug-qemu-agent.xml | 1 + .../qemuhotplug-base+qemu-agent-detach.xml | 58 ----- .../qemuhotplug-base+qemu-agent.xml | 58 ----- ...plug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} | 0 ... => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} | 0 ...ive-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 73 ------ ...live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 73 ------ ...-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 73 ------ .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 63 ----- ....xml => qemuhotplug-base-config+qemu-agent.xml} | 0 .../qemuhotplug-base-live+qemu-agent-detach.xml | 58 ----- ...-base-with-scsi-controller-live+disk-scsi-2.xml | 51 ----- 15 files changed, 140 insertions(+), 630 deletions(-) delete mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ccw-virtio-1-reverse.xml rename tests/qemuhotplugtestdevices/{qemuhotplug-qemu-agent-detach.xml => qemuhotplug-qemu-agent-nosource.xml} (66%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base+qemu-agent.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml => qemuhotplug-base-ccw-live+ccw-virtio+ccw-virtio-2.xml} (100%) rename tests/qemuhotplugtestdomains/{qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml => qemuhotplug-base-ccw-live+ccw-virtio-2.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml rename tests/qemuhotplugtestdomains/{qemuhotplug-base-config+qemu-agent+config.xml => qemuhotplug-base-config+qemu-agent.xml} (100%) delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent-detach.xml delete mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live+disk-scsi-2.xml -- 2.7.4 (Apple Git-66)

2 3

[libvirt] [PATCH v3 0/6] Test persistent device attachment
by Tomasz Flendrich 21 Sep '16

21 Sep '16

Changes in v3: * fewer patches, because part of v2 was ACK'd * two old commits, 08/10 and 09/10, are now one commit * qemuDomainUpdateDeviceFlags is now also split, creating a new function qemuDomainUpdateDeviceLiveAndConfig(). This function is now used in qemuhotplugtest.c. * qemuDomainAttachDeviceLiveAndConfig, qemuDomainDetachDeviceLiveAndConfig and qemuDomainUpdateDeviceLiveAndConfig are now in a new file: qemu_driverpriv.h * variable "target" is renamed to "impact" and its type is changed * testQemuHotplugCheckResult() now takes "impact" as a parameter to determine whether to test the ->def or ->newDef * def->id is no longer set when handling a persistent domain * split DO_TEST_ATTACH (and other macros) to DO_TEST_ATTACH_LIVE and DO_TEST_ATTACH_CONFIG instead of taking a parameter * fixed indentation * "<source mode='bind'/>" is removed from one xml * a three year old testcase for updating a disk device was modified a little bit to make it finally execute and test something Link to v2: https://www.redhat.com/archives/libvir-list/2016-July/msg00595.html Tomasz Flendrich (6): Split qemuDomainUpdateDeviceFlags in two Make qemu attach/detach functions public Make qemuhotplugtest work with persistent domains qemuhotplug: Use a more generic function to update devices qemuhotplugtest: add testcase to update a disk device qemuhotplugtest: add a persistent attachment testcase src/qemu/qemu_driver.c | 117 +++--- src/qemu/qemu_driverpriv.h | 47 +++ tests/qemuhotplugtest.c | 433 ++++++++++++--------- .../qemuhotplug-disk-cdrom-nochange.xml | 2 +- .../qemuhotplug-qemu-agent.xml | 1 - .../qemuhotplug-base-config+qemu-agent+config.xml | 44 +++ .../qemuhotplug-base-config.xml | 40 ++ .../qemuhotplug-disk-cdrom.xml | 2 +- 8 files changed, 454 insertions(+), 232 deletions(-) create mode 100644 src/qemu/qemu_driverpriv.h create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config+qemu-agent+config.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-config.xml -- 1.9.1

2 8

[libvirt] [PATCH] migration: Document we don't copy storage during offline migration
by Michal Privoznik 21 Sep '16

21 Sep '16

https://bugzilla.redhat.com/show_bug.cgi?id=1322717 During offline migration, no storage is copied. Nor disks, nor NVRAM file, nor anything. We use qemu for that and because domain is not running there's nobody to copy that for us. We should document this to avoid confusing users. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/migration.html.in | 5 +++-- src/libvirt-domain.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 8efdd7f..2768955 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -148,8 +148,9 @@ <code>virsh dumpxml</code> on source host followed by <code>virsh define</code> on destination host, as offline migration will run the pre-migration hook to update the domain XML on - destination host. Currently, copying non-shared storage is not - supported during offline migration. + destination host. Currently, copying non-shared storage or other file + based storages (e.g. UEFI variable storage) is not supported during + offline migration. </p> <h2><a name="uris">Migration URIs</a></h2> diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index fa82e49..9ba9f49 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3574,6 +3574,10 @@ virDomainMigrateUnmanaged(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3791,6 +3795,10 @@ virDomainMigrate(virDomainPtr domain, * not support this feature and will return an error if bandwidth * is not 0. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details @@ -3980,6 +3988,10 @@ virDomainMigrate2(virDomainPtr domain, * can use either VIR_MIGRATE_NON_SHARED_DISK or * VIR_MIGRATE_NON_SHARED_INC as they are mutually exclusive. * + * Users should note that implementation of VIR_MIGRATE_OFFLINE + * flag in some drivers does not copy storage or any other file + * based storage (e.g. UEFI variable storage). + * * Enabling the VIR_MIGRATE_POSTCOPY flag tells libvirt to enable post-copy * migration. Use virDomainMigrateStartPostCopy to switch migration into * the post-copy mode. See virDomainMigrateStartPostCopy for more details -- 2.8.4

2 1

[libvirt] [PATCH] qemu: Ignore graphics cookie if port == 0
by Jiri Denemark 21 Sep '16

21 Sep '16

Old libvirt represents <graphics type='spice'> <listen type='none'/> </graphics> as <graphics type='spice' autoport='no'/> In this mode, QEMU doesn't listen for SPICE connection anywhere and clients have to use virDomainOpenGraphics* APIs to attach to the domain. That is, the client has to run on the same host where the domains runs and it's impossible to tell the client to reconnect to the destination QEMU during migration (unless there is some kind of proxy on the host). While current libvirt correctly ignores such graphics devices when creating graphics migration cookie, old libvirt just sends <graphics type='spice' port='0' listen='0.0.0.0' tlsPort='-1'/> in the cookie. After seeing this cookie, we happily would call client_migrate_info QMP command and wait for SPICE_MIGRATE_COMPLETED event, which is quite pointless since the doesn't know where to connecti anyway. We should just ignore such cookies. https://bugzilla.redhat.com/show_bug.cgi?id=1376083 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e734816..8a220d9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2903,6 +2903,15 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, goto cleanup; } + /* Older libvirt sends port == 0 for listen type='none' graphics. It's + * safe to ignore such requests since relocation to unknown port does + * not make sense in general. + */ + if (port <= 0 && tlsPort <= 0) { + ret = 0; + goto cleanup; + } + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) == 0) { ret = qemuMonitorGraphicsRelocate(priv->mon, type, listenAddress, -- 2.10.0

2 2

[libvirt] [PATCH] qemuDomainOpenGraphics: Start job early
by Jiri Denemark 21 Sep '16

21 Sep '16

Checking if a domain's definition or if it is active before we got a job is pointless since the domain might have changed in the meantime. Luckily libvirtd didn't crash when the API tried to talk to an inactive domain: debug : qemuDomainObjBeginJobInternal:2914 : Started job: modify (async=none vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEnterMonitorInternal:3137 : Entering monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) warning : virObjectLock:319 : Object (nil) ((unknown)) is not a virObjectLockable instance debug : qemuMonitorOpenGraphics:3505 : protocol=spice fd=27 fdname=graphicsfd skipauth=1 error : qemuMonitorOpenGraphics:3508 : invalid argument: monitor must not be NULL debug : qemuDomainObjExitMonitorInternal:3160 : Exited monitor (mon=(nil) vm=0x7f8f340140c0 name=ble) debug : qemuDomainObjEndJob:3068 : Stopping job: modify (async=none vm=0x7f8f340140c0 name=ble) Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e29180d..4c45fc3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17118,10 +17118,13 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (virDomainOpenGraphicsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } priv = vm->privateData; @@ -17129,7 +17132,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, if (idx >= vm->def->ngraphics) { virReportError(VIR_ERR_INTERNAL_ERROR, _("No graphics backend with index %d"), idx); - goto cleanup; + goto endjob; } switch (vm->def->graphics[idx]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -17142,20 +17145,20 @@ qemuDomainOpenGraphics(virDomainPtr dom, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Can only open VNC or SPICE graphics backends, not %s"), virDomainGraphicsTypeToString(vm->def->graphics[idx]->type)); - goto cleanup; + goto endjob; } if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) - goto cleanup; + goto endjob; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; + + endjob: qemuDomainObjEndJob(driver, vm); cleanup: -- 2.10.0

2 2

[libvirt] [PATCH] stream.c:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- daemon/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/stream.c b/daemon/stream.c index bd0b5d2..533ecf7 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -444,7 +444,7 @@ int daemonAddClientStream(virNetServerClientPtr client, * * Removes a stream from the list of active streams for the client * - * Returns 0 if the stream was removd, -1 if it doesn't exist + * Returns 0 if the stream was removed, -1 if it doesn't exist */ int daemonRemoveClientStream(virNetServerClientPtr client, -- 2.1.0

2 1

[libvirt] [PATCH] config-post.h:fix a typo
by Nitesh Konkar 21 Sep '16

21 Sep '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- config-post.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-post.h b/config-post.h index dd69197..6eb63db 100644 --- a/config-post.h +++ b/config-post.h @@ -20,7 +20,7 @@ * Since virt-login-shell will be setuid, we must do everything * we can to avoid linking to other libraries. Many of them do * unsafe things in functions marked __atttribute__((constructor)). - * The only way avoid to avoid such deps is to re-compile the + * The only way to avoid such deps is to re-compile the * functions with the code in question disabled, and for that we * must override the main config.h rules. Hence this file :-( */ -- 2.1.0

2 1

[libvirt] [PATCH 0/5] enforce and simplify qga interactions
by Nikolay Shirokovskiy 21 Sep '16

21 Sep '16

First 2 patches fix bugs of libvirt - qga communication. They deal with the channel pecularities described in http://wiki.qemu.org/Features/QAPI/GuestAgent. First patch address https://bugzilla.redhat.com/show_bug.cgi?id=1090551 bug. Next 3 patches hide details of channel pecularities from client, so there is no more need to reissue commands for the reasons other then simple timeout. Nikolay Shirokovskiy (5): qemu: agent: ignore delayed reply when unsynced qemu: agent: ignore garbage while waiting for sync reply qemu: agent: skip outdated sync replies qemu: agent: reissue sync on garbage sync reply qemu: agent: give better error messages whe agent monitor is down src/qemu/qemu_agent.c | 91 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 37 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH v1 0/4] libxl: channels support
by Joao Martins 20 Sep '16

20 Sep '16

Hey, Channels have been on xen toolstack since Xen 4.5 and this small series adds support for it, including xenconfig conversion and appropriate tests. After this series it's possible to do this: (assuming correct configuration of qemu agent in the guest) $ cat domain.xml | grep -a1 channel | head -n 5 | tail -n 4 <channel type='unix'> <source mode='bind' path='/tmp/channel'/> <target type='xen' name='org.qemu.guest_agent.0'/> </channel> $ virsh create domain.xml $ echo '{"execute":"guest-network-get-interfaces"}' | socat stdio,ignoreeof unix-connect:/tmp/channel {"execute":"guest-network-get-interfaces"} {"return": [{"name": "lo", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "127.0.0.1", "prefix": 8}, {"ip-address-type": "ipv6", "ip-address": "::1", "prefix": 128}], "hardware-address": "00:00:00:00:00:00"}, {"name": "eth0", "ip-addresses": [{"ip-address-type": "ipv4", "ip-address": "10.100.0.6", "prefix": 24}, {"ip-address-type": "ipv6", "ip-address": "fe80::216:3eff:fe40:88eb", "prefix": 64}], "hardware-address": "00:16:3e:40:88:eb"}, {"name": "sit0"}]} There is just one thing unclear: is source "path" meant to be auto-generated if it's not specified in the channel config? Additionally what does "state" signify for virtio case: is it that the guest agent is connected, or that the virtio serial is connected? Looking at the qemu driver on processSerialChangedEvent it sounds to me like it's about the serial state. I also have one other series that lets us share the qemu agent across both qemu and libxl drivers, with qemu-agent-command implemented. But it's still in an early stage. Any comments or feedback is appreciated :) Thanks, Joao Joao Martins (4): conf: add xen type for channels libxl: channels support xenconfig: channels conversion support xlconfigtest: add test for channel conversion docs/schemas/domaincommon.rng | 11 ++ src/conf/domain_conf.c | 18 +++- src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 81 ++++++++++++++ src/libxl/libxl_domain.c | 38 +++++++ src/qemu/qemu_command.c | 1 + src/xenconfig/xen_xl.c | 176 +++++++++++++++++++++++++++++++ tests/xlconfigdata/test-channel-pty.cfg | 13 +++ tests/xlconfigdata/test-channel-pty.xml | 33 ++++++ tests/xlconfigdata/test-channel-unix.cfg | 13 +++ tests/xlconfigdata/test-channel-unix.xml | 34 ++++++ tests/xlconfigtest.c | 4 + 12 files changed, 419 insertions(+), 4 deletions(-) create mode 100644 tests/xlconfigdata/test-channel-pty.cfg create mode 100644 tests/xlconfigdata/test-channel-pty.xml create mode 100644 tests/xlconfigdata/test-channel-unix.cfg create mode 100644 tests/xlconfigdata/test-channel-unix.xml -- 2.1.4

3 19

[libvirt] [PATCH v3 0/5] Add runnability info to query-cpu-definitions
by Eduardo Habkost 20 Sep '16

20 Sep '16

This series extends query-cpu-definitions to include an extra field: "unavailable-features". The new field can be used to find out reasons that prevent the CPU model from running in the current host. This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. Changes v2 -> v3: * Small documentation reword * Suggested-by: Markus Armbruster <armbru(a)redhat.com> * Create a x86_cpu_feature_name() function, to isolate the code that returns the property name Changes v1 -> v2: * Fixed documentation to say "(since 2.7)" * Removed @runnable field, improved documentation Example command output: { "return": [ { "unavailable-features": [], "static": false, "name": "host" }, { "unavailable-features": [], "static": false, "name": "qemu64" }, { "unavailable-features": [], "static": false, "name": "qemu32" }, { "unavailable-features": ["npt", "sse4a", "3dnow", "3dnowext", "fxsr-opt", "mmxext"], "static": false, "name": "phenom" }, { "unavailable-features": [], "static": false, "name": "pentium3" }, { "unavailable-features": [], "static": false, "name": "pentium2" }, { "unavailable-features": [], "static": false, "name": "pentium" }, { "unavailable-features": [], "static": false, "name": "n270" }, { "unavailable-features": [], "static": false, "name": "kvm64" }, { "unavailable-features": [], "static": false, "name": "kvm32" }, { "unavailable-features": [], "static": false, "name": "coreduo" }, { "unavailable-features": [], "static": false, "name": "core2duo" }, { "unavailable-features": ["3dnow", "3dnowext", "mmxext"], "static": false, "name": "athlon" }, { "unavailable-features": [], "static": false, "name": "Westmere" }, { "unavailable-features": ["xgetbv1", "xsavec", "3dnowprefetch", "smap", "adx", "rdseed", "mpx", "rtm", "hle"], "static": false, "name": "Skylake-Client" }, { "unavailable-features": [], "static": false, "name": "SandyBridge" }, { "unavailable-features": [], "static": false, "name": "Penryn" }, { "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G5" }, { "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G4" }, { "unavailable-features": ["misalignsse", "sse4a"], "static": false, "name": "Opteron_G3" }, { "unavailable-features": [], "static": false, "name": "Opteron_G2" }, { "unavailable-features": [], "static": false, "name": "Opteron_G1" }, { "unavailable-features": [], "static": false, "name": "Nehalem" }, { "unavailable-features": [], "static": false, "name": "IvyBridge" }, { "unavailable-features": ["rtm", "hle"], "static": false, "name": "Haswell" }, { "unavailable-features": [], "static": false, "name": "Haswell-noTSX" }, { "unavailable-features": [], "static": false, "name": "Conroe" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed", "rtm", "hle"], "static": false, "name": "Broadwell" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed"], "static": false, "name": "Broadwell-noTSX" }, { "unavailable-features": [], "static": false, "name": "486" } ]} Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (5): target-i386: List CPU models using subclass list target-i386: Move warning code outside x86_cpu_filter_features() target-i386: Define CPUID filtering functions before x86_cpu_list() qmp: Add runnability information to query-cpu-definitions target-i386: Return runnability information on query-cpu-definitions qapi-schema.json | 23 ++++- target-i386/cpu-qom.h | 4 + target-i386/cpu.c | 236 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 199 insertions(+), 64 deletions(-) -- 2.7.4

3 8