From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr5GG-0002U9-6B for qemu-devel@nongnu.org; Wed, 10 Aug 2011 05:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qr5GA-0003AZ-5D for qemu-devel@nongnu.org; Wed, 10 Aug 2011 05:39:40 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:40057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr5G9-0003AF-U1 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 05:39:34 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p7A9dWb0018858 for ; Wed, 10 Aug 2011 09:39:32 GMT Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7A9dWoC1732656 for ; Wed, 10 Aug 2011 10:39:32 +0100 Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7A9dVfP015314 for ; Wed, 10 Aug 2011 03:39:31 -0600 Date: Wed, 10 Aug 2011 10:39:29 +0100 From: Stefan Hajnoczi Message-ID: <20110810093929.GE28852@stefanha-thinkpad.localdomain> References: <1312863472-6901-1-git-send-email-wuzhy@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v5 0/4] The intro of QEMU block I/O throttling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhi Yong Wu Cc: kwolf@redhat.com, pair@us.ibm.com, kvm@vger.kernel.org, Stefan Hajnoczi , mtosatti@redhat.com, qemu-devel@nongnu.org, ryanh@us.ibm.com, Zhi Yong Wu , luowenj@cn.ibm.com On Wed, Aug 10, 2011 at 01:09:27PM +0800, Zhi Yong Wu wrote: > On Tue, Aug 9, 2011 at 8:08 PM, Stefan Hajnoczi wr= ote: > > On Tue, Aug 9, 2011 at 5:17 AM, Zhi Yong Wu wrote: > >> =A0Makefile.objs =A0 =A0 | =A0 =A02 +- > >> =A0block.c =A0 =A0 =A0 =A0 =A0 | =A0347 ++++++++++++++++++++++++++++= +++++++++++++++++++++++-- > >> =A0block.h =A0 =A0 =A0 =A0 =A0 | =A0 =A06 +- > >> =A0block/blk-queue.c | =A0141 ++++++++++++++++++++++ > >> =A0block/blk-queue.h | =A0 73 +++++++++++ > >> =A0block_int.h =A0 =A0 =A0 | =A0 30 +++++ > >> =A0blockdev.c =A0 =A0 =A0 =A0| =A0108 +++++++++++++++++ > >> =A0blockdev.h =A0 =A0 =A0 =A0| =A0 =A02 + > >> =A0hmp-commands.hx =A0 | =A0 15 +++ > >> =A0qemu-config.c =A0 =A0 | =A0 24 ++++ > >> =A0qemu-option.c =A0 =A0 | =A0 17 +++ > >> =A0qemu-option.h =A0 =A0 | =A0 =A01 + > >> =A0qemu-options.hx =A0 | =A0 =A01 + > >> =A0qerror.c =A0 =A0 =A0 =A0 =A0| =A0 =A04 + > >> =A0qerror.h =A0 =A0 =A0 =A0 =A0| =A0 =A03 + > >> =A0qmp-commands.hx =A0 | =A0 52 ++++++++- > >> =A016 files changed, 813 insertions(+), 13 deletions(-) > >> =A0create mode 100644 block/blk-queue.c > >> =A0create mode 100644 block/blk-queue.h > > > > This series is against qemu-kvm.git, please send block patches agains= t > > qemu.git/master in the future. =A0There is no qemu-kvm.git-specific c= ode > > here so just working against qemu.git and emailing qemu-devel is best. > Do you know how to rebase it from qemu-kvm.git to qemu.git directly? This is what I do: # Export patches for all commits I have made since master $ cd qemu-kvm $ git format-patch master.. # Import patches into qemu.git $ cd qemu && git checkout -b io_limits master $ git am ~/qemu-kvm/*.patch git-am(1) will ask you to resolve any conflicts. Stefan