From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony Liguori Subject: Re: [PATCH 3/5] Remove whitespace in VMDK code. Date: Sat, 19 Jul 2008 09:37:34 -0500 Message-ID: <4881FC2E.4010003@us.ibm.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> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Avi Kivity Return-path: Received: from e1.ny.us.ibm.com ([32.97.182.141]:42135 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754507AbYGSOiF (ORCPT ); Sat, 19 Jul 2008 10:38:05 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e1.ny.us.ibm.com (8.13.8/8.13.8) with ESMTP id m6JEc3M6026714 for ; Sat, 19 Jul 2008 10:38:03 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.0) with ESMTP id m6JEc35f230800 for ; Sat, 19 Jul 2008 10:38:03 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id m6JEc2sL013201 for ; Sat, 19 Jul 2008 10:38:02 -0400 In-Reply-To: <48819B9A.8000003@qumranet.com> Sender: kvm-owner@vger.kernel.org List-ID: 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. Regards, Anthony Liguori