* [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus
@ 2022-05-30 18:41 Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 1/2] MAINTAINERS: " Maciej S. Szmigiero
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2022-05-30 18:41 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth
The following changes since commit f7a1ea403e0282a7f57edd4298c4f65f24165da5:
Merge tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu into staging (2022-05-29 16:34:56 -0700)
are available in the Git repository at:
https://github.com/maciejsszmigiero/qemu.git tags/vmbus-maint-20220530
for you to fetch changes up to 6ede46b910ac66fd10bc169fb0a6f681429a9c5c:
hw/hyperv/vmbus: Remove unused vmbus_load/save_req() (2022-05-30 19:49:42 +0200)
----------------------------------------------------------------
As discussed in https://lore.kernel.org/qemu-devel/4e03945d-fb92-494d-53a8-f22ee91501c9@redhat.com/
I am adding myself as the maintainer for Hyper-V VMBus, so there is some
contact point for incoming patches and somebody to review and pick up them.
The VMBus code is currently in a good shape, this pull request also
includes a single patch that has been waiting for being picked up since
November last year.
----------------------------------------------------------------
Maciej S. Szmigiero (1):
MAINTAINERS: Add myself as the maintainer for Hyper-V VMBus
Philippe Mathieu-Daudé (1):
hw/hyperv/vmbus: Remove unused vmbus_load/save_req()
MAINTAINERS | 6 +++
hw/hyperv/vmbus.c | 99 -----------------------------------------------
include/hw/hyperv/vmbus.h | 3 --
3 files changed, 6 insertions(+), 102 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PULL 1/2] MAINTAINERS: Add myself as the maintainer for Hyper-V VMBus
2022-05-30 18:41 [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Maciej S. Szmigiero
@ 2022-05-30 18:41 ` Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 2/2] hw/hyperv/vmbus: Remove unused vmbus_load/save_req() Maciej S. Szmigiero
2022-05-30 21:06 ` [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Richard Henderson
2 siblings, 0 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2022-05-30 18:41 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth
From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>
This way there is some contact point for incoming patches,
and somebody to review and pick up them.
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
---
MAINTAINERS | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index dff0200f70..00dc4a8ecb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1777,6 +1777,12 @@ F: include/hw/block/fdc.h
F: tests/qtest/fdc-test.c
T: git https://gitlab.com/jsnow/qemu.git ide
+Hyper-V VMBus
+M: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
+S: Odd Fixes
+F: hw/hyperv/vmbus.c
+F: include/hw/hyperv/vmbus*.h
+
OMAP
M: Peter Maydell <peter.maydell@linaro.org>
L: qemu-arm@nongnu.org
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PULL 2/2] hw/hyperv/vmbus: Remove unused vmbus_load/save_req()
2022-05-30 18:41 [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 1/2] MAINTAINERS: " Maciej S. Szmigiero
@ 2022-05-30 18:41 ` Maciej S. Szmigiero
2022-05-30 21:06 ` [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Richard Henderson
2 siblings, 0 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2022-05-30 18:41 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
vmbus_save_req() and vmbus_load_req() are not used.
Remove them to avoid maintaining dead code.
This essentially reverts commit 4dd8a7064b8a6527f99a62be11
("vmbus: add infrastructure to save/load vmbus requests").
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211106134155.582312-2-philmd@redhat.com>
[MSS: Remove also corresponding variables, which are now unused]
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
---
hw/hyperv/vmbus.c | 99 ---------------------------------------
include/hw/hyperv/vmbus.h | 3 --
2 files changed, 102 deletions(-)
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 8aad29f1bb..30bc04e1c4 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -1273,105 +1273,6 @@ void vmbus_free_req(void *req)
g_free(req);
}
-static const VMStateDescription vmstate_sgent = {
- .name = "vmbus/sgentry",
- .version_id = 0,
- .minimum_version_id = 0,
- .fields = (VMStateField[]) {
- VMSTATE_UINT64(base, ScatterGatherEntry),
- VMSTATE_UINT64(len, ScatterGatherEntry),
- VMSTATE_END_OF_LIST()
- }
-};
-
-typedef struct VMBusChanReqSave {
- uint16_t chan_idx;
- uint16_t pkt_type;
- uint32_t msglen;
- void *msg;
- uint64_t transaction_id;
- bool need_comp;
- uint32_t num;
- ScatterGatherEntry *sgl;
-} VMBusChanReqSave;
-
-static const VMStateDescription vmstate_vmbus_chan_req = {
- .name = "vmbus/vmbus_chan_req",
- .version_id = 0,
- .minimum_version_id = 0,
- .fields = (VMStateField[]) {
- VMSTATE_UINT16(chan_idx, VMBusChanReqSave),
- VMSTATE_UINT16(pkt_type, VMBusChanReqSave),
- VMSTATE_UINT32(msglen, VMBusChanReqSave),
- VMSTATE_VBUFFER_ALLOC_UINT32(msg, VMBusChanReqSave, 0, NULL, msglen),
- VMSTATE_UINT64(transaction_id, VMBusChanReqSave),
- VMSTATE_BOOL(need_comp, VMBusChanReqSave),
- VMSTATE_UINT32(num, VMBusChanReqSave),
- VMSTATE_STRUCT_VARRAY_POINTER_UINT32(sgl, VMBusChanReqSave, num,
- vmstate_sgent, ScatterGatherEntry),
- VMSTATE_END_OF_LIST()
- }
-};
-
-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);
diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h
index f98bea3888..8ea660dd8e 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus
2022-05-30 18:41 [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 1/2] MAINTAINERS: " Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 2/2] hw/hyperv/vmbus: Remove unused vmbus_load/save_req() Maciej S. Szmigiero
@ 2022-05-30 21:06 ` Richard Henderson
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2022-05-30 21:06 UTC (permalink / raw)
To: Maciej S. Szmigiero, qemu-devel; +Cc: Thomas Huth
On 5/30/22 11:41, Maciej S. Szmigiero wrote:
> The following changes since commit f7a1ea403e0282a7f57edd4298c4f65f24165da5:
>
> Merge tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu into staging (2022-05-29 16:34:56 -0700)
>
> are available in the Git repository at:
>
> https://github.com/maciejsszmigiero/qemu.git tags/vmbus-maint-20220530
>
> for you to fetch changes up to 6ede46b910ac66fd10bc169fb0a6f681429a9c5c:
>
> hw/hyperv/vmbus: Remove unused vmbus_load/save_req() (2022-05-30 19:49:42 +0200)
>
> ----------------------------------------------------------------
>
> As discussed in https://lore.kernel.org/qemu-devel/4e03945d-fb92-494d-53a8-f22ee91501c9@redhat.com/
> I am adding myself as the maintainer for Hyper-V VMBus, so there is some
> contact point for incoming patches and somebody to review and pick up them.
>
> The VMBus code is currently in a good shape, this pull request also
> includes a single patch that has been waiting for being picked up since
> November last year.
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/7.1 as appropriate.
r~
>
> ----------------------------------------------------------------
>
> Maciej S. Szmigiero (1):
> MAINTAINERS: Add myself as the maintainer for Hyper-V VMBus
>
> Philippe Mathieu-Daudé (1):
> hw/hyperv/vmbus: Remove unused vmbus_load/save_req()
>
> MAINTAINERS | 6 +++
> hw/hyperv/vmbus.c | 99 -----------------------------------------------
> include/hw/hyperv/vmbus.h | 3 --
> 3 files changed, 6 insertions(+), 102 deletions(-)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-30 21:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-30 18:41 [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 1/2] MAINTAINERS: " Maciej S. Szmigiero
2022-05-30 18:41 ` [PULL 2/2] hw/hyperv/vmbus: Remove unused vmbus_load/save_req() Maciej S. Szmigiero
2022-05-30 21:06 ` [PULL 0/2] Add myself as the maintainer for Hyper-V VMBus Richard Henderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.