diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9c2578893a729c267af2d85c058159b4e5affac8..084530f9a786617e91039e223c3b7c67d4268ea4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4869,6 +4869,10 @@ qemuBuildNicDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",host_ufo=%s", virTristateSwitchTypeToString(net->driver.virtio.host.ufo)); } + if (net->driver.virtio.host.mrg_rxbuf) { + virBufferAsprintf(&buf, ",mrg_rxbuf=%s", + virTristateSwitchTypeToString(net->driver.virtio.host.mrg_rxbuf)); + } if (net->driver.virtio.guest.csum) { virBufferAsprintf(&buf, ",guest_csum=%s", virTristateSwitchTypeToString(net->driver.virtio.guest.csum)); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f1079fb59434cb424fc1bf1213c07260e68224c2..8691c7e8f19aa1358c7303c8a6bb40cfe51e4a33 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2106,6 +2106,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, olddev->driver.virtio.host.tso6 != newdev->driver.virtio.host.tso6 || olddev->driver.virtio.host.ecn != newdev->driver.virtio.host.ecn || olddev->driver.virtio.host.ufo != newdev->driver.virtio.host.ufo || + olddev->driver.virtio.host.mrg_rxbuf != newdev->driver.virtio.host.mrg_rxbuf || olddev->driver.virtio.guest.csum != newdev->driver.virtio.guest.csum || olddev->driver.virtio.guest.tso4 != newdev->driver.virtio.guest.tso4 || olddev->driver.virtio.guest.tso6 != newdev->driver.virtio.guest.tso6 || diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args index b7ce2829370b246d7f61f46c9d7dc0df75fe3274..29cfaf7f71e5a3245c062daf4037299506456331 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args @@ -3,7 +3,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -hda /dev/HostVG/QEMUGuest7 \ -device virtio-net-pci,csum=off,gso=off,\ -host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,\ +host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,\ guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,\ vlan=0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml index e368c4352a61ad83558c03c9c9304f51f710340f..f1be0517862212842826e97279b22113730a32ed 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.xml @@ -26,7 +26,7 @@ - +