Re: [PATCH v6 06/21] net: Remove flag propagation
On 11.11.2023 17:27, Akihiko Odaki wrote: On 2023/11/10 16:35, Pavel Dovgalyuk wrote: You need to bump REPLAY_VERSION in replay/replay.c, because your patch changes the replay log format. Otherwise, for replay part: Acked-by: Pavel Dovgalyuk I'll drop this change then. It's just a cleanup and does not bring an additional benefit worth breaking the log format. Breaking the log format is ok, because replays may be incompatible for different builds, because peripheral or vCPU behavior may change. So bumping the version just helps with not replaying the wrong log.
Re: [PATCH v6 06/21] net: Remove flag propagation
On 2023/11/10 16:35, Pavel Dovgalyuk wrote: You need to bump REPLAY_VERSION in replay/replay.c, because your patch changes the replay log format. Otherwise, for replay part: Acked-by: Pavel Dovgalyuk I'll drop this change then. It's just a cleanup and does not bring an additional benefit worth breaking the log format.
Re: [PATCH v6 06/21] net: Remove flag propagation
You need to bump REPLAY_VERSION in replay/replay.c, because your patch
changes the replay log format.
Otherwise, for replay part:
Acked-by: Pavel Dovgalyuk
On 30.10.2023 08:12, Akihiko Odaki wrote:
There is no defined flag now.
Signed-off-by: Akihiko Odaki
---
include/net/filter.h| 3 ---
include/net/queue.h | 6 --
include/sysemu/replay.h | 2 +-
net/dump.c | 4 ++--
net/filter-buffer.c | 4 +---
net/filter-mirror.c | 6 ++
net/filter-replay.c | 3 +--
net/filter-rewriter.c | 5 ++---
net/filter.c| 8 +++-
net/net.c | 43 ++---
replay/replay-net.c | 8 ++--
11 files changed, 28 insertions(+), 64 deletions(-)
diff --git a/include/net/filter.h b/include/net/filter.h
index 27ffc630df..e523771e72 100644
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -26,7 +26,6 @@ typedef void (FilterCleanup) (NetFilterState *nf);
*/
typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
@@ -65,14 +64,12 @@ struct NetFilterState {
ssize_t qemu_netfilter_receive(NetFilterState *nf,
NetFilterDirection direction,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
/* pass the packet to the next filter */
ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
-unsigned flags,
const struct iovec *iov,
int iovcnt,
void *opaque);
diff --git a/include/net/queue.h b/include/net/queue.h
index 7a43863be2..571f4e1436 100644
--- a/include/net/queue.h
+++ b/include/net/queue.h
@@ -30,15 +30,12 @@ typedef struct NetQueue NetQueue;
typedef void (NetPacketSent) (NetClientState *sender, ssize_t ret);
-#define QEMU_NET_PACKET_FLAG_NONE 0
-
/* Returns:
* >0 - success
*0 - queue packet for future redelivery
* <0 - failure (discard packet)
*/
typedef ssize_t (NetQueueDeliverFunc)(NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
void *opaque);
@@ -47,7 +44,6 @@ NetQueue *qemu_new_net_queue(NetQueueDeliverFunc *deliver,
void *opaque);
void qemu_net_queue_append_iov(NetQueue *queue,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
@@ -64,14 +60,12 @@ ssize_t qemu_net_queue_receive_iov(NetQueue *queue,
ssize_t qemu_net_queue_send(NetQueue *queue,
NetClientState *sender,
-unsigned flags,
const uint8_t *data,
size_t size,
NetPacketSent *sent_cb);
ssize_t qemu_net_queue_send_iov(NetQueue *queue,
NetClientState *sender,
-unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 08aae5869f..67b2d3ac73 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -158,7 +158,7 @@ ReplayNetState *replay_register_net(NetFilterState *nfs);
/*! Unregisters replay network filter. */
void replay_unregister_net(ReplayNetState *rns);
/*! Called to write network packet to the replay log. */
-void replay_net_packet_event(ReplayNetState *rns, unsigned flags,
+void replay_net_packet_event(ReplayNetState *rns,
const struct iovec *iov, int iovcnt);
/* Audio */
diff --git a/net/dump.c b/net/dump.c
index 956e34a123..dd8ada9b5e 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -150,8 +150,8 @@ struct NetFilterDumpState {
};
static ssize_t filter_dump_receive_iov(NetFilterState *nf, NetClientState *sndr,
- unsigned flags, const struct iovec *iov,
- int iovcnt, NetPacketSent *sent_cb)
+ const struct iovec *iov, int iovcnt
[PATCH v6 06/21] net: Remove flag propagation
There is no defined flag now.
Signed-off-by: Akihiko Odaki
---
include/net/filter.h| 3 ---
include/net/queue.h | 6 --
include/sysemu/replay.h | 2 +-
net/dump.c | 4 ++--
net/filter-buffer.c | 4 +---
net/filter-mirror.c | 6 ++
net/filter-replay.c | 3 +--
net/filter-rewriter.c | 5 ++---
net/filter.c| 8 +++-
net/net.c | 43 ++---
replay/replay-net.c | 8 ++--
11 files changed, 28 insertions(+), 64 deletions(-)
diff --git a/include/net/filter.h b/include/net/filter.h
index 27ffc630df..e523771e72 100644
--- a/include/net/filter.h
+++ b/include/net/filter.h
@@ -26,7 +26,6 @@ typedef void (FilterCleanup) (NetFilterState *nf);
*/
typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
@@ -65,14 +64,12 @@ struct NetFilterState {
ssize_t qemu_netfilter_receive(NetFilterState *nf,
NetFilterDirection direction,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
/* pass the packet to the next filter */
ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,
-unsigned flags,
const struct iovec *iov,
int iovcnt,
void *opaque);
diff --git a/include/net/queue.h b/include/net/queue.h
index 7a43863be2..571f4e1436 100644
--- a/include/net/queue.h
+++ b/include/net/queue.h
@@ -30,15 +30,12 @@ typedef struct NetQueue NetQueue;
typedef void (NetPacketSent) (NetClientState *sender, ssize_t ret);
-#define QEMU_NET_PACKET_FLAG_NONE 0
-
/* Returns:
* >0 - success
*0 - queue packet for future redelivery
* <0 - failure (discard packet)
*/
typedef ssize_t (NetQueueDeliverFunc)(NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
void *opaque);
@@ -47,7 +44,6 @@ NetQueue *qemu_new_net_queue(NetQueueDeliverFunc *deliver,
void *opaque);
void qemu_net_queue_append_iov(NetQueue *queue,
NetClientState *sender,
- unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
@@ -64,14 +60,12 @@ ssize_t qemu_net_queue_receive_iov(NetQueue *queue,
ssize_t qemu_net_queue_send(NetQueue *queue,
NetClientState *sender,
-unsigned flags,
const uint8_t *data,
size_t size,
NetPacketSent *sent_cb);
ssize_t qemu_net_queue_send_iov(NetQueue *queue,
NetClientState *sender,
-unsigned flags,
const struct iovec *iov,
int iovcnt,
NetPacketSent *sent_cb);
diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index 08aae5869f..67b2d3ac73 100644
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -158,7 +158,7 @@ ReplayNetState *replay_register_net(NetFilterState *nfs);
/*! Unregisters replay network filter. */
void replay_unregister_net(ReplayNetState *rns);
/*! Called to write network packet to the replay log. */
-void replay_net_packet_event(ReplayNetState *rns, unsigned flags,
+void replay_net_packet_event(ReplayNetState *rns,
const struct iovec *iov, int iovcnt);
/* Audio */
diff --git a/net/dump.c b/net/dump.c
index 956e34a123..dd8ada9b5e 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -150,8 +150,8 @@ struct NetFilterDumpState {
};
static ssize_t filter_dump_receive_iov(NetFilterState *nf, NetClientState
*sndr,
- unsigned flags, const struct iovec *iov,
- int iovcnt, NetPacketSent *sent_cb)
+ const struct iovec *iov, int iovcnt,
+ NetPacketSent *sent_cb)
{
NetFilterDumpState *nfds = FILTER_DUMP(nf);
diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 283dc9cbe6..6d8b581cd8 100644
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -58,7 +58,6 @
