From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 3/5] Remove whitespace in VMDK code. Date: Sun, 20 Jul 2008 11:47:54 +0300 Message-ID: <4882FBBA.2080107@qumranet.com> References: <1216326515-20920-1-git-send-email-aliguori@us.ibm.com> <1216326515-20920-3-git-send-email-aliguori@us.ibm.com> <48819B9A.8000003@qumranet.com> <4881FC2E.4010003@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Anthony Liguori Return-path: Received: from il.qumranet.com ([212.179.150.194]:18780 "EHLO il.qumranet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752690AbYGTIr4 (ORCPT ); Sun, 20 Jul 2008 04:47:56 -0400 In-Reply-To: <4881FC2E.4010003@us.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: Anthony Liguori wrote: > Avi Kivity wrote: >> Anthony Liguori wrote: >>> Again, most likely a bad merge. >>> >>> Signed-off-by: Anthony Liguori >>> >>> diff --git a/qemu/block-vmdk.c b/qemu/block-vmdk.c >>> index 67dd2f1..843bf86 100644 >>> --- a/qemu/block-vmdk.c >>> +++ b/qemu/block-vmdk.c >>> @@ -93,6 +93,7 @@ typedef struct ActiveBDRVState{ >>> >>> static ActiveBDRVState activeBDRV; >>> >>> + >>> static int vmdk_probe(const uint8_t *buf, int buf_size, const char >>> *filename) >>> { >>> uint32_t magic; >>> >> >> Um. This adds whitespace. Reversed patch somehow? > > No, the whitespace is in QEMU SVN. It somehow got removed from the > kvm-userspace tree. > Well, perhaps send the reversed patch to qemu-devel as a bugfix? -- error compiling committee.c: too many arguments to function