Compiler warning fixes for libvhost-user,libvduse
v4 cover Compiler warning fixes for libvhost-user,libvduse
The libvhost-user and libvduse libraries are also useful for external usage outside of QEMU and thus it would be nice if their files could be just copied and used. However due to different compiler settings, a lot of manual fixups are needed. This is the first attempt at some obvious fixes that can be done without any harm to the code and its readability.
Marcel Holtmann (12):
libvhost-user: Provide _GNU_SOURCE when compiling outside of QEMU
libvhost-user: Replace typeof with __typeof__
libvhost-user: Cast rc variable to avoid compiler warning
libvhost-user: Use unsigned int i for some for-loop iterations
libvhost-user: Declare uffdio_register early to make it C90 compliant
libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant
libvduse: Provide _GNU_SOURCE when compiling outside of QEMU
libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
libvduse: Fix assignment in vring_set_avail_event
libvhost-user: Fix assignment in vring_set_avail_event
libvhost-user: Add extra compiler warnings
libvduse: Add extra compiler warnings
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)
Signature · 1 line
2.38.1
PATCH v4 1/12 libvhost-user: Provide _GNU_SOURCE when compiling outside of QEMU
Then the libvhost-user sources are used by another project, it can not be guaranteed that _GNU_SOURCE is set by the build system. If it is for example not set, errors like this show up.
CC libvhost-user.olibvhost-user.c: In function ‘vu_panic’:
libvhost-user.c:195:9: error: implicit declaration of function ‘vasprintf’; did you mean ‘vsprintf’? [-Werror=implicit-function-declaration]
195 | if (vasprintf(&buf, msg, ap) < 0) {
| ^~~~~~~~~
| vsprintfThe simplest way to allow external complication of libvhost-user.[ch] is by setting _GNU_SOURCE if it is not already set by the build system.
--- subprojects/libvhost-user/libvhost-user.c | 4 ++++ 1 file changed, 4 insertions(+)
subprojects/libvhost-user/libvhost-user.c +4 -0
@@ -13,6 +13,10 @@* later. See the COPYING file in the top-level directory. */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +/* this code avoids GLib dependency */ #include <stdlib.h> #include <stdio.h>
Signature · 1 line
2.38.1
PATCH v4 2/12 libvhost-user: Replace typeof with __typeof__
In reply to Marcel HoltmannStrictly speaking only -std=gnu99 support the usage of typeof and for easier inclusion in external projects, it is better to use __typeof__.
CC libvhost-user.olibvhost-user.c: In function ‘vu_log_queue_fill’:
libvhost-user.c:86:13: error: implicit declaration of function ‘typeof’ [-Werror=implicit-function-declaration]
86 | typeof(x) _min1 = (x); \
| ^~~~~~Changing these two users of typeof makes the compiler happy and no extra flags or pragmas need to be provided.
--- subprojects/libvhost-user/libvhost-user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
subprojects/libvhost-user/libvhost-user.c +2 -2
@@ -62,8 +62,8 @@#endif /* !__GNUC__ */ #ifndef MIN #define MIN (x, y) ({ \ - typeof(x) _min1 = (x); \ - typeof(y) _min2 = (y); \ + __typeof__(x) _min1 = (x); \ + __typeof__(y) _min2 = (y); \ (void) (&_min1 == &_min2); \ _min1 < _min2 ? _min1 : _min2; })#endif
Signature · 1 line
2.38.1
PATCH v4 3/12 libvhost-user: Cast rc variable to avoid compiler warning
In reply to Marcel HoltmannThe assert from recvmsg() return value against an uint32_t size field from a protocol struct throws a compiler warning.
CC libvhost-user.o
In file included from libvhost-user.c:27:libvhost-user.c: In function ‘vu_message_read_default’:
libvhost-user.c:363:19: error: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Werror=sign-compare]
363 | assert(rc == vmsg->size);
| ^~
This is not critical, but annoying when the libvhost-user source are used in an external project that has this compiler warning switched on.
--- subprojects/libvhost-user/libvhost-user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
subprojects/libvhost-user/libvhost-user.c +1 -1
@@ -339,7 +339,7 @@ vu_message_read_default(VuDev *dev, int conn_fd, VhostUserMsg *vmsg) goto fail; } -assert (rc == vmsg->size); +assert ((uint32_t )rc == vmsg->size); }return true;
Signature · 1 line
2.38.1
PATCH v4 4/12 libvhost-user: Use unsigned int i for some for-loop iterations
In reply to Marcel HoltmannThe sign-compare warning also hits some of the for-loops, but it easy fixed by just making the iterator variable unsigned int.
CC libvhost-user.olibvhost-user.c: In function ‘vu_gpa_to_va’:
libvhost-user.c:223:19: error: comparison of integer expressions of different signedness: ‘int’ and ‘uint32_t’ {aka ‘unsigned int’} [-Werror=sign-compare]
223 | for (i = 0; i < dev->nregions; i++) {
| ^
--- subprojects/libvhost-user/libvhost-user.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
subprojects/libvhost-user/libvhost-user.c +7 -7
@@ -192,7 +192,7 @@ vu_panic(VuDev *dev, const char *msg, ...)void *vu_gpa_to_va (VuDev *dev,uint64_t *plen,uint64_t guest_addr) { -int i; +unsigned int i;if (*plen ==0 ) {return NULL ;
@@ -218,7 +218,7 @@ vu_gpa_to_va(VuDev *dev, uint64_t *plen, uint64_t guest_addr)static void *qva_to_va (VuDev *dev,uint64_t qemu_addr) { -int i; +unsigned int i;/* Find matching memory region. */ for (i =0 ; i < dev->nregions; i++) {
@@ -621,7 +621,7 @@ map_ring(VuDev *dev, VuVirtq *vq)static bool generate_faults (VuDev *dev) { -int i; +unsigned int i;for (i =0 ; i < dev->nregions; i++) {VuDevRegion *dev_region = &dev->regions[i];int ret;
@@ -829,7 +829,7 @@ static inline bool reg_equal(VuDevRegion *vudev_reg,static bool vu_rem_mem_reg (VuDev *dev,VhostUserMsg *vmsg) {VhostUserMemoryRegion m = vmsg->payload.memreg.region, *msg_region = &m; -int i; +unsigned int i;bool found = false;if (vmsg->fd_num >1 ) {
@@ -895,7 +895,7 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {static bool vu_set_mem_table_exec_postcopy (VuDev *dev,VhostUserMsg *vmsg) { -int i; +unsigned int i;VhostUserMemory m = vmsg->payload.memory, *memory = &m; dev->nregions = memory->nregions;
@@ -972,7 +972,7 @@ vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg)static bool vu_set_mem_table_exec (VuDev *dev,VhostUserMsg *vmsg) { -int i; +unsigned int i;VhostUserMemory m = vmsg->payload.memory, *memory = &m;for (i =0 ; i < dev->nregions; i++) {
@@ -1980,7 +1980,7 @@ end:void vu_deinit (VuDev *dev) { -int i; +unsigned int i;for (i =0 ; i < dev->nregions; i++) {VuDevRegion *r = &dev->regions[i];
Signature · 1 line
2.38.1
PATCH v4 5/12 libvhost-user: Declare uffdio_register early to make it C90 compliant
In reply to Marcel HoltmannWhen using libvhost-user source in an external project that wants to comply with the C90 standard, it is best to declare variables before code.
CC libvhost-user.olibvhost-user.c: In function ‘generate_faults’:
libvhost-user.c:683:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
683 | struct uffdio_register reg_struct;
| ^~~~~~In this case, it is also simple enough and doesn't cause any extra ifdef additions.
--- subprojects/libvhost-user/libvhost-user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
subprojects/libvhost-user/libvhost-user.c +3 -1
@@ -626,6 +626,8 @@ generate_faults(VuDev *dev) {VuDevRegion *dev_region = &dev->regions[i];int ret;#ifdef UFFDIO_REGISTER +struct uffdio_register reg_struct; +/* * We should already have an open ufd. Mark each memory * range as ufd.
@@ -659,7 +661,7 @@ generate_faults(VuDev *dev) {"%s: Failed to madvise(NOHUGEPAGE) region %d: %s\n" , __func__, i, strerror(errno)); } -struct uffdio_register reg_struct; + reg_struct.range.start = (uintptr_t )dev_region->mmap_addr; reg_struct.range.len = dev_region->size + dev_region->mmap_offset; reg_struct.mode =UFFDIO_REGISTER_MODE_MISSING ;
Signature · 1 line
2.38.1
PATCH v4 6/12 libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant
In reply to Marcel HoltmannThe assignment of dev->postcopy_ufd can be moved into an else clause and then the code becomes C90 compliant.
CC libvhost-user.olibvhost-user.c: In function ‘vu_set_postcopy_advise’:
libvhost-user.c:1625:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
1625 | struct uffdio_api api_struct;
| ^~~~~~Understandable, it might be desired to avoid else clauses, but in this case it seems clear enough and frankly the dev->postcopy_ufd is only assigned once.
--- subprojects/libvhost-user/libvhost-user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
subprojects/libvhost-user/libvhost-user.c +2 -1
@@ -1599,12 +1599,13 @@ vu_set_config(VuDev *dev, VhostUserMsg *vmsg)static bool vu_set_postcopy_advise (VuDev *dev,VhostUserMsg *vmsg) { - dev->postcopy_ufd =-1 ;#ifdef UFFDIO_API struct uffdio_api api_struct; dev->postcopy_ufd =syscall (__NR_userfaultfd,O_CLOEXEC |O_NONBLOCK ); vmsg->size =0 ; +#else + dev->postcopy_ufd =-1 ;#endif if (dev->postcopy_ufd ==-1 ) {
Signature · 1 line
2.38.1
PATCH v4 7/12 libvduse: Provide _GNU_SOURCE when compiling outside of QEMU
In reply to Marcel HoltmannWhen the libvduse sources are used by another project, it can not be guaranteed that _GNU_SOURCE is set by the build system. If it is for example not set, errors like this show up.
CC libvduse.olibvduse.c: In function ‘vduse_log_get’:
libvduse.c:172:9: error: implicit declaration of function ‘ftruncate’; did you mean ‘strncat’? [-Werror=implicit-function-declaration]
172 | if (ftruncate(fd, size) == -1) {
| ^~~~~~~~~
| strncatThe simplest way to allow external complication of libvduse.[ch] by setting _GNU_SOURCE if it is not already set by the build system.
--- subprojects/libvduse/libvduse.c | 4 ++++ 1 file changed, 4 insertions(+)
subprojects/libvduse/libvduse.c +4 -0
@@ -16,6 +16,10 @@* later. See the COPYING file in the top-level directory. */ +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <stdlib.h> #include <stdio.h> #include <stdbool.h>
Signature · 1 line
2.38.1
PATCH v4 8/12 libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
In reply to Marcel HoltmannIt seems there is no need to keep the inuse field signed and end up with compiler warnings for sign-compare.
CC libvduse.olibvduse.c: In function ‘vduse_queue_pop’:
libvduse.c:789:19: error: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’ [-Werror=sign-compare]
789 | if (vq->inuse >= vq->vring.num) {
| ^~
Instead of casting the comparison to unsigned int, just make the inuse field unsigned int in the fist place.
--- subprojects/libvduse/libvduse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
subprojects/libvduse/libvduse.c +1 -1
@@ -101,7 +101,7 @@ struct VduseVirtq {uint16_t signalled_used;bool signalled_used_valid;int index; -int inuse; +unsigned int inuse;bool ready;int fd;VduseDev *dev;
Signature · 1 line
2.38.1
PATCH v4 9/12 libvduse: Fix assignment in vring_set_avail_event
In reply to Marcel HoltmannSince the assignment is causing a compiler warning, fix it by using memcpy instead.
CC libvduse.olibvduse.c: In function ‘vring_set_avail_event’:
libvduse.c:603:7: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasin]
603 | *((uint16_t *)&vq->vring.used->ring[vq->vring.num]) = htole16(val);
| ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- subprojects/libvduse/libvduse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
subprojects/libvduse/libvduse.c +2 -1
@@ -582,7 +582,8 @@ void vduse_queue_notify(VduseVirtq *vq)static inline void vring_set_avail_event (VduseVirtq *vq,uint16_t val) { - *((uint16_t *)&vq->vring.used->ring[vq->vring.num]) =htole16 (val); +uint16_t val_le =htole16 (val); +memcpy (&vq->vring.used->ring[vq->vring.num], &val_le,sizeof (uint16_t )); } static bool vduse_queue_map_single_desc(VduseVirtq *vq, unsigned int *p_num_sg,
Signature · 1 line
2.38.1
PATCH v4 10/12 libvhost-user: Fix assignment in vring_set_avail_event
In reply to Marcel HoltmannSince it was proposed to change the code in libvduse.c to use memcpy instead of an assignment, the code in libvhost-user.c should also be changed to use memcpy.
--- subprojects/libvhost-user/libvhost-user.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
subprojects/libvhost-user/libvhost-user.c +2 -3
@@ -2478,14 +2478,13 @@ vring_used_flags_unset_bit(VuVirtq *vq, int mask)static inline void vring_set_avail_event (VuVirtq *vq,uint16_t val) { -uint16_t *avail; +uint16_t val_le =htole16 (val);if (!vq->notification) {return ; } - avail = (uint16_t *)&vq->vring.used->ring[vq->vring.num]; - *avail =htole16 (val); +memcpy (&vq->vring.used->ring[vq->vring.num], &val_le,sizeof (uint16_t )); }void
Signature · 1 line
2.38.1
PATCH v4 11/12 libvhost-user: Add extra compiler warnings
In reply to Marcel HoltmannIn case libvhost-user is used externally, that projects compiler warnings might be more strict. Enforce an extra set of compiler warnings to catch issues early on.
--- subprojects/libvhost-user/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
subprojects/libvhost-user/meson.build +7 -1
@@ -1,6 +1,12 @@ project('libvhost-user', 'c', license: 'GPL-2.0-or-later', - default_options: ['c_std=gnu99']) + default_options: ['warning_level=1', 'c_std=gnu99']) + +cc = meson.get_compiler('c') +add_project_arguments(cc.get_supported_arguments('-Wsign-compare', + '-Wdeclaration-after-statement', + '-Wstrict-aliasing'), + native: false, language: 'c') threads = dependency('threads') glib = dependency('glib-2.0')
Signature · 1 line
2.38.1
PATCH v4 12/12 libvduse: Add extra compiler warnings
In reply to Marcel HoltmannIn case libvhost-user is used externally, that projects compiler warnings might be more strict. Enforce an extra set of compiler warnings to catch issues early on.
--- subprojects/libvduse/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
subprojects/libvduse/meson.build +7 -1
@@ -1,6 +1,12 @@ project('libvduse', 'c', license: 'GPL-2.0-or-later', - default_options: ['c_std=gnu99']) + default_options: ['warning_level=1', 'c_std=gnu99']) + +cc = meson.get_compiler('c') +add_project_arguments(cc.get_supported_arguments('-Wsign-compare', + '-Wdeclaration-after-statement', + '-Wstrict-aliasing'), + native: false, language: 'c') libvduse = static_library('vduse', files('libvduse.c'),
Signature · 1 line
2.38.1
Quoted 21 lines · Marcel Holtmann
The libvhost-user and libvduse libraries are also useful for external usage outside of QEMU and thus it would be nice if their files could be just copied and used. However due to different compiler settings, a lot of manual fixups are needed. This is the first attempt at some obvious fixes that can be done without any harm to the code and its readability.
Marcel Holtmann (12):
libvhost-user: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvhost-user: Replace typeof with__typeof__
libvhost-user: Cast rc variable to avoid compiler warning
libvhost-user: Use unsigned int i for some for-loop iterations
libvhost-user: Declareuffdio_registerearly to make it C90 compliant
libvhost-user: Changedev->postcopy_ufdassignment to make it C90 compliant
libvduse: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
libvduse: Fix assignment invring_set_avail_event
libvhost-user: Fix assignment invring_set_avail_event
libvhost-user: Add extra compiler warnings
libvduse: Add extra compiler warnings
Quoted 6 lines
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)
Looks good, but what happened to "libvhost-user: Switch to unsigned int for inuse field in struct VuVirtq"?
(I can pick it up from v3, no need to respin).
Paolo
Hi Paolo,
Quoted 25 lines
Quoted 19 lines
The libvhost-user and libvduse libraries are also useful for external usage outside of QEMU and thus it would be nice if their files could be just copied and used. However due to different compiler settings, a lot of manual fixups are needed. This is the first attempt at some obvious fixes that can be done without any harm to the code and its readability.
Marcel Holtmann (12):
libvhost-user: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvhost-user: Replace typeof with__typeof__
libvhost-user: Cast rc variable to avoid compiler warning
libvhost-user: Use unsigned int i for some for-loop iterations
libvhost-user: Declareuffdio_registerearly to make it C90 compliant
libvhost-user: Changedev->postcopy_ufdassignment to make it C90 compliant
libvduse: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
libvduse: Fix assignment invring_set_avail_event
libvhost-user: Fix assignment invring_set_avail_event
libvhost-user: Add extra compiler warnings
libvduse: Add extra compiler warningsQuoted 5 lines
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)
Quoted 3 lines
Looks good, but what happened to "libvhost-user: Switch to unsigned int for inuse field in struct VuVirtq"?
(I can pick it up from v3, no need to respin).
I found that it was already upstream and thus I removed it.
Regards
Marcel
Quoted 29 lines · Paolo Bonzini
Quoted 21 lines · Marcel Holtmann
The libvhost-user and libvduse libraries are also useful for external usage outside of QEMU and thus it would be nice if their files could be just copied and used. However due to different compiler settings, a lot of manual fixups are needed. This is the first attempt at some obvious fixes that can be done without any harm to the code and its readability.
Marcel Holtmann (12):
libvhost-user: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvhost-user: Replace typeof with__typeof__
libvhost-user: Cast rc variable to avoid compiler warning
libvhost-user: Use unsigned int i for some for-loop iterations
libvhost-user: Declareuffdio_registerearly to make it C90 compliant
libvhost-user: Changedev->postcopy_ufdassignment to make it C90 compliant
libvduse: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
libvduse: Fix assignment invring_set_avail_event
libvhost-user: Fix assignment invring_set_avail_event
libvhost-user: Add extra compiler warnings
libvduse: Add extra compiler warningsQuoted 6 lines
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)
Quoted 6 lines
Looks good, but what happened to "libvhost-user: Switch to unsigned int for inuse field in struct VuVirtq"?
(I can pick it up from v3, no need to respin).
Paolo
I merged that one IIRC.
Paolo I wandered whether if you are going to be merging patches in these areas you wanted to be added to MAINTAINERS.
Signature · 1 line
MST
Quoted 7 lines · Marcel Holtmann
The libvhost-user and libvduse libraries are also useful for external usage outside of QEMU and thus it would be nice if their files could be just copied and used. However due to different compiler settings, a lot of manual fixups are needed. This is the first attempt at some obvious fixes that can be done without any harm to the code and its readability.
Quoted 13 lines
Marcel Holtmann (12):
libvhost-user: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvhost-user: Replace typeof with__typeof__
libvhost-user: Cast rc variable to avoid compiler warning
libvhost-user: Use unsigned int i for some for-loop iterations
libvhost-user: Declareuffdio_registerearly to make it C90 compliant
libvhost-user: Changedev->postcopy_ufdassignment to make it C90 compliant
libvduse: Provide_GNU_SOURCEwhen compiling outside of QEMU
libvduse: Switch to unsigned int for inuse field in struct VduseVirtq
libvduse: Fix assignment invring_set_avail_event
libvhost-user: Fix assignment invring_set_avail_event
libvhost-user: Add extra compiler warnings
libvduse: Add extra compiler warnings
series looks good to me.
Paolo I understand you are merging this?
Quoted 11 lines
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)Signature · 1 line
2.38.1
Re: [PATCH v4 00/12] Compiler warning fixes for libvhost-user, libvduse
Il gio 5 gen 2023, 02:58 Michael S. Tsirkin <[email protected]> ha scritto:
Quoted 2 lines
Paolo I understand you are merging this?
It would be fine either way; when I find issues in a series I tend to queue it just in case the other maintainer prefers to leave further handling to me. In this case it caught my eye due to the meson.build implications.
Anyhow I have already passed it through CI (a bit slow due to the holidays) and will send the PR today or tomorrow.
Paolo
Quoted 15 lines
Reviewed-by Michael S. Tsirkin <[email protected]>Quoted 11 lines
subprojects/libvduse/libvduse.c | 9 ++++-- subprojects/libvduse/meson.build | 8 ++++- subprojects/libvhost-user/libvhost-user.c | 36 +++++++++++++---------- subprojects/libvhost-user/meson.build | 8 ++++- 4 files changed, 42 insertions(+), 19 deletions(-)--
2.38.1