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 <stefa...@gmail.com> wrote: > > On Tue, Aug 9, 2011 at 5:17 AM, Zhi Yong Wu <wu...@linux.vnet.ibm.com> > > wrote: > >> Makefile.objs | 2 +- > >> block.c | 347 > >> +++++++++++++++++++++++++++++++++++++++++++++++++++-- > >> block.h | 6 +- > >> block/blk-queue.c | 141 ++++++++++++++++++++++ > >> block/blk-queue.h | 73 +++++++++++ > >> block_int.h | 30 +++++ > >> blockdev.c | 108 +++++++++++++++++ > >> blockdev.h | 2 + > >> hmp-commands.hx | 15 +++ > >> qemu-config.c | 24 ++++ > >> qemu-option.c | 17 +++ > >> qemu-option.h | 1 + > >> qemu-options.hx | 1 + > >> qerror.c | 4 + > >> qerror.h | 3 + > >> qmp-commands.hx | 52 ++++++++- > >> 16 files changed, 813 insertions(+), 13 deletions(-) > >> create mode 100644 block/blk-queue.c > >> create mode 100644 block/blk-queue.h > > > > This series is against qemu-kvm.git, please send block patches against > > qemu.git/master in the future. There is no qemu-kvm.git-specific code > > 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
