From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLP-00026D-Pz for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWMLK-0008NL-UK for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:11 -0400 Received: from [59.151.112.132] (port=47516 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWMLK-00083l-8k for qemu-devel@nongnu.org; Tue, 23 Sep 2014 05:25:06 -0400 From: Yang Hongyang Date: Tue, 23 Sep 2014 17:23:50 +0800 Message-ID: <1411464235-5653-19-git-send-email-yanghy@cn.fujitsu.com> In-Reply-To: <1411464235-5653-1-git-send-email-yanghy@cn.fujitsu.com> References: <1411464235-5653-1-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [RFC PATCH v2 18/23] COLO nic: add command line switch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , GuiJianfeng@cn.fujitsu.com, yunhong.jiang@intel.com, eddie.dong@intel.com, dgilbert@redhat.com, mrhines@linux.vnet.ibm.com, Anthony Liguori , yanghy@cn.fujitsu.com add command line switch Signed-off-by: Yang Hongyang Cc: Anthony Liguori Cc: Stefan Hajnoczi --- qapi-schema.json | 8 +++++++- qemu-options.hx | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 7dcfb90..e53a571 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2008,6 +2008,10 @@ # # @queues: #optional number of queues to be created for multiqueue capable tap # +# @colo_nicname: #optional the host physical nic for QEMU (Since 2.2) +# +# @colo_script: #optional the script file which used by COLO (Since 2.2) +# # Since 1.2 ## { 'type': 'NetdevTapOptions', @@ -2024,7 +2028,9 @@ '*vhostfd': 'str', '*vhostfds': 'str', '*vhostforce': 'bool', - '*queues': 'uint32'} } + '*queues': 'uint32', + '*colo_nicname': 'str', + '*colo_script': 'str'} } ## # @NetdevSocketOptions diff --git a/qemu-options.hx b/qemu-options.hx index 365b56c..9f31dcc 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1412,7 +1412,11 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, "-net tap[,vlan=n][,name=str],ifname=name\n" " connect the host TAP network interface to VLAN 'n'\n" #else - "-net tap[,vlan=n][,name=str][,fd=h][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off][,queues=n]\n" + "-net tap[,vlan=n][,name=str][,fd=h][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off][,queues=n]" +#ifdef CONFIG_COLO + "[,colo_nicname=nicname][,colo_script=scriptfile]" +#endif + "\n" " connect the host TAP network interface to VLAN 'n'\n" " use network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n" " to configure it and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n" @@ -1432,6 +1436,10 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, " use 'vhostfd=h' to connect to an already opened vhost net device\n" " use 'vhostfds=x:y:...:z to connect to multiple already opened vhost net devices\n" " use 'queues=n' to specify the number of queues to be created for multiqueue TAP\n" +#ifdef CONFIG_COLO + " use 'colo_nicname=nicname' to specify the host physical nic for QEMU\n" + " use 'colo_script=scriptfile' to specify script file when colo is enabled\n" +#endif "-net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper]\n" " connects a host TAP network interface to a host bridge device 'br'\n" " (default=" DEFAULT_BRIDGE_INTERFACE ") using the program 'helper'\n" -- 1.9.1