On Fri, Jun 6, 2014 at 8:51 PM, Markus Armbruster <arm...@redhat.com> wrote: > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > block/qapi.c | 13 ++++++------- > include/block/qapi.h | 7 ------- > 2 files changed, 6 insertions(+), 14 deletions(-)
Unfortunately I had to drop this patch because it conflicts with the following qemu.git commit which was recently merged: commit b21631f3b5cdecd14114034cd9e4e7f63ed7fde1 Author: Hani Benhabiles <kroo...@gmail.com> Date: Tue May 27 23:39:37 2014 +0100 monitor: Add delvm and loadvm argument completion Signed-off-by: Hani Benhabiles <h...@linux.com> Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com> If you want to send an updated patch, please rebase qemu.git. I have kept the other patches in this series.