From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:39133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6J1Y-0000XG-Gz for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:23:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6J1S-00025T-VN for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:23:24 -0400 Received: from speedy.comstyle.com ([206.51.28.2]:12304 helo=mail.comstyle.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6J1S-000255-Si for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:23:18 -0400 Message-ID: <4E79AD03.5070603@comstyle.com> Date: Wed, 21 Sep 2011 05:23:15 -0400 From: Brad MIME-Version: 1.0 References: <4E7995B3.3030106@comstyle.com> <1316596914-9570-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1316596914-9570-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] Tree broken by nbd: support feature negotiation commit. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: kwolf@redhat.com, blauwirbel@gmail.com, qemu-devel@nongnu.org On 21/09/11 5:21 AM, Paolo Bonzini wrote: > On 09/21/2011 09:43 AM, Brad wrote: >>> It is not portable code, and (unlike the rest of qemu-nbd and the >>> block/nbd.c protocol) not meant to be portable. Are BLKROSET (defined in >>> linux/fs.h) and the whole set of NBD ioctls available under OpenBSD? >> >> Ok. What confused me a bit is that particular code path before your >> commit was being built on anything but Windows but is now Linux only. >> No we don't have BLKROSET. So am I to understand that even before this >> particular commit that this code was only supported on Linux? > > Yes. > > Here's a fix. Yes, this is what I also came up with to get the tree to build for me. > Paolo > > ----------------------- 8< ----------------------- > > From: Paolo Bonzini > Date: Wed, 21 Sep 2011 09:34:12 +0200 > Subject: [PATCH] nbd: fix non-Linux build failure > > Signed-off-by: Paolo Bonzini > --- > nbd.c | 29 ++++++++++++----------------- > 1 files changed, 12 insertions(+), 17 deletions(-) > > diff --git a/nbd.c b/nbd.c > index 595f4d8..9810f99 100644 > --- a/nbd.c > +++ b/nbd.c > @@ -437,7 +447,7 @@ int nbd_client(int fd) > return ret; > } > #else > -int nbd_init(int fd, int csock, off_t size, size_t blocksize) > +int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize) > { > errno = ENOTSUP; > return -1; -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.