From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
"Jon Doron" <arilou@gmail.com>,
qemu-trivial@nongnu.org, "Roman Kagan" <rkagan@virtuozzo.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Maciej S . Szmigiero" <maciej.szmigiero@oracle.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v4 1/1] hw/hyperv/vmbus: Remove unused vmbus_load/save_req()
Date: Sat, 6 Nov 2021 14:41:55 +0100 [thread overview]
Message-ID: <20211106134155.582312-2-philmd@redhat.com> (raw)
In-Reply-To: <20211106134155.582312-1-philmd@redhat.com>
vmbus_save_req() and vmbus_load_req() are not used.
Remove them to avoid maintaining dead code.
This partially reverts commit 4dd8a7064b8a6527f99a62be11
("vmbus: add infrastructure to save/load vmbus requests").
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/hw/hyperv/vmbus.h | 3 --
hw/hyperv/vmbus.c | 59 ---------------------------------------
2 files changed, 62 deletions(-)
diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h
index f98bea3888d..8ea660dd8e6 100644
--- a/include/hw/hyperv/vmbus.h
+++ b/include/hw/hyperv/vmbus.h
@@ -223,7 +223,4 @@ int vmbus_map_sgl(VMBusChanReq *req, DMADirection dir, struct iovec *iov,
void vmbus_unmap_sgl(VMBusChanReq *req, DMADirection dir, struct iovec *iov,
unsigned iov_cnt, size_t accessed);
-void vmbus_save_req(QEMUFile *f, VMBusChanReq *req);
-void *vmbus_load_req(QEMUFile *f, VMBusDevice *dev, uint32_t size);
-
#endif
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index dbce3b35fba..78c19caf5f7 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -1311,65 +1311,6 @@ static const VMStateDescription vmstate_vmbus_chan_req = {
}
};
-void vmbus_save_req(QEMUFile *f, VMBusChanReq *req)
-{
- VMBusChanReqSave req_save;
-
- req_save.chan_idx = req->chan->subchan_idx;
- req_save.pkt_type = req->pkt_type;
- req_save.msglen = req->msglen;
- req_save.msg = req->msg;
- req_save.transaction_id = req->transaction_id;
- req_save.need_comp = req->need_comp;
- req_save.num = req->sgl.nsg;
- req_save.sgl = g_memdup(req->sgl.sg,
- req_save.num * sizeof(ScatterGatherEntry));
-
- vmstate_save_state(f, &vmstate_vmbus_chan_req, &req_save, NULL);
-
- g_free(req_save.sgl);
-}
-
-void *vmbus_load_req(QEMUFile *f, VMBusDevice *dev, uint32_t size)
-{
- VMBusChanReqSave req_save;
- VMBusChanReq *req = NULL;
- VMBusChannel *chan = NULL;
- uint32_t i;
-
- vmstate_load_state(f, &vmstate_vmbus_chan_req, &req_save, 0);
-
- if (req_save.chan_idx >= dev->num_channels) {
- error_report("%s: %u(chan_idx) > %u(num_channels)", __func__,
- req_save.chan_idx, dev->num_channels);
- goto out;
- }
- chan = &dev->channels[req_save.chan_idx];
-
- if (vmbus_channel_reserve(chan, 0, req_save.msglen)) {
- goto out;
- }
-
- req = vmbus_alloc_req(chan, size, req_save.pkt_type, req_save.msglen,
- req_save.transaction_id, req_save.need_comp);
- if (req_save.msglen) {
- memcpy(req->msg, req_save.msg, req_save.msglen);
- }
-
- for (i = 0; i < req_save.num; i++) {
- qemu_sglist_add(&req->sgl, req_save.sgl[i].base, req_save.sgl[i].len);
- }
-
-out:
- if (req_save.msglen) {
- g_free(req_save.msg);
- }
- if (req_save.num) {
- g_free(req_save.sgl);
- }
- return req;
-}
-
static void channel_event_cb(EventNotifier *e)
{
VMBusChannel *chan = container_of(e, VMBusChannel, notifier);
--
2.31.1
next prev parent reply other threads:[~2021-11-06 13:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-06 13:41 [PATCH v4 0/1] hw/hyperv/vmbus: Is it maintained? Philippe Mathieu-Daudé
2021-11-06 13:41 ` Philippe Mathieu-Daudé [this message]
2021-11-06 19:28 ` Maciej S. Szmigiero
2021-11-08 7:30 ` Philippe Mathieu-Daudé
2021-11-13 15:23 ` Maciej S. Szmigiero
2021-11-12 18:32 ` Vladimir Sementsov-Ogievskiy
2021-11-12 20:39 ` Roman Kagan
2021-11-13 15:23 ` Maciej S. Szmigiero
2021-11-16 10:05 ` Jon Doron
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=20211106134155.582312-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=arilou@gmail.com \
--cc=maciej.szmigiero@oracle.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rkagan@virtuozzo.com \
--cc=vsementsov@virtuozzo.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).