From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 09/37] qemu-storage-daemon: Use qmp_block_export_add()
Date: Fri, 2 Oct 2020 16:43:17 +0200 [thread overview]
Message-ID: <20201002144345.253865-10-kwolf@redhat.com> (raw)
In-Reply-To: <20201002144345.253865-1-kwolf@redhat.com>
No reason to duplicate the functionality locally, we can now just reuse
the QMP command block-export-add for --export.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200924152717.287415-6-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
storage-daemon/qemu-storage-daemon.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index ed26097254..b6f678d3ab 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -150,17 +150,6 @@ static void init_qmp_commands(void)
qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
}
-static void init_export(BlockExportOptions *export, Error **errp)
-{
- switch (export->type) {
- case BLOCK_EXPORT_TYPE_NBD:
- qmp_nbd_server_add(&export->u.nbd, errp);
- break;
- default:
- g_assert_not_reached();
- }
-}
-
static void process_options(int argc, char *argv[])
{
int c;
@@ -241,7 +230,7 @@ static void process_options(int argc, char *argv[])
visit_type_BlockExportOptions(v, NULL, &export, &error_fatal);
visit_free(v);
- init_export(export, &error_fatal);
+ qmp_block_export_add(export, &error_fatal);
qapi_free_BlockExportOptions(export);
break;
}
--
2.25.4
next prev parent reply other threads:[~2020-10-02 14:51 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-02 14:43 [PULL 00/37] Block layer patches Kevin Wolf
2020-10-02 14:43 ` [PULL 01/37] block/sheepdog: Replace magic val by NANOSECONDS_PER_SECOND definition Kevin Wolf
2020-10-02 14:43 ` [PULL 02/37] tests/check-block: Do not run the iotests with old versions of bash Kevin Wolf
2020-10-02 14:43 ` [PULL 03/37] docs: Document the throttle block filter Kevin Wolf
2020-10-02 14:43 ` [PULL 04/37] qemu-io-cmds: Simplify help_oneline Kevin Wolf
2020-10-02 14:43 ` [PULL 05/37] nbd: Remove unused nbd_export_get_blockdev() Kevin Wolf
2020-10-02 14:43 ` [PULL 06/37] qapi: Create block-export module Kevin Wolf
2020-10-02 14:43 ` [PULL 07/37] qapi: Rename BlockExport to BlockExportOptions Kevin Wolf
2020-10-02 14:43 ` [PULL 08/37] block/export: Add BlockExport infrastructure and block-export-add Kevin Wolf
2020-10-02 14:43 ` Kevin Wolf [this message]
2020-10-02 14:43 ` [PULL 10/37] qemu-nbd: Use raw block driver for --offset Kevin Wolf
2020-10-02 14:43 ` [PULL 11/37] block/export: Remove magic from block-export-add Kevin Wolf
2020-10-02 14:43 ` [PULL 12/37] nbd: Add max-connections to nbd-server-start Kevin Wolf
2020-10-02 14:43 ` [PULL 13/37] nbd: Add writethrough to block-export-add Kevin Wolf
2020-10-02 14:43 ` [PULL 14/37] nbd: Remove NBDExport.close callback Kevin Wolf
2020-10-02 14:43 ` [PULL 15/37] qemu-nbd: Use blk_exp_add() to create the export Kevin Wolf
2020-10-02 14:43 ` [PULL 16/37] nbd/server: Simplify export shutdown Kevin Wolf
2020-10-02 14:43 ` [PULL 17/37] block/export: Move refcount from NBDExport to BlockExport Kevin Wolf
2020-10-02 14:43 ` [PULL 18/37] block/export: Move AioContext " Kevin Wolf
2020-10-02 14:43 ` [PULL 19/37] block/export: Add node-name to BlockExportOptions Kevin Wolf
2020-10-02 14:43 ` [PULL 20/37] block/export: Allocate BlockExport in blk_exp_add() Kevin Wolf
2020-10-02 14:43 ` [PULL 21/37] block/export: Add blk_exp_close_all(_type) Kevin Wolf
2020-10-02 14:43 ` [PULL 22/37] block/export: Add 'id' option to block-export-add Kevin Wolf
2020-10-02 14:43 ` [PULL 23/37] block/export: Move strong user reference to block_exports Kevin Wolf
2020-10-02 14:43 ` [PULL 24/37] block/export: Add block-export-del Kevin Wolf
2020-10-02 14:43 ` [PULL 25/37] block/export: Add BLOCK_EXPORT_DELETED event Kevin Wolf
2020-10-02 14:43 ` [PULL 26/37] block/export: Move blk to BlockExport Kevin Wolf
2020-10-02 14:43 ` [PULL 27/37] block/export: Create BlockBackend in blk_exp_add() Kevin Wolf
2020-10-02 14:43 ` [PULL 28/37] block/export: Add query-block-exports Kevin Wolf
2020-10-02 14:43 ` [PULL 29/37] block/export: Move writable to BlockExportOptions Kevin Wolf
2020-10-02 14:43 ` [PULL 30/37] nbd: Merge nbd_export_new() and nbd_export_create() Kevin Wolf
2020-10-02 14:43 ` [PULL 31/37] nbd: Deprecate nbd-server-add/remove Kevin Wolf
2020-10-02 14:43 ` [PULL 32/37] iotests: Factor out qemu_tool_pipe_and_status() Kevin Wolf
2020-10-02 14:43 ` [PULL 33/37] iotests: Introduce qemu_nbd_list_log() Kevin Wolf
2020-10-02 14:43 ` [PULL 34/37] iotests: Allow supported and unsupported formats at the same time Kevin Wolf
2020-10-02 14:43 ` [PULL 35/37] iotests: Test block-export-* QMP interface Kevin Wolf
2020-10-02 14:43 ` [PULL 36/37] qemu-storage-daemon: Fix help line for --export Kevin Wolf
2020-10-02 14:43 ` [PULL 37/37] qcow2: Use L1E_SIZE in qcow2_write_l1_entry() Kevin Wolf
2020-10-02 18:11 ` [PULL 00/37] Block layer patches Peter Maydell
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=20201002144345.253865-10-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).