We add the vnet_hdr option for filter-redirector, default is disable.
If you use virtio-net-pci net driver, please enable it.
Because colo-compare or other modules needs the vnet_hdr_len to parse
packet, so we add this new option send the len to others.
You can use it for example:
-object
filter-redirector,id=r0,netdev=hn0,queue=tx,outdev=red0,vnet_hdr=on
Signed-off-by: Zhang Chen <address@hidden>
---
net/filter-mirror.c | 33 +++++++++++++++++++++++++++++++++
qemu-options.hx | 6 +++---
2 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index 8df0be6..6c8579f 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -381,6 +381,13 @@ static char *filter_redirector_get_outdev(Object
*obj, Error **errp)
return g_strdup(s->outdev);
}
+static char *filter_redirector_get_vnet_hdr(Object *obj, Error
**errp)
+{
+ MirrorState *s = FILTER_REDIRECTOR(obj);
+
+ return s->vnet_hdr ? g_strdup("on") : g_strdup("off");
+}
+
static void
filter_redirector_set_outdev(Object *obj, const char *value, Error
**errp)
{
@@ -390,6 +397,21 @@ filter_redirector_set_outdev(Object *obj, const
char *value, Error **errp)
s->outdev = g_strdup(value);
}
+static void filter_redirector_set_vnet_hdr(Object *obj,
+ const char *value,
+ Error **errp)
+{
+ MirrorState *s = FILTER_REDIRECTOR(obj);
+
+ if (strcmp(value, "on") && strcmp(value, "off")) {
+ error_setg(errp, "Invalid value for filter-redirector
vnet_hdr, "
+ "should be 'on' or 'off'");
+ return;
+ }
+
+ s->vnet_hdr = !strcmp(value, "on");
+}
+
static void filter_mirror_init(Object *obj)
{
MirrorState *s = FILTER_MIRROR(obj);
@@ -409,10 +431,21 @@ static void filter_mirror_init(Object *obj)
static void filter_redirector_init(Object *obj)
{
+ MirrorState *s = FILTER_REDIRECTOR(obj);
+
object_property_add_str(obj, "indev", filter_redirector_get_indev,
filter_redirector_set_indev, NULL);
object_property_add_str(obj, "outdev",
filter_redirector_get_outdev,
filter_redirector_set_outdev, NULL);
+
+ /*
+ * The vnet_hdr is disabled by default, if you want to enable
+ * this option, you must enable all the option on related modules
+ * (like other filter or colo-compare).
+ */
+ s->vnet_hdr = false;
+ object_property_add_str(obj, "vnet_hdr",
filter_redirector_get_vnet_hdr,
+ filter_redirector_set_vnet_hdr, NULL);