From 5cf6dd33456c4e7e2a8849f458ce234fb5bb290c Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Fri, 25 Jun 2021 17:41:03 -0400

Subject: [PATCH 3/4] Compress lines for immediate return

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20210625174104.44313-2-kwolf@redhat.com>

Patchwork-id: 101777

O-Subject: [RHEL-8.5.0 qemu-kvm PATCH 1/2] Compress lines for immediate return

Bugzilla: 1970912

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

From: Simran Singhal <singhalsimran0@gmail.com>

Compress two lines into a single line if immediate return statement is found.

It also remove variables progress, val, data, ret and sock

as they are no longer needed.

Remove space between function "mixer_load" and '(' to fix the

checkpatch.pl error:-

ERROR: space prohibited between function name and open parenthesis '('

Done using following coccinelle script:

@@

local idexpression ret;

expression e;

@@

-ret =

+return

     e;

-return ret;

Signed-off-by: Simran Singhal <singhalsimran0@gmail.com>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Message-Id: <20200401165314.GA3213@simran-Inspiron-5558>

[lv: in handle_aiocb_write_zeroes_unmap() move "int ret" inside the #ifdef]

Signed-off-by: Laurent Vivier <laurent@vivier.eu>

(cherry picked from commit b3ac2b94cdc939a90d5a22338ae507689e2cfab0)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/file-posix.c      | 8 +++-----

 block/nfs.c             | 3 +--

 block/nvme.c            | 4 +---

 block/vhdx.c            | 3 +--

 hw/audio/ac97.c         | 4 +---

 hw/audio/adlib.c        | 5 +----

 hw/display/cirrus_vga.c | 4 +---

 migration/ram.c         | 4 +---

 ui/gtk.c                | 3 +--

 util/qemu-sockets.c     | 5 +----

 10 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/block/file-posix.c b/block/file-posix.c

index 371572f1b0..837edcf027 100644

--- a/block/file-posix.c

+++ b/block/file-posix.c

@@ -1626,13 +1626,12 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque)

 {

     RawPosixAIOData *aiocb = opaque;

     BDRVRawState *s G_GNUC_UNUSED = aiocb->bs->opaque;

-    int ret;

     /* First try to write zeros and unmap at the same time */

 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE

-    ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

-                       aiocb->aio_offset, aiocb->aio_nbytes);

+    int ret = do_fallocate(s->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

+                           aiocb->aio_offset, aiocb->aio_nbytes);

     if (ret != -ENOTSUP) {

         return ret;

     }

@@ -1640,8 +1639,7 @@ static int handle_aiocb_write_zeroes_unmap(void *opaque)

     /* If we couldn't manage to unmap while guaranteed that the area reads as

      * all-zero afterwards, just write zeroes without unmapping */

-    ret = handle_aiocb_write_zeroes(aiocb);

-    return ret;

+    return handle_aiocb_write_zeroes(aiocb);

 }

 #ifndef HAVE_COPY_FILE_RANGE

diff --git a/block/nfs.c b/block/nfs.c

index 2393fbfe6b..18c0a73694 100644

--- a/block/nfs.c

+++ b/block/nfs.c

@@ -623,8 +623,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,

     }

     bs->total_sectors = ret;

-    ret = 0;

-    return ret;

+    return 0;

 }

 static QemuOptsList nfs_create_opts = {

diff --git a/block/nvme.c b/block/nvme.c

index 7b7c0cc5d6..eb2f54dd9d 100644

--- a/block/nvme.c

+++ b/block/nvme.c

@@ -575,11 +575,9 @@ static bool nvme_poll_cb(void *opaque)

 {

     EventNotifier *e = opaque;

     BDRVNVMeState *s = container_of(e, BDRVNVMeState, irq_notifier);

-    bool progress = false;

     trace_nvme_poll_cb(s);

-    progress = nvme_poll_queues(s);

-    return progress;

+    return nvme_poll_queues(s);

 }

 static int nvme_init(BlockDriverState *bs, const char *device, int namespace,

diff --git a/block/vhdx.c b/block/vhdx.c

index 21497f7318..a427e47f10 100644

--- a/block/vhdx.c

+++ b/block/vhdx.c

@@ -411,8 +411,7 @@ int vhdx_update_headers(BlockDriverState *bs, BDRVVHDXState *s,

     if (ret < 0) {

         return ret;

     }

-    ret = vhdx_update_header(bs, s, generate_data_write_guid, log_guid);

-    return ret;

+    return vhdx_update_header(bs, s, generate_data_write_guid, log_guid);

 }

 /* opens the specified header block from the VHDX file header section */

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c

index a136b97f68..a2cfae52b3 100644

--- a/hw/audio/ac97.c

+++ b/hw/audio/ac97.c

@@ -574,11 +574,9 @@ static uint32_t nam_readb (void *opaque, uint32_t addr)

 static uint32_t nam_readw (void *opaque, uint32_t addr)

 {

     AC97LinkState *s = opaque;

-    uint32_t val = ~0U;

     uint32_t index = addr;

     s->cas = 0;

-    val = mixer_load (s, index);

-    return val;

+    return mixer_load(s, index);

 }

 static uint32_t nam_readl (void *opaque, uint32_t addr)

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c

index cb4178d861..5779d09815 100644

--- a/hw/audio/adlib.c

+++ b/hw/audio/adlib.c

@@ -120,13 +120,10 @@ static void adlib_write(void *opaque, uint32_t nport, uint32_t val)

 static uint32_t adlib_read(void *opaque, uint32_t nport)

 {

     AdlibState *s = opaque;

-    uint8_t data;

     int a = nport & 3;

     adlib_kill_timers (s);

-    data = OPLRead (s->opl, a);

-

-    return data;

+    return OPLRead (s->opl, a);

 }

 static void timer_handler (void *opaque, int c, double interval_Sec)

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c

index 93afa26fda..a52d3094b9 100644

--- a/hw/display/cirrus_vga.c

+++ b/hw/display/cirrus_vga.c

@@ -2411,12 +2411,10 @@ static uint64_t cirrus_linear_bitblt_read(void *opaque,

                                           unsigned size)

 {

     CirrusVGAState *s = opaque;

-    uint32_t ret;

     /* XXX handle bitblt */

     (void)s;

-    ret = 0xff;

-    return ret;

+    return 0xff;

 }

 static void cirrus_linear_bitblt_write(void *opaque,

diff --git a/migration/ram.c b/migration/ram.c

index 5344c7d59e..92c506d13c 100644

--- a/migration/ram.c

+++ b/migration/ram.c

@@ -3101,9 +3101,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)

     }

     trace_ram_postcopy_send_discard_bitmap();

-    ret = postcopy_each_ram_send_discard(ms);

-

-    return ret;

+    return postcopy_each_ram_send_discard(ms);

 }

 /**

diff --git a/ui/gtk.c b/ui/gtk.c

index 692ccc7bbb..e032e3c36f 100644

--- a/ui/gtk.c

+++ b/ui/gtk.c

@@ -1649,8 +1649,7 @@ static GSList *gd_vc_menu_init(GtkDisplayState *s, VirtualConsole *vc,

                      G_CALLBACK(gd_menu_switch_vc), s);

     gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), vc->menu_item);

-    group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_item));

-    return group;

+    return gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(vc->menu_item));

 }

 #if defined(CONFIG_VTE)

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c

index bcc06d0e01..86c48b9fa5 100644

--- a/util/qemu-sockets.c

+++ b/util/qemu-sockets.c

@@ -765,15 +765,12 @@ static int vsock_connect_addr(const struct sockaddr_vm *svm, Error **errp)

 static int vsock_connect_saddr(VsockSocketAddress *vaddr, Error **errp)

 {

     struct sockaddr_vm svm;

-    int sock = -1;

     if (!vsock_parse_vaddr_to_sockaddr(vaddr, &svm, errp)) {

         return -1;

     }

-    sock = vsock_connect_addr(&svm, errp);

-

-    return sock;

+    return vsock_connect_addr(&svm, errp);

 }

 static int vsock_listen_saddr(VsockSocketAddress *vaddr,

-- 

2.27.0