From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59307)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1agYUQ-0004LM-HX
	for qemu-devel@nongnu.org; Thu, 17 Mar 2016 10:01:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1agYUL-0004lf-E1
	for qemu-devel@nongnu.org; Thu, 17 Mar 2016 10:01:26 -0400
Received: from mail-vk0-x230.google.com ([2607:f8b0:400c:c05::230]:35411)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1agYUL-0004lH-9u
	for qemu-devel@nongnu.org; Thu, 17 Mar 2016 10:01:21 -0400
Received: by mail-vk0-x230.google.com with SMTP id e6so102920482vkh.2
	for <qemu-devel@nongnu.org>; Thu, 17 Mar 2016 07:01:21 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <CAFEAcA_B1XCS+WUzhPVB9-PnVaqeExfa19r4AL_b_-nrDqjpxg@mail.gmail.com>
References: <1458222165-19795-1-git-send-email-berrange@redhat.com>
	<CAFEAcA_B1XCS+WUzhPVB9-PnVaqeExfa19r4AL_b_-nrDqjpxg@mail.gmail.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 17 Mar 2016 14:01:01 +0000
Message-ID: <CAFEAcA86TN0xD_Zss2k3KisU-8ACW1twRBZJrPimFRRCg-eeTA@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PULL v1 00/13] Merge crypto code for LUKS
	encryption
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Daniel P. Berrange" <berrange@redhat.com>
Cc: QEMU Developers <qemu-devel@nongnu.org>

On 17 March 2016 at 13:51, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 17 March 2016 at 13:42, Daniel P. Berrange <berrange@redhat.com> wrote:
>> The following changes since commit 8c4575472494a5dfedfe05e7b58ca9ce3872ad56:
>>
>>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging (2016-03-17 08:52:58 +0000)
>>
>> are available in the git repository at:
>>
>>   git://github.com/berrange/qemu tags/pull-qcrypto-2016-03-17-1
>>
>> for you to fetch changes up to 0a3d53cfda6f200c84c13c3818017e56edc761ba:
>>
>>   crypto: implement the LUKS block encryption format (2016-03-17 12:42:33 +0000)
>>
>> ----------------------------------------------------------------
>> Merge QCrypto 2016/03/17 v1
>>
>> ----------------------------------------------------------------
>
> This doesn't build on OSX, I'm afraid:
>
> /Users/pm215/src/qemu-for-merges/crypto/pbkdf.c:37:23: error: use of
> undeclared identifier 'RUSAGE_THREAD'
>         if (getrusage(RUSAGE_THREAD, &start) < 0) {
>                       ^
> /Users/pm215/src/qemu-for-merges/crypto/pbkdf.c:49:23: error: use of
> undeclared identifier 'RUSAGE_THREAD'
>         if (getrusage(RUSAGE_THREAD, &end) < 0) {
>                       ^

Also a w32 build failure:
crypto/pbkdf.c:23:26: fatal error: sys/resource.h: No such file or directory
 #include <sys/resource.h>
                          ^

thanks
-- PMM