From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6J0I-0007qD-FU for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:22:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R6J0E-0001T7-Ao for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:22:06 -0400 Received: from mail-gy0-f173.google.com ([209.85.160.173]:43200) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R6J0E-0001T1-7U for qemu-devel@nongnu.org; Wed, 21 Sep 2011 05:22:02 -0400 Received: by gye5 with SMTP id 5so1254118gye.4 for ; Wed, 21 Sep 2011 02:22:01 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 21 Sep 2011 11:21:54 +0200 Message-Id: <1316596914-9570-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <4E7995B3.3030106@comstyle.com> References: <4E7995B3.3030106@comstyle.com> 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com, blauwirbel@gmail.com, brad@comstyle.com 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. 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; -- 1.7.6