Commit 5aede7f4 authored by Zhang Chen's avatar Zhang Chen Committed by Dr. David Alan Gilbert
Browse files

qemu-option.hx: Update missed parameter for colo-compare 



We missed the iothread related args in this file.
This patch is used to fix this issue.

Signed-off-by: default avatarZhang Chen <chen.zhang@intel.com>
Message-Id: <20190426090730.2691-4-chen.zhang@intel.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 9c16abcb

qemu-options.hx

+6 −3
Original line number Diff line number Diff line
@@ -4425,13 +4425,15 @@ Dump the network traffic on netdev @var{dev} to the file specified by 
The file format is libpcap, so it can be analyzed with tools such as tcpdump

or Wireshark.



@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid}[,vnet_hdr_support]

@item -object colo-compare,id=@var{id},primary_in=@var{chardevid},secondary_in=@var{chardevid},outdev=@var{chardevid},iothread=@var{id}[,vnet_hdr_support]



Colo-compare gets packet from primary_in@var{chardevid} and secondary_in@var{chardevid}, than compare primary packet with

secondary packet. If the packets are same, we will output primary

packet to outdev@var{chardevid}, else we will notify colo-frame

do checkpoint and send primary packet to outdev@var{chardevid}.

if it has the vnet_hdr_support flag, colo compare will send/recv packet with vnet_hdr_len.

In order to improve efficiency, we need to put the task of comparison

in another thread. If it has the vnet_hdr_support flag, colo compare

will send/recv packet with vnet_hdr_len.



we must use it with the help of filter-mirror and filter-redirector.
@@ -4446,10 +4448,11 @@ primary: 
-chardev socket,id=compare0-0,host=3.3.3.3,port=9001

-chardev socket,id=compare_out,host=3.3.3.3,port=9005,server,nowait

-chardev socket,id=compare_out0,host=3.3.3.3,port=9005

-object iothread,id=iothread1

-object filter-mirror,id=m0,netdev=hn0,queue=tx,outdev=mirror0

-object filter-redirector,netdev=hn0,id=redire0,queue=rx,indev=compare_out

-object filter-redirector,netdev=hn0,id=redire1,queue=rx,outdev=compare0

-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0

-object colo-compare,id=comp0,primary_in=compare0-0,secondary_in=compare1,outdev=compare_out0,iothread=iothread1



secondary:

-netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,down script=/etc/qemu-ifdown