From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvRK3-00068g-0d for qemu-devel@nongnu.org; Fri, 13 Jun 2014 09:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvRK1-0007jn-RT for qemu-devel@nongnu.org; Fri, 13 Jun 2014 09:15:10 -0400 Received: from mail-ob0-x230.google.com ([2607:f8b0:4003:c01::230]:34791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvRK1-0007jh-MC for qemu-devel@nongnu.org; Fri, 13 Jun 2014 09:15:09 -0400 Received: by mail-ob0-f176.google.com with SMTP id wm4so1983058obc.21 for ; Fri, 13 Jun 2014 06:15:08 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1402059060-17544-4-git-send-email-armbru@redhat.com> References: <1402059060-17544-1-git-send-email-armbru@redhat.com> <1402059060-17544-4-git-send-email-armbru@redhat.com> Date: Fri, 13 Jun 2014 21:15:08 +0800 Message-ID: From: Stefan Hajnoczi Content-Type: text/plain; charset=UTF-8 Subject: Re: [Qemu-devel] [PATCH 3/3] block/qapi: Give some functions internal linkage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Kevin Wolf , Hani Benhabiles , Fam Zheng , qemu-devel , Stefan Hajnoczi On Fri, Jun 6, 2014 at 8:51 PM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster > --- > 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 Date: Tue May 27 23:39:37 2014 +0100 monitor: Add delvm and loadvm argument completion Signed-off-by: Hani Benhabiles Signed-off-by: Luiz Capitulino If you want to send an updated patch, please rebase qemu.git. I have kept the other patches in this series.