From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Max Reitz" <mreitz@redhat.com>
Subject: [PULL v2 12/28] util/vhost-user-server: drop unused DevicePanicNotifier
Date: Thu, 22 Oct 2020 12:27:10 +0100 [thread overview]
Message-ID: <20201022112726.736757-13-stefanha@redhat.com> (raw)
In-Reply-To: <20201022112726.736757-1-stefanha@redhat.com>
The device panic notifier callback is not used. Drop it.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200924151549.913737-7-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
util/vhost-user-server.h | 3 ---
block/export/vhost-user-blk-server.c | 3 +--
util/vhost-user-server.c | 6 ------
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/util/vhost-user-server.h b/util/vhost-user-server.h
index 5232f96718..92177fc911 100644
--- a/util/vhost-user-server.h
+++ b/util/vhost-user-server.h
@@ -29,12 +29,10 @@ typedef struct VuFdWatch {
} VuFdWatch;
typedef struct VuServer VuServer;
-typedef void DevicePanicNotifierFn(VuServer *server);
struct VuServer {
QIONetListener *listener;
AioContext *ctx;
- DevicePanicNotifierFn *device_panic_notifier;
int max_queues;
const VuDevIface *vu_iface;
VuDev vu_dev;
@@ -54,7 +52,6 @@ bool vhost_user_server_start(VuServer *server,
SocketAddress *unix_socket,
AioContext *ctx,
uint16_t max_queues,
- DevicePanicNotifierFn *device_panic_notifier,
const VuDevIface *vu_iface,
Error **errp);
diff --git a/block/export/vhost-user-blk-server.c b/block/export/vhost-user-blk-server.c
index d227b468d8..c8fa4ecba9 100644
--- a/block/export/vhost-user-blk-server.c
+++ b/block/export/vhost-user-blk-server.c
@@ -439,8 +439,7 @@ static void vhost_user_blk_server_start(VuBlockDev *vu_block_device,
ctx = bdrv_get_aio_context(blk_bs(vu_block_device->backend));
if (!vhost_user_server_start(&vu_block_device->vu_server, addr, ctx,
- VHOST_USER_BLK_MAX_QUEUES,
- NULL, &vu_block_iface,
+ VHOST_USER_BLK_MAX_QUEUES, &vu_block_iface,
errp)) {
goto error;
}
diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 6efe2279fd..73a1667b54 100644
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -81,10 +81,6 @@ static void panic_cb(VuDev *vu_dev, const char *buf)
close_client(server);
}
- if (server->device_panic_notifier) {
- server->device_panic_notifier(server);
- }
-
/*
* Set the callback function for network listener so another
* vhost-user client can connect to this server
@@ -385,7 +381,6 @@ bool vhost_user_server_start(VuServer *server,
SocketAddress *socket_addr,
AioContext *ctx,
uint16_t max_queues,
- DevicePanicNotifierFn *device_panic_notifier,
const VuDevIface *vu_iface,
Error **errp)
{
@@ -402,7 +397,6 @@ bool vhost_user_server_start(VuServer *server,
.vu_iface = vu_iface,
.max_queues = max_queues,
.ctx = ctx,
- .device_panic_notifier = device_panic_notifier,
};
qio_net_listener_set_name(server->listener, "vhost-user-backend-listener");
--
2.26.2
next prev parent reply other threads:[~2020-10-22 11:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 11:26 [PULL v2 00/28] Block patches Stefan Hajnoczi
2020-10-22 11:26 ` [PULL v2 01/28] block/nvme: Add driver statistics for access alignment and hw errors Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 02/28] libvhost-user: Allow vu_message_read to be replaced Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 03/28] libvhost-user: remove watch for kick_fd when de-initialize vu-dev Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 04/28] util/vhost-user-server: generic vhost user server Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 05/28] block: move logical block size check function to a common utility function Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 06/28] block/export: vhost-user block device backend server Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 07/28] MAINTAINERS: Add vhost-user block device backend server maintainer Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 08/28] util/vhost-user-server: s/fileds/fields/ typo fix Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 09/28] util/vhost-user-server: drop unnecessary QOM cast Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 10/28] util/vhost-user-server: drop unnecessary watch deletion Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 11/28] block/export: consolidate request structs into VuBlockReq Stefan Hajnoczi
2020-10-22 11:27 ` Stefan Hajnoczi [this message]
2020-10-22 11:27 ` [PULL v2 13/28] util/vhost-user-server: fix memory leak in vu_message_read() Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 14/28] util/vhost-user-server: check EOF when reading payload Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 15/28] util/vhost-user-server: rework vu_client_trip() coroutine lifecycle Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 16/28] block/export: report flush errors Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 17/28] block/export: convert vhost-user-blk server to block export API Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 18/28] util/vhost-user-server: move header to include/ Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 19/28] util/vhost-user-server: use static library in meson.build Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 20/28] qemu-storage-daemon: avoid compiling blockdev_ss twice Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 21/28] block: move block exports to libblockdev Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 22/28] block/export: add iothread and fixed-iothread options Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 23/28] block/export: add vhost-user-blk multi-queue support Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 24/28] block/io: fix bdrv_co_block_status_above Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 25/28] block/io: bdrv_common_block_status_above: support include_base Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 26/28] block/io: bdrv_common_block_status_above: support bs == base Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 27/28] block/io: fix bdrv_is_allocated_above Stefan Hajnoczi
2020-10-22 11:27 ` [PULL v2 28/28] iotests: add commit top->base cases to 274 Stefan Hajnoczi
2020-10-22 12:12 ` [PULL v2 00/28] Block patches no-reply
2020-10-22 14:09 ` 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=20201022112726.736757-13-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@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).