qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>, "Kevin Wolf" <kwolf@redhat.com>,
	qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
	"Maxim Levitsky" <mlevitsk@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 09/17] block/nvme: Remove unused argument from nvme_free_queue_pair()
Date: Thu, 25 Jun 2020 20:48:30 +0200	[thread overview]
Message-ID: <20200625184838.28172-10-philmd@redhat.com> (raw)
In-Reply-To: <20200625184838.28172-1-philmd@redhat.com>

nvme_free_queue_pair() doesn't use BlockDriverState, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 block/nvme.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block/nvme.c b/block/nvme.c
index 095a8ec024..f87f157dc0 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -170,7 +170,7 @@ static void nvme_init_queue(BlockDriverState *bs, NVMeQueue *q,
     }
 }
 
-static void nvme_free_queue_pair(BlockDriverState *bs, NVMeQueuePair *q)
+static void nvme_free_queue_pair(NVMeQueuePair *q)
 {
     qemu_vfree(q->prp_list_pages);
     qemu_vfree(q->sq.queue);
@@ -241,7 +241,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDriverState *bs,
 
     return q;
 fail:
-    nvme_free_queue_pair(bs, q);
+    nvme_free_queue_pair(q);
     return NULL;
 }
 
@@ -568,7 +568,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
     };
     if (nvme_cmd_sync(bs, s->queues[QUEUE_INDEX_ADMIN], &cmd)) {
         error_setg(errp, "Failed to create io queue [%d]", n);
-        nvme_free_queue_pair(bs, q);
+        nvme_free_queue_pair(q);
         return false;
     }
     cmd = (NvmeCmd) {
@@ -579,7 +579,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)
     };
     if (nvme_cmd_sync(bs, s->queues[QUEUE_INDEX_ADMIN], &cmd)) {
         error_setg(errp, "Failed to create io queue [%d]", n);
-        nvme_free_queue_pair(bs, q);
+        nvme_free_queue_pair(q);
         return false;
     }
     s->queues = g_renew(NVMeQueuePair *, s->queues, n + 1);
@@ -776,7 +776,7 @@ static void nvme_close(BlockDriverState *bs)
     BDRVNVMeState *s = bs->opaque;
 
     for (i = 0; i < s->nr_queues; ++i) {
-        nvme_free_queue_pair(bs, s->queues[i]);
+        nvme_free_queue_pair(s->queues[i]);
     }
     g_free(s->queues);
     aio_set_event_notifier(bdrv_get_aio_context(bs), &s->irq_notifier,
-- 
2.21.3



  parent reply	other threads:[~2020-06-25 18:55 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-25 18:48 [PATCH 00/17] block/nvme: Various cleanups required to use multiple queues Philippe Mathieu-Daudé
2020-06-25 18:48 ` [PATCH 01/17] block/nvme: Avoid further processing if trace event not enabled Philippe Mathieu-Daudé
2020-06-26 10:36   ` Stefan Hajnoczi
2020-06-26 14:02     ` Philippe Mathieu-Daudé
2020-06-29 13:02       ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 02/17] block/nvme: Let nvme_create_queue_pair() fail gracefully Philippe Mathieu-Daudé
2020-06-26 11:11   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 03/17] block/nvme: Define QUEUE_INDEX macros to ease code review Philippe Mathieu-Daudé
2020-06-26 11:12   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 04/17] block/nvme: Be explicit we share NvmeIdCtrl / NvmeIdNs structures Philippe Mathieu-Daudé
2020-06-26 11:19   ` Stefan Hajnoczi
2020-06-26 12:45     ` Philippe Mathieu-Daudé
2020-06-25 18:48 ` [PATCH 05/17] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset Philippe Mathieu-Daudé
2020-06-26 12:20   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 06/17] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz) Philippe Mathieu-Daudé
2020-06-26 12:24   ` Stefan Hajnoczi
2020-06-26 12:48     ` Philippe Mathieu-Daudé
2020-06-29 13:07       ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 07/17] block/nvme: Move code around Philippe Mathieu-Daudé
2020-06-26 12:25   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 08/17] block/nvme: Use correct type void* Philippe Mathieu-Daudé
2020-06-26 12:31   ` Stefan Hajnoczi
2020-06-25 18:48 ` Philippe Mathieu-Daudé [this message]
2020-06-26 12:31   ` [PATCH 09/17] block/nvme: Remove unused argument from nvme_free_queue_pair() Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 10/17] block/nvme: Simplify nvme_init_queue() arguments Philippe Mathieu-Daudé
2020-06-26 12:31   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 11/17] block/nvme: Simplify nvme_create_queue_pair() arguments Philippe Mathieu-Daudé
2020-06-26 12:31   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 12/17] block/nvme: Simplify nvme_kick trace event Philippe Mathieu-Daudé
2020-06-26 12:33   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 13/17] block/nvme: Simplify completion trace events Philippe Mathieu-Daudé
2020-06-26 12:34   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 14/17] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE Philippe Mathieu-Daudé
2020-06-26 12:35   ` Stefan Hajnoczi
2020-06-25 18:48 ` [RFC PATCH 15/17] block/nvme: Use per-queue AIO context Philippe Mathieu-Daudé
2020-06-26 12:42   ` Stefan Hajnoczi
2020-06-26 12:59   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 16/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_kick() Philippe Mathieu-Daudé
2020-06-26 12:43   ` Stefan Hajnoczi
2020-06-25 18:48 ` [PATCH 17/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_process_completion Philippe Mathieu-Daudé
2020-06-26 12:46   ` Stefan Hajnoczi
2020-06-25 19:27 ` [PATCH 00/17] block/nvme: Various cleanups required to use multiple queues no-reply
2020-06-26  9:18   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200625184838.28172-10-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=fam@euphon.net \
    --cc=kwolf@redhat.com \
    --cc=mlevitsk@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).