block: add native support for NFS
PATCH 1/1 block: add native support for NFS
This patch adds native support for accessing images on NFS shares without the requirement to actually mount the entire NFS share on the host.
NFS Images can simply be specified by an url of the form:
nfs://<host>/<export>/<filename>
For example:
qemu-img create -f qcow2 nfs://10.0.0.1/qemu-images/test.qcow2
You need libnfs from Ronnie Sahlberg available at:
git://github.com/sahlberg/libnfs.git
for this to work.
During configure it is automatically probed for libnfs and support is enabled on-the-fly. You can forbid or enforce libnfs support with --disable-libnfs or --enable-libnfs respectively.
Due to NFS restrictions you might need to execute your binaries as root, allow them to open priviledged ports (<1024) or specify insecure option on the NFS server.
--- MAINTAINERS | 5 + block/Makefile.objs | 1 + block/nfs.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 38 +++++ 4 files changed, 464 insertions(+) create mode 100644 block/nfs.c
MAINTAINERS +5 -0
@@ -899,6 +899,11 @@ M: Peter Lieven <[email protected]> S: Supported F: block/iscsi.c +NFS +M: Peter Lieven <[email protected]> +S: Maintained +F: block/nfs.c + SSH M: Richard W.M. Jones <[email protected]> S: Supported
block/Makefile.objs +1 -0
@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o ifeq ($(CONFIG_POSIX),y) block-obj-y += nbd.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) += iscsi.o +block-obj-$(CONFIG_LIBISCSI) += nfs.o block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o block-obj-$(CONFIG_GLUSTERFS) += gluster.o
block/nfs.c new file +420 -0
420 lines not on this page · raw message
configure +38 -0
@@ -250,6 +250,7 @@ vss_win32_sdk="" win_sdk="no" want_tools="yes" libiscsi="" +libnfs="" coroutine="" coroutine_pool="" seccomp=""
@@ -833,6 +834,10 @@ for opt do ;; --enable-libiscsi) libiscsi="yes" ;; + --disable-libnfs) libnfs="no" + ;; + --enable-libnfs) libnfs="yes" + ;; --enable-profiler) profiler="yes" ;; --disable-cocoa) cocoa="no"
@@ -1202,6 +1207,8 @@ echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" echo " --disable-libiscsi disable iscsi support" echo " --enable-libiscsi enable iscsi support" +echo " --disable-libnfs disable nfs support" +echo " --enable-libnfs enable nfs support" echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" echo " --disable-libusb disable libusb (for usb passthrough)"
@@ -3050,6 +3057,32 @@ EOF fi fi +########################################## +# Do we have libnfs +if test "$libnfs" != "no" ; then + cat > $TMPC << EOF +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> +int main(void) { + nfs_init_context(); + nfs_pread_async(0,0,0,0,0,0); + nfs_pwrite_async(0,0,0,0,0,0,0); + nfs_fstat(0,0,0); + return 0; + } +EOF + if compile_prog "-Werror" "-lnfs" ; then + libnfs="yes" + LIBS="$LIBS -lnfs" + else + if test "$libnfs" = "yes" ; then + feature_not_found "libnfs" + fi + libnfs="no" + fi +fi ########################################## # Do we need libm
@@ -3777,6 +3810,7 @@ echo "libusb $libusb" echo "usb net redir $usb_redir" echo "GLX support $glx" echo "libiscsi support $libiscsi" +echo "libnfs support $libnfs" echo "build guest agent $guest_agent" echo "QGA VSS support $guest_agent_with_vss" echo "seccomp support $seccomp"
@@ -4107,6 +4141,10 @@ if test "$libiscsi" = "yes" ; then echo "CONFIG_LIBISCSI=y" >> $config_host_mak fi +if test "$libnfs" = "yes" ; then + echo "CONFIG_LIBNFS=y" >> $config_host_mak +fi + if test "$seccomp" = "yes"; then echo "CONFIG_SECCOMP=y" >> $config_host_mak fi
Signature · 1 line
1.7.9.5
Nice.
+block-obj-$(CONFIG_LIBISCSI) += nfs.
Should be CONFIG_LIBNFS
Quoted 571 lines · Peter Lieven
This patch adds native support for accessing images on NFS shares without the requirement to actually mount the entire NFS share on the host.
NFS Images can simply be specified by an url of the form:
nfs://<host>/<export>/<filename>For example:
qemu-img create -f qcow2 nfs://10.0.0.1/qemu-images/test.qcow2You need libnfs from Ronnie Sahlberg available at:
git://github.com/sahlberg/libnfs.git
for this to work.During configure it is automatically probed for libnfs and support is enabled on-the-fly. You can forbid or enforce libnfs support with --disable-libnfs or --enable-libnfs respectively.
Due to NFS restrictions you might need to execute your binaries as root, allow them to open priviledged ports (<1024) or specify insecure option on the NFS server.
Signed-off-by Peter Lieven <[email protected]>--- MAINTAINERS | 5 + block/Makefile.objs | 1 + block/nfs.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 38 +++++ 4 files changed, 464 insertions(+) create mode 100644 block/nfs.cMAINTAINERS +5
-0@@ -899,6 +899,11 @@ M: Peter Lieven <[email protected]> S: Supported F: block/iscsi.c +NFS +M: Peter Lieven <[email protected]> +S: Maintained +F: block/nfs.c + SSH M: Richard W.M. Jones <[email protected]> S: Supportedblock/Makefile.objs +1
-0@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o ifeq ($(CONFIG_POSIX),y) block-obj-y += nbd.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) += iscsi.o +block-obj-$(CONFIG_LIBISCSI) += nfs.o block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o block-obj-$(CONFIG_GLUSTERFS) += gluster.oblock/nfs.c new file +420
-0@@ -0,0 +1,420 @@ +/* +* QEMU Block driver for native access to files on NFS shares +* +* Copyright (c) 2013 Peter Lieven <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "config-host.h" + +#include <poll.h> +#include <arpa/inet.h> +#include "qemu-common.h" +#include "qemu/config-file.h" +#include "qemu/error-report.h" +#include "block/block_int.h" +#include "trace.h" +#include "block/scsi.h" +#include "qemu/iov.h" +#include "sysemu/sysemu.h" +#include "qmp-commands.h" + +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> + +typedef struct nfsclient { +struct nfs_context *context; +struct nfsfh *fh; +int events; +bool has_zero_init; +int64_t allocated_file_size; +QEMUBH *close_bh; +}nfsclient ; + +typedef struct NFSTask { +int status; +int complete; +QEMUIOVector *iov; +Coroutine *co; +QEMUBH *bh; +}NFSTask ; + +static void nfs_process_read (void *arg); +static void nfs_process_write (void *arg); + +static void nfs_set_events (nfsclient *client) +{ +int ev; +/* We always register a read handler. */ + ev =POLLIN ; + ev |=nfs_which_events (client->context); +if (ev != client->events) { +qemu_aio_set_fd_handler (nfs_get_fd (client->context), + nfs_process_read, + (ev &POLLOUT ) ? nfs_process_write :NULL , + client); + + } + client->events = ev; +} + +static void nfs_process_read (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLIN ); +nfs_set_events (client); +} + +static void nfs_process_write (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLOUT ); +nfs_set_events (client); +} + +static void nfs_co_init_task (nfsclient *client,NFSTask *Task) +{ + *Task = (NFSTask ) { + .co =qemu_coroutine_self (), + }; +} + +static void nfs_co_generic_bh_cb (void *opaque) +{ +NFSTask *Task = opaque; +qemu_bh_delete (Task->bh); +qemu_coroutine_enter (Task->co,NULL ); +} + +static void nfs_co_generic_cb (int status,struct nfs_context *nfs,void *data,void *private_data) +{ +NFSTask *Task = private_data; + Task->complete =1 ; + Task->status = status; +if (Task->status >0 && Task->iov) { +if (Task->status == Task->iov->size) { +qemu_iovec_from_buf (Task->iov,0 , data, status); + }else { + Task->status =-1 ; + } + } +if (Task->co) { + Task->bh =qemu_bh_new (nfs_co_generic_bh_cb, Task); +qemu_bh_schedule (Task->bh); + } +} + +static int coroutine_fn nfs_co_readv(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + Task.iov = iov; + +if (nfs_pread_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + +return 0 ; +} + +static int coroutine_fn nfs_co_writev(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + + bs->total_sectors =MAX (bs->total_sectors, sector_num + nb_sectors); + client->allocated_file_size = -ENOTSUP ; +return 0 ; +} + +static int coroutine_fn nfs_co_flush(BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + +if (nfs_fsync_async (client->context, client->fh, nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status !=0 ) { +return -EIO ; + } + +return 0 ; +} + +static QemuOptsList runtime_opts = { + .name ="nfs" , + .head =QTAILQ_HEAD_INITIALIZER (runtime_opts.head), + .desc = { + { + .name ="filename" , + .type =QEMU_OPT_STRING , + .help ="URL to the NFS file" , + }, + {/* end of list */ } + }, +}; + +static void nfs_file_close (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +if (client->context) { +if (client->fh) { +nfs_close (client->context, client->fh); + } +qemu_aio_set_fd_handler (nfs_get_fd (client->context),NULL ,NULL ,NULL ); +nfs_destroy_context (client->context); + } +memset (client,0 ,sizeof (nfsclient)); +} + + +static int nfs_file_open_common (BlockDriverState *bs,QDict *options,int flags, +int open_flags,Error **errp) +{ +nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" ); + ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 ); +if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; +if (nfs_open (client->context, file, open_flags, &client->fh) !=0 ) { +error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ; + client->has_zero_init =S_ISREG (st.st_mode); + client->allocated_file_size = st.st_blocks * st.st_blksize; + goto out; +fail: +nfs_file_close (bs); +out: +g_free (server); +g_free (path); +g_free (file); +return ret; +} + +static int nfs_file_open (BlockDriverState *bs,QDict *options,int flags, +Error **errp) { +return nfs_file_open_common (bs, options, flags,0 , errp); +} + +static int nfs_file_create (const char *filename,QEMUOptionParameter *options, +Error **errp) +{ +int ret =0 ; +int64_t total_size =0 ; +BlockDriverState *bs; +nfsclient *client =NULL ; +QDict *bs_options; + + bs =bdrv_new ("" ); + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_size = options->value.n /BDRV_SECTOR_SIZE ; + } + options++; + } + + bs->opaque =g_malloc0 (sizeof (struct nfsclient )); + client = bs->opaque; + + bs_options =qdict_new (); +qdict_put (bs_options,"filename" ,qstring_from_str (filename)); + ret =nfs_file_open_common (bs, bs_options,0 ,O_CREAT ,NULL ); +QDECREF (bs_options); +if (ret !=0 ) { + goto out; + } + ret =nfs_ftruncate (client->context, client->fh, total_size *BDRV_SECTOR_SIZE ); +if (ret !=0 ) { + ret = -ENOSPC ;; + } +out: +nfs_file_close (bs); +g_free (bs->opaque); + bs->opaque =NULL ; +bdrv_unref (bs); +return ret; +} + +static int nfs_has_zero_init (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +return client->has_zero_init; +} + +static int64_t nfs_get_allocated_file_size (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +return client->allocated_file_size; +} + +static BlockDriver bdrv_nfs = { + .format_name ="nfs" , + .protocol_name ="nfs" , + + .instance_size =sizeof (nfsclient), + .bdrv_needs_filename = true, + .bdrv_has_zero_init = nfs_has_zero_init, + .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, + + .bdrv_file_open = nfs_file_open, + .bdrv_close = nfs_file_close, + .bdrv_create = nfs_file_create, + + .bdrv_co_readv = nfs_co_readv, + .bdrv_co_writev = nfs_co_writev, + .bdrv_co_flush_to_disk = nfs_co_flush, +}; + +static void nfs_block_init (void ) +{ +bdrv_register (&bdrv_nfs); +} + +block_init (nfs_block_init);configure +38
-1@@ -250,6 +250,7 @@ vss_win32_sdk="" win_sdk="no" want_tools="yes" libiscsi="" +libnfs="" coroutine="" coroutine_pool="" seccomp=""@@ -833,6 +834,10 @@ for opt do ;; --enable-libiscsi) libiscsi="yes" ;; + --disable-libnfs) libnfs="no" + ;; + --enable-libnfs) libnfs="yes" + ;; --enable-profiler) profiler="yes" ;; --disable-cocoa) cocoa="no"@@ -1202,6 +1207,8 @@ echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" echo " --disable-libiscsi disable iscsi support" echo " --enable-libiscsi enable iscsi support" +echo " --disable-libnfs disable nfs support" +echo " --enable-libnfs enable nfs support" echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" echo " --disable-libusb disable libusb (for usb passthrough)"@@ -3050,6 +3057,32 @@ EOF fi fi +########################################## +# Do we have libnfs +if test "$libnfs" != "no" ; then + cat > $TMPC << EOF +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> +int main(void) { + nfs_init_context(); + nfs_pread_async(0,0,0,0,0,0); + nfs_pwrite_async(0,0,0,0,0,0,0); + nfs_fstat(0,0,0); + return 0; + } +EOF + if compile_prog "-Werror" "-lnfs" ; then + libnfs="yes" + LIBS="$LIBS -lnfs" + else + if test "$libnfs" = "yes" ; then + feature_not_found "libnfs" + fi + libnfs="no" + fi +fi ########################################## # Do we need libm@@ -3777,6 +3810,7 @@ echo "libusb $libusb" echo "usb net redir $usb_redir" echo "GLX support $glx" echo "libiscsi support $libiscsi" +echo "libnfs support $libnfs" echo "build guest agent $guest_agent" echo "QGA VSS support $guest_agent_with_vss" echo "seccomp support $seccomp"@@ -4107,6 +4141,10 @@ if test "$libiscsi" = "yes" ; then echo "CONFIG_LIBISCSI=y" >> $config_host_mak fi +if test "$libnfs" = "yes" ; then + echo "CONFIG_LIBNFS=y" >> $config_host_mak +fi + if test "$seccomp" = "yes"; then echo "CONFIG_SECCOMP=y" >> $config_host_mak fi --1.7.9.5
Quoted 51 lines · Peter Lieven
This patch adds native support for accessing images on NFS shares without the requirement to actually mount the entire NFS share on the host.
NFS Images can simply be specified by an url of the form:
nfs://<host>/<export>/<filename>For example:
qemu-img create -f qcow2 nfs://10.0.0.1/qemu-images/test.qcow2You need libnfs from Ronnie Sahlberg available at:
git://github.com/sahlberg/libnfs.git
for this to work.During configure it is automatically probed for libnfs and support is enabled on-the-fly. You can forbid or enforce libnfs support with --disable-libnfs or --enable-libnfs respectively.
Due to NFS restrictions you might need to execute your binaries as root, allow them to open priviledged ports (<1024) or specify insecure option on the NFS server.
Signed-off-by Peter Lieven <[email protected]>--- MAINTAINERS | 5 + block/Makefile.objs | 1 + block/nfs.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 38 +++++ 4 files changed, 464 insertions(+) create mode 100644 block/nfs.cMAINTAINERS +5
-0@@ -899,6 +899,11 @@ M: Peter Lieven <[email protected]> S: Supported F: block/iscsi.c +NFS +M: Peter Lieven <[email protected]> +S: Maintained +F: block/nfs.c + SSH M: Richard W.M. Jones <[email protected]> S: Supportedblock/Makefile.objs +0
-0
block/Makefile.objs block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o · line 15
Quoted 4 lines
block/Makefile.objs +1
-0@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o ifeq ($(CONFIG_POSIX),y) block-obj-y += nbd.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) += iscsi.o +block-obj-$(CONFIG_LIBISCSI) += nfs.o
CONFIG_LIBNFS
Quoted 67 lines
block/Makefile.objs +0
-0block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o block-obj-$(CONFIG_GLUSTERFS) += gluster.oblock/nfs.c new file +58
-0@@ -0,0 +1,420 @@ +/* +* QEMU Block driver for native access to files on NFS shares +* +* Copyright (c) 2013 Peter Lieven <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "config-host.h" + +#include <poll.h> +#include <arpa/inet.h> +#include "qemu-common.h" +#include "qemu/config-file.h" +#include "qemu/error-report.h" +#include "block/block_int.h" +#include "trace.h" +#include "block/scsi.h" +#include "qemu/iov.h" +#include "sysemu/sysemu.h" +#include "qmp-commands.h" + +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> + +typedef struct nfsclient { +struct nfs_context *context; +struct nfsfh *fh; +int events; +bool has_zero_init; +int64_t allocated_file_size; +QEMUBH *close_bh; +}nfsclient ; + +typedef struct NFSTask { + int status; + int complete; + QEMUIOVector *iov; + Coroutine *co; + QEMUBH *bh;
block/nfs.c line 68
Quoted 10 lines
block/nfs.c new file +10
-0+} NFSTask; + +static void nfs_process_read (void *arg); +static void nfs_process_write (void *arg); + +static void nfs_set_events (nfsclient *client) +{ +int ev; +/* We always register a read handler. */ + ev =POLLIN ;
I don't think you should always register a read handler here since there are no situations where the NFS server
will send unsolicited packets back to the client (contrary to iSCSI where the target might send NOPs back to ping the client).
When NFS sessions are idle, it is common that servers will tear down the TCP connection to save resources and rely on that
the clients will transparently reconnect the TPC session again once there is new I/O to send.
This reconnect is handled automatically/transparently within libnfs.
Quoted 439 lines
block/nfs.c new file +352
-0+ ev |=nfs_which_events (client->context); +if (ev != client->events) { +qemu_aio_set_fd_handler (nfs_get_fd (client->context), + nfs_process_read, + (ev &POLLOUT ) ? nfs_process_write :NULL , + client); + + } + client->events = ev; +} + +static void nfs_process_read (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLIN ); +nfs_set_events (client); +} + +static void nfs_process_write (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLOUT ); +nfs_set_events (client); +} + +static void nfs_co_init_task (nfsclient *client,NFSTask *Task) +{ + *Task = (NFSTask ) { + .co =qemu_coroutine_self (), + }; +} + +static void nfs_co_generic_bh_cb (void *opaque) +{ +NFSTask *Task = opaque; +qemu_bh_delete (Task->bh); +qemu_coroutine_enter (Task->co,NULL ); +} + +static void nfs_co_generic_cb (int status,struct nfs_context *nfs,void *data,void *private_data) +{ +NFSTask *Task = private_data; + Task->complete =1 ; + Task->status = status; +if (Task->status >0 && Task->iov) { +if (Task->status == Task->iov->size) { +qemu_iovec_from_buf (Task->iov,0 , data, status); + }else { + Task->status =-1 ; + } + } +if (Task->co) { + Task->bh =qemu_bh_new (nfs_co_generic_bh_cb, Task); +qemu_bh_schedule (Task->bh); + } +} + +static int coroutine_fn nfs_co_readv(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + Task.iov = iov; + +if (nfs_pread_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + +return 0 ; +} + +static int coroutine_fn nfs_co_writev(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + + bs->total_sectors =MAX (bs->total_sectors, sector_num + nb_sectors); + client->allocated_file_size = -ENOTSUP ; +return 0 ; +} + +static int coroutine_fn nfs_co_flush(BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + +if (nfs_fsync_async (client->context, client->fh, nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status !=0 ) { +return -EIO ; + } + +return 0 ; +} + +static QemuOptsList runtime_opts = { + .name ="nfs" , + .head =QTAILQ_HEAD_INITIALIZER (runtime_opts.head), + .desc = { + { + .name ="filename" , + .type =QEMU_OPT_STRING , + .help ="URL to the NFS file" , + }, + {/* end of list */ } + }, +}; + +static void nfs_file_close (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +if (client->context) { +if (client->fh) { +nfs_close (client->context, client->fh); + } +qemu_aio_set_fd_handler (nfs_get_fd (client->context),NULL ,NULL ,NULL ); +nfs_destroy_context (client->context); + } +memset (client,0 ,sizeof (nfsclient)); +} + + +static int nfs_file_open_common (BlockDriverState *bs,QDict *options,int flags, +int open_flags,Error **errp) +{ +nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" ); + ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 ); +if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; +if (nfs_open (client->context, file, open_flags, &client->fh) !=0 ) { +error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ; + client->has_zero_init =S_ISREG (st.st_mode); + client->allocated_file_size = st.st_blocks * st.st_blksize; + goto out; +fail: +nfs_file_close (bs); +out: +g_free (server); +g_free (path); +g_free (file); +return ret; +} + +static int nfs_file_open (BlockDriverState *bs,QDict *options,int flags, +Error **errp) { +return nfs_file_open_common (bs, options, flags,0 , errp); +} + +static int nfs_file_create (const char *filename,QEMUOptionParameter *options, +Error **errp) +{ +int ret =0 ; +int64_t total_size =0 ; +BlockDriverState *bs; +nfsclient *client =NULL ; +QDict *bs_options; + + bs =bdrv_new ("" ); + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_size = options->value.n /BDRV_SECTOR_SIZE ; + } + options++; + } + + bs->opaque =g_malloc0 (sizeof (struct nfsclient )); + client = bs->opaque; + + bs_options =qdict_new (); +qdict_put (bs_options,"filename" ,qstring_from_str (filename)); + ret =nfs_file_open_common (bs, bs_options,0 ,O_CREAT ,NULL ); +QDECREF (bs_options); +if (ret !=0 ) { + goto out; + } + ret =nfs_ftruncate (client->context, client->fh, total_size *BDRV_SECTOR_SIZE ); +if (ret !=0 ) { + ret = -ENOSPC ;; + } +out: +nfs_file_close (bs); +g_free (bs->opaque); + bs->opaque =NULL ; +bdrv_unref (bs); +return ret; +} + +static int nfs_has_zero_init (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +return client->has_zero_init; +} + +static int64_t nfs_get_allocated_file_size (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +return client->allocated_file_size; +} + +static BlockDriver bdrv_nfs = { + .format_name ="nfs" , + .protocol_name ="nfs" , + + .instance_size =sizeof (nfsclient), + .bdrv_needs_filename = true, + .bdrv_has_zero_init = nfs_has_zero_init, + .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, + + .bdrv_file_open = nfs_file_open, + .bdrv_close = nfs_file_close, + .bdrv_create = nfs_file_create, + + .bdrv_co_readv = nfs_co_readv, + .bdrv_co_writev = nfs_co_writev, + .bdrv_co_flush_to_disk = nfs_co_flush, +}; + +static void nfs_block_init (void ) +{ +bdrv_register (&bdrv_nfs); +} + +block_init (nfs_block_init);configure +38
-1@@ -250,6 +250,7 @@ vss_win32_sdk="" win_sdk="no" want_tools="yes" libiscsi="" +libnfs="" coroutine="" coroutine_pool="" seccomp=""@@ -833,6 +834,10 @@ for opt do ;; --enable-libiscsi) libiscsi="yes" ;; + --disable-libnfs) libnfs="no" + ;; + --enable-libnfs) libnfs="yes" + ;; --enable-profiler) profiler="yes" ;; --disable-cocoa) cocoa="no"@@ -1202,6 +1207,8 @@ echo " --enable-spice enable spice" echo " --enable-rbd enable building the rados block device (rbd)" echo " --disable-libiscsi disable iscsi support" echo " --enable-libiscsi enable iscsi support" +echo " --disable-libnfs disable nfs support" +echo " --enable-libnfs enable nfs support" echo " --disable-smartcard-nss disable smartcard nss support" echo " --enable-smartcard-nss enable smartcard nss support" echo " --disable-libusb disable libusb (for usb passthrough)"@@ -3050,6 +3057,32 @@ EOF fi fi +########################################## +# Do we have libnfs +if test "$libnfs" != "no" ; then + cat > $TMPC << EOF +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> +int main(void) { + nfs_init_context(); + nfs_pread_async(0,0,0,0,0,0); + nfs_pwrite_async(0,0,0,0,0,0,0); + nfs_fstat(0,0,0); + return 0; + } +EOF + if compile_prog "-Werror" "-lnfs" ; then + libnfs="yes" + LIBS="$LIBS -lnfs" + else + if test "$libnfs" = "yes" ; then + feature_not_found "libnfs" + fi + libnfs="no" + fi +fi ########################################## # Do we need libm@@ -3777,6 +3810,7 @@ echo "libusb $libusb" echo "usb net redir $usb_redir" echo "GLX support $glx" echo "libiscsi support $libiscsi" +echo "libnfs support $libnfs" echo "build guest agent $guest_agent" echo "QGA VSS support $guest_agent_with_vss" echo "seccomp support $seccomp"@@ -4107,6 +4141,10 @@ if test "$libiscsi" = "yes" ; then echo "CONFIG_LIBISCSI=y" >> $config_host_mak fi +if test "$libnfs" = "yes" ; then + echo "CONFIG_LIBNFS=y" >> $config_host_mak +fi + if test "$seccomp" = "yes"; then echo "CONFIG_SECCOMP=y" >> $config_host_mak fi --1.7.9.5
Quoted 17 lines · Peter Lieven
This patch adds native support for accessing images on NFS shares without the requirement to actually mount the entire NFS share on the host.
NFS Images can simply be specified by an url of the form:
nfs://<host>/<export>/<filename>For example:
qemu-img create -f qcow2 nfs://10.0.0.1/qemu-images/test.qcow2You need libnfs from Ronnie Sahlberg available at:
git://github.com/sahlberg/libnfs.git
for this to work.During configure it is automatically probed for libnfs and support is enabled on-the-fly. You can forbid or enforce libnfs support with --disable-libnfs or --enable-libnfs respectively.
Quoted 5 lines
Due to NFS restrictions you might need to execute your binaries as root, allow them to open priviledged ports (<1024) or specify insecure option on the NFS server.
Signed-off-by Peter Lieven <[email protected]>
Looks nice! Thanks for the work!
Quoted 69 lines
--- MAINTAINERS | 5 + block/Makefile.objs | 1 + block/nfs.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 38 +++++ 4 files changed, 464 insertions(+)create mode 100644
block/nfs.cMAINTAINERS +5
-0@@ -899,6 +899,11 @@ M: Peter Lieven <[email protected]> S: Supported F: block/iscsi.c +NFS +M: Peter Lieven <[email protected]> +S: Maintained +F: block/nfs.c + SSH M: Richard W.M. Jones <[email protected]> S: Supportedblock/Makefile.objs +1
-0@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o ifeq ($(CONFIG_POSIX),y) block-obj-y += nbd.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) += iscsi.o +block-obj-$(CONFIG_LIBISCSI) += nfs.o block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o block-obj-$(CONFIG_GLUSTERFS) += gluster.oblock/nfs.c new file +27
-0@@ -0,0 +1,420 @@ +/* +* QEMU Block driver for native access to files on NFS shares +* +* Copyright (c) 2013 Peter Lieven <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "config-host.h" + +#include <poll.h>
block/nfs.c line 37
Quoted 10 lines
block/nfs.c new file +10
-0+#include <arpa/inet.h> +#include "qemu-common.h" +#include "qemu/config-file.h" +#include "qemu/error-report.h" +#include "block/block_int.h" +#include "trace.h" +#include "block/scsi.h" +#include "qemu/iov.h" +#include "sysemu/sysemu.h" +#include "qmp-commands.h"
Copied from block/iscsi.c? SCSI and QMP are not necessary for this file. And maybe also arpa/inet.h, I'm not sure about that though.
block/nfs.c line 50
Quoted 13 lines
block/nfs.c new file +13
-0+ +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> +#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> + +typedef struct nfsclient { + struct nfs_context *context; + struct nfsfh *fh; + int events; + bool has_zero_init; + int64_t allocated_file_size; + QEMUBH *close_bh;
This is unused.
block/nfs.c line 51
Quoted 1 line
block/nfs.c new file +1
-0+} nfsclient;
Please use CamelCase for type names...
block/nfs.c line 59
Quoted 8 lines
block/nfs.c new file +8
-0+ +typedef struct NFSTask { +int status; +int complete; +QEMUIOVector *iov; +Coroutine *co; +QEMUBH *bh; +}NFSTask ;
as you do with this.
Quoted 27 lines
block/nfs.c new file +27
-0+ +static void nfs_process_read (void *arg); +static void nfs_process_write (void *arg); + +static void nfs_set_events (nfsclient *client) +{ +int ev; +/* We always register a read handler. */ + ev =POLLIN ; + ev |=nfs_which_events (client->context); +if (ev != client->events) { +qemu_aio_set_fd_handler (nfs_get_fd (client->context), + nfs_process_read, + (ev &POLLOUT ) ? nfs_process_write :NULL , + client); + + } + client->events = ev; +} + +static void nfs_process_read (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLIN ); +nfs_set_events (client); +} +
block/nfs.c line 96
Quoted 10 lines
block/nfs.c new file +10
-0+static void nfs_process_write (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLOUT ); +nfs_set_events (client); +} + +static void nfs_co_init_task (nfsclient *client,NFSTask *Task) +{ + *Task = (NFSTask ) {
Please use lower case for variable names.
block/nfs.c line 108
Quoted 12 lines
block/nfs.c new file +12
-0+ .co = qemu_coroutine_self(), + }; +} + +static void nfs_co_generic_bh_cb (void *opaque) +{ +NFSTask *Task = opaque; +qemu_bh_delete (Task->bh); +qemu_coroutine_enter (Task->co,NULL ); +} + +static void nfs_co_generic_cb (int status,struct nfs_context *nfs,void *data,void *private_data)
This line is too long. Please use scripts/checkpatch.pl to check the coding style. (Some other lines have trailing whitespaces)
Quoted 31 lines
block/nfs.c new file +31
-0+{ +NFSTask *Task = private_data; + Task->complete =1 ; + Task->status = status; +if (Task->status >0 && Task->iov) { +if (Task->status == Task->iov->size) { +qemu_iovec_from_buf (Task->iov,0 , data, status); + }else { + Task->status =-1 ; + } + } +if (Task->co) { + Task->bh =qemu_bh_new (nfs_co_generic_bh_cb, Task); +qemu_bh_schedule (Task->bh); + } +} + +static int coroutine_fn nfs_co_readv(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + Task.iov = iov; + +if (nfs_pread_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + nfs_co_generic_cb, &Task) !=0 ) {
block/nfs.c line 149
Quoted 10 lines
block/nfs.c new file +10
-0+return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ;
In error case, does Task.status possibly contain error number other than -EIO? Would it be useful to return the value?
Quoted 29 lines
block/nfs.c new file +29
-0+ } + +return 0 ; +} + +static int coroutine_fn nfs_co_writev(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield ();
block/nfs.c line 188
Quoted 10 lines
block/nfs.c new file +10
-0+ } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + + bs->total_sectors =MAX (bs->total_sectors, sector_num + nb_sectors); + client->allocated_file_size = -ENOTSUP ;
Why does allocated_file_size become not supported after a write?
Quoted 74 lines
block/nfs.c new file +74
-0+return 0 ; +} + +static int coroutine_fn nfs_co_flush(BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + +if (nfs_fsync_async (client->context, client->fh, nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status !=0 ) { +return -EIO ; + } + +return 0 ; +} + +static QemuOptsList runtime_opts = { + .name ="nfs" , + .head =QTAILQ_HEAD_INITIALIZER (runtime_opts.head), + .desc = { + { + .name ="filename" , + .type =QEMU_OPT_STRING , + .help ="URL to the NFS file" , + }, + {/* end of list */ } + }, +}; + +static void nfs_file_close (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +if (client->context) { +if (client->fh) { +nfs_close (client->context, client->fh); + } +qemu_aio_set_fd_handler (nfs_get_fd (client->context),NULL ,NULL ,NULL ); +nfs_destroy_context (client->context); + } +memset (client,0 ,sizeof (nfsclient)); +} + + +static int nfs_file_open_common (BlockDriverState *bs,QDict *options,int flags, +int open_flags,Error **errp) +{ +nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" );
block/nfs.c line 272
Quoted 10 lines
block/nfs.c new file +10
-0+ + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" ); + ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );
Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 44 lines
block/nfs.c new file +44
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; +if (nfs_open (client->context, file, open_flags, &client->fh) !=0 ) { +error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + }
block/nfs.c line 326
Quoted 10 lines
block/nfs.c new file +10
-0+ } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;
Please use DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.
Quoted 22 lines
block/nfs.c new file +22
-0+ client->has_zero_init =S_ISREG (st.st_mode); + client->allocated_file_size = st.st_blocks * st.st_blksize; + goto out; +fail: +nfs_file_close (bs); +out: +g_free (server); +g_free (path); +g_free (file); +return ret; +} + +static int nfs_file_open (BlockDriverState *bs,QDict *options,int flags, +Error **errp) { +return nfs_file_open_common (bs, options, flags,0 , errp); +} + +static int nfs_file_create (const char *filename,QEMUOptionParameter *options, +Error **errp) +{ +int ret =0 ; +int64_t total_size =0 ;
block/nfs.c line 358
Quoted 10 lines
block/nfs.c new file +10
-0+BlockDriverState *bs; +nfsclient *client =NULL ; +QDict *bs_options; + + bs =bdrv_new ("" ); + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_size = options->value.n /BDRV_SECTOR_SIZE ;
Why divide by BDRV_SECTOR_SIZE only to ...
Quoted 5 lines
block/nfs.c new file +5
-0+ } + options++; + } + + bs->opaque =g_malloc0 (sizeof (struct nfsclient ));
block/nfs.c line 373
Quoted 10 lines
block/nfs.c new file +10
-0+ client = bs->opaque; + + bs_options =qdict_new (); +qdict_put (bs_options,"filename" ,qstring_from_str (filename)); + ret =nfs_file_open_common (bs, bs_options,0 ,O_CREAT ,NULL ); +QDECREF (bs_options); +if (ret !=0 ) { + goto out; + } + ret =nfs_ftruncate (client->context, client->fh, total_size *BDRV_SECTOR_SIZE );
... multiply it back later?
block/nfs.c line 375
Quoted 2 lines
block/nfs.c new file +2
-0+if (ret !=0 ) { + ret = -ENOSPC ;;
There is an extra semicolon. And is it right to hard code ENOSPC here, without checking value of ret?
block/nfs.c line 384
Quoted 9 lines
block/nfs.c new file +9
-0+ } +out: +nfs_file_close (bs); +g_free (bs->opaque); + bs->opaque =NULL ; +bdrv_unref (bs); +return ret; +} +
Fam
Hi Fam,
Quoted 18 lines · Fam Zheng
Quoted 17 lines · Peter Lieven
This patch adds native support for accessing images on NFS shares without the requirement to actually mount the entire NFS share on the host.
NFS Images can simply be specified by an url of the form:
nfs://<host>/<export>/<filename>For example:
qemu-img create -f qcow2 nfs://10.0.0.1/qemu-images/test.qcow2You need libnfs from Ronnie Sahlberg available at:
git://github.com/sahlberg/libnfs.git
for this to work.During configure it is automatically probed for libnfs and support is enabled on-the-fly. You can forbid or enforce libnfs support with --disable-libnfs or --enable-libnfs respectively.
Quoted 7 lines
Quoted 5 lines
Due to NFS restrictions you might need to execute your binaries as root, allow them to open priviledged ports (<1024) or specify insecure option on the NFS server.
Signed-off-by Peter Lieven <[email protected]>Looks nice! Thanks for the work!
Thank you ;-)
Quoted 74 lines
Quoted 74 lines
--- MAINTAINERS | 5 + block/Makefile.objs | 1 + block/nfs.c | 420 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure | 38 +++++ 4 files changed, 464 insertions(+)create mode 100644
block/nfs.cMAINTAINERS +5
-0@@ -899,6 +899,11 @@ M: Peter Lieven <[email protected]> S: Supported F: block/iscsi.c +NFS +M: Peter Lieven <[email protected]> +S: Maintained +F: block/nfs.c + SSH M: Richard W.M. Jones <[email protected]> S: Supportedblock/Makefile.objs +1
-0@@ -12,6 +12,7 @@ block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o ifeq ($(CONFIG_POSIX),y) block-obj-y += nbd.o sheepdog.o block-obj-$(CONFIG_LIBISCSI) += iscsi.o +block-obj-$(CONFIG_LIBISCSI) += nfs.o block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o block-obj-$(CONFIG_GLUSTERFS) += gluster.oblock/nfs.c new file +31
-0@@ -0,0 +1,420 @@ +/* +* QEMU Block driver for native access to files on NFS shares +* +* Copyright (c) 2013 Peter Lieven <[email protected]> +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "config-host.h" + +#include <poll.h> +#include <arpa/inet.h> +#include "qemu-common.h" +#include "qemu/config-file.h" +#include "qemu/error-report.h"
Quoted 8 lines
block/nfs.c line 37
Quoted 6 lines
block/nfs.c new file +6
-0+#include "block/block_int.h" +#include "trace.h" +#include "block/scsi.h" +#include "qemu/iov.h" +#include "sysemu/sysemu.h" +#include "qmp-commands.h" Copied from
block/iscsi.c? SCSI and QMP are not necessary for this file. And maybe alsoarpa/inet.h, I'm not sure about that though.
Yes, libiscsi and libnfs are quite similar. ;-)
Quoted 16 lines
Quoted 4 lines
block/nfs.c new file +3
-0+ +#include <nfsc/libnfs-zdr.h> +#include <nfsc/libnfs.h> block/nfs.c line 50
Quoted 10 lines
block/nfs.c new file +10
-0+#include <nfsc/libnfs-raw.h> +#include <nfsc/libnfs-raw-mount.h> + +typedef struct nfsclient { + struct nfs_context *context; + struct nfsfh *fh; + int events; + bool has_zero_init; + int64_t allocated_file_size; + QEMUBH *close_bh;This is unused.
Ups, its a leftover from a nasty segfault debug session.
Quoted 4 lines
block/nfs.c line 51
Quoted 2 lines
block/nfs.c new file +1
-0+} nfsclient;Please use CamelCase for type names...
Ok
Quoted 43 lines
block/nfs.c line 59
Quoted 9 lines
block/nfs.c new file +8
-0+ +typedef struct NFSTask { +int status; +int complete; +QEMUIOVector *iov; +Coroutine *co; +QEMUBH *bh; +}NFSTask ;as you do with this.
Quoted 31 lines
block/nfs.c new file +31
-0+ +static void nfs_process_read (void *arg); +static void nfs_process_write (void *arg); + +static void nfs_set_events (nfsclient *client) +{ +int ev; +/* We always register a read handler. */ + ev =POLLIN ; + ev |=nfs_which_events (client->context); +if (ev != client->events) { +qemu_aio_set_fd_handler (nfs_get_fd (client->context), + nfs_process_read, + (ev &POLLOUT ) ? nfs_process_write :NULL , + client); + + } + client->events = ev; +} + +static void nfs_process_read (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLIN ); +nfs_set_events (client); +} + +static void nfs_process_write (void *arg) +{ +nfsclient *client = arg; +nfs_service (client->context,POLLOUT );
Quoted 8 lines
block/nfs.c line 96
Quoted 6 lines
block/nfs.c new file +6
-0+nfs_set_events (client); +} + +static void nfs_co_init_task (nfsclient *client,NFSTask *Task) +{ + *Task = (NFSTask ) {Please use lower case for variable names.
Ok
Quoted 15 lines
block/nfs.c line 108
Quoted 13 lines
block/nfs.c new file +12
-0+ .co = qemu_coroutine_self(), + }; +} + +static void nfs_co_generic_bh_cb (void *opaque) +{ +NFSTask *Task = opaque; +qemu_bh_delete (Task->bh); +qemu_coroutine_enter (Task->co,NULL ); +} + +static void nfs_co_generic_cb (int status,struct nfs_context *nfs,void *data,void *private_data)This line is too long. Please use
scripts/checkpatch.plto check the coding style. (Some other lines have trailing whitespaces)
I thought I had done this. Strange...
Quoted 36 lines
Quoted 36 lines
block/nfs.c new file +35
-0+{ +NFSTask *Task = private_data; + Task->complete =1 ; + Task->status = status; +if (Task->status >0 && Task->iov) { +if (Task->status == Task->iov->size) { +qemu_iovec_from_buf (Task->iov,0 , data, status); + }else { + Task->status =-1 ; + } + } +if (Task->co) { + Task->bh =qemu_bh_new (nfs_co_generic_bh_cb, Task); +qemu_bh_schedule (Task->bh); + } +} + +static int coroutine_fn nfs_co_readv(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + Task.iov = iov; + +if (nfs_pread_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) {
Quoted 9 lines
block/nfs.c line 149
Quoted 6 lines
block/nfs.c new file +6
-0+nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ;In error case, does Task.status possibly contain error number other than
-EIO? Would it be useful to return the value?
You are right. checked the libnfs code and the function nfsstat3_to_errno(int error) which wraps NFS errors to POSIX errors. I will pass the error in case Task.status is < 0.
Quoted 33 lines
Quoted 33 lines
block/nfs.c new file +33
-0+ } + +return 0 ; +} + +static int coroutine_fn nfs_co_writev(BlockDriverState *bs, +int64_t sector_num,int nb_sectors, +QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); +
Quoted 8 lines
block/nfs.c line 188
Quoted 6 lines
block/nfs.c new file +6
-0+if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) { +return -EIO ; + } + + bs->total_sectors =MAX (bs->total_sectors, sector_num + nb_sectors); + client->allocated_file_size = -ENOTSUP ;Why does
allocated_file_sizebecome not supported after a write?
I thought that someone would ask this ;-) bdrv_allocated_file_size is only used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write. -ENOTSUP is the default if bdrv_allocated_file_size is not implemented.
Quoted 79 lines
Quoted 79 lines
block/nfs.c new file +78
-0+return 0 ; +} + +static int coroutine_fn nfs_co_flush(BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; + +nfs_co_init_task (client, &Task); + +if (nfs_fsync_async (client->context, client->fh, nfs_co_generic_cb, &Task) !=0 ) { +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +if (Task.status !=0 ) { +return -EIO ; + } + +return 0 ; +} + +static QemuOptsList runtime_opts = { + .name ="nfs" , + .head =QTAILQ_HEAD_INITIALIZER (runtime_opts.head), + .desc = { + { + .name ="filename" , + .type =QEMU_OPT_STRING , + .help ="URL to the NFS file" , + }, + {/* end of list */ } + }, +}; + +static void nfs_file_close (BlockDriverState *bs) +{ +nfsclient *client = bs->opaque; +if (client->context) { +if (client->fh) { +nfs_close (client->context, client->fh); + } +qemu_aio_set_fd_handler (nfs_get_fd (client->context),NULL ,NULL ,NULL ); +nfs_destroy_context (client->context); + } +memset (client,0 ,sizeof (nfsclient)); +} + + +static int nfs_file_open_common (BlockDriverState *bs,QDict *options,int flags, +int open_flags,Error **errp) +{ +nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) {
Quoted 8 lines
block/nfs.c line 272
Quoted 6 lines
block/nfs.c new file +6
-0+error_setg (errp,"Failed to init NFS context" ); + ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );Please check the length of filename is longer than 6 before accessing filename[6].
Good point. I will check for this, but in fact I think it can't happen because we will never end up there if filename does not start with nfs://
Quoted 49 lines
Quoted 49 lines
block/nfs.c new file +48
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; +if (nfs_open (client->context, file, open_flags, &client->fh) !=0 ) { +error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { + error_setg(errp, "Failed to fstat file: %s",
Quoted 8 lines
block/nfs.c line 326
Quoted 6 lines
block/nfs.c new file +6
-0+ nfs_get_error(client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.
Will do. Can't it happen that we end up reading unallocated sectors?
Quoted 27 lines
Quoted 27 lines
block/nfs.c new file +26
-0+ client->has_zero_init =S_ISREG (st.st_mode); + client->allocated_file_size = st.st_blocks * st.st_blksize; + goto out; +fail: +nfs_file_close (bs); +out: +g_free (server); +g_free (path); +g_free (file); +return ret; +} + +static int nfs_file_open (BlockDriverState *bs,QDict *options,int flags, +Error **errp) { +return nfs_file_open_common (bs, options, flags,0 , errp); +} + +static int nfs_file_create (const char *filename,QEMUOptionParameter *options, +Error **errp) +{ +int ret =0 ; +int64_t total_size =0 ; +BlockDriverState *bs; +nfsclient *client =NULL ; +QDict *bs_options; +
Quoted 8 lines
block/nfs.c line 358
Quoted 6 lines
block/nfs.c new file +6
-0+ bs =bdrv_new ("" ); + +/* Read out options */ +while (options && options->name) { +if (!strcmp (options->name,"size" )) { + total_size = options->value.n /BDRV_SECTOR_SIZE ;Why divide by
BDRV_SECTOR_SIZEonly to ...
copy and paste error.
Quoted 19 lines
Quoted 6 lines
block/nfs.c new file +5
-0+ } + options++; + } + + bs->opaque =g_malloc0 (sizeof (struct nfsclient ));block/nfs.c line 373
Quoted 10 lines
block/nfs.c new file +10
-0+ client = bs->opaque; + + bs_options =qdict_new (); +qdict_put (bs_options,"filename" ,qstring_from_str (filename)); + ret =nfs_file_open_common (bs, bs_options,0 ,O_CREAT ,NULL ); +QDECREF (bs_options); +if (ret !=0 ) { + goto out; + } + ret =nfs_ftruncate (client->context, client->fh, total_size *BDRV_SECTOR_SIZE );... multiply it back later?
Quoted 4 lines
block/nfs.c line 375
Quoted 2 lines
block/nfs.c new file +2
-0+if (ret !=0 ) { + ret = -ENOSPC ;;There is an extra semicolon. And is it right to hard code ENOSPC here, without checking value of ret?
will return the real error wrapped by nfsstat3_to_errno().
Quoted 13 lines
block/nfs.c line 384
Quoted 10 lines
block/nfs.c new file +9
-0+ } +out: +nfs_file_close (bs); +g_free (bs->opaque); + bs->opaque =NULL ; +bdrv_unref (bs); +return ret; +} +Fam
Thanks for reviewing!
One wish as I think you are the VMDK format maintainer. Can you rework vmdk_create and possible other fucntions in VMDK to use only bdrv_* functions (like in qcow2_create). Currently its not possible to create a VMDK on an NFS share directly caused by useing qemu_file_* calls.
This also affectecs other drivers. QCOW2 and RAW work perfectly.
Peter
Quoted 42 lines · Peter Lieven
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,block/nfs.c new file +27
-0+ QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) {Quoted 8 lines
Quoted 6 lines
block/nfs.c new file +4
-0+return -EIO ; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?
Quoted 5 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUPis the default ifbdrv_allocated_file_sizeis not implemented.
OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
block/nfs.c new file +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" );Quoted 8 lines
block/nfs.c line 272
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://
True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 59 lines
Quoted 51 lines
Quoted 51 lines
block/nfs.c new file +39
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; + if (nfs_open(client->context, file, open_flags, &client->fh)!= 0) {
block/nfs.c new file +10
-0+error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context));Quoted 8 lines
block/nfs.c line 326
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Quoted 8 lines
Thanks for reviewing!
One wish as I think you are the VMDK format maintainer. Can you rework
vmdk_createand possible
other fucntions in VMDK to use only bdrv_* functions (like inqcow2_create). Currently its not possible to create
a VMDK on an NFS share directly caused by useing qemu_file_* calls. This also affectecs other drivers. QCOW2 and RAW work perfectly.
Yes, this is a good request. I have this on my todo list, thanks for reminding.
Fam
Quoted 151 lines · Fam Zheng
Quoted 42 lines · Peter Lieven
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,block/nfs.c new file +27
-0+ QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) {Quoted 8 lines
Quoted 6 lines
block/nfs.c new file +4
-0+return -EIO ; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 5 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUPis the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
block/nfs.c new file +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" );Quoted 8 lines
block/nfs.c line 272
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 59 lines
Quoted 59 lines
Quoted 46 lines
block/nfs.c new file +39
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { +if (nfs_creat (client->context, file,0600 , &client->fh) !=0 ) { +error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; + if (nfs_open(client->context, file, open_flags, &client->fh)!= 0) {
block/nfs.c new file +5
-0+error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + }block/nfs.c line 326
Quoted 10 lines
block/nfs.c new file +10
-0+ } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.
Quoted 3 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep bs->total_sectors = st.st_size / BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.
Quoted 9 lines
Quoted 8 lines
Thanks for reviewing!
One wish as I think you are the VMDK format maintainer. Can you rework
vmdk_createand possible
other fucntions in VMDK to use only bdrv_* functions (like inqcow2_create). Currently its not possible to create
a VMDK on an NFS share directly caused by useing qemu_file_* calls. This also affectecs other drivers. QCOW2 and RAW work perfectly.
Quoted 4 lines
Yes, this is a good request. I have this on my todo list, thanks for reminding.
Fam
Peter
于2013年12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 156 lines · Fam Zheng
Quoted 155 lines · Peter Lieven
Quoted 42 lines
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,block/nfs.c new file +27
-0+ QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) {Quoted 8 lines
Quoted 6 lines
block/nfs.c new file +4
-0+return -EIO ; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 7 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
block/nfs.c new file +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" );Quoted 8 lines
block/nfs.c line 272
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 60 lines
Quoted 60 lines
Quoted 47 lines
block/nfs.c new file +31
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
block/nfs.c new file +8
-0+error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; + if (nfs_open(client->context, file, open_flags, &client->fh)!= 0) {
block/nfs.c new file +5
-0+error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + }block/nfs.c line 326
Quoted 10 lines
block/nfs.c new file +10
-0+ } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context)); + ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.
Quoted 9 lines
Quoted 5 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.
You don't need to care about libnfs' EOF behavior, nfs_pread_async is in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.
Fam
Quoted 162 lines · Fam Zheng
于2013年 12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 161 lines · Fam Zheng
Quoted 160 lines · Peter Lieven
Quoted 42 lines
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,block/nfs.c new file +27
-0+ QEMUIOVector *iov) +{ +nfsclient *client = bs->opaque; +struct NFSTask Task; +char *buf =NULL ; + +nfs_co_init_task (client, &Task); + + buf =g_malloc (nb_sectors *BDRV_SECTOR_SIZE ); +qemu_iovec_to_buf (iov,0 , buf, nb_sectors *BDRV_SECTOR_SIZE ); + +if (nfs_pwrite_async (client->context, client->fh, + sector_num *BDRV_SECTOR_SIZE , + nb_sectors *BDRV_SECTOR_SIZE , + buf, nfs_co_generic_cb, &Task) !=0 ) { +g_free (buf); +return -EIO ; + } + +while (!Task.complete) { +nfs_set_events (client); +qemu_coroutine_yield (); + } + +g_free (buf); + +if (Task.status != nb_sectors *BDRV_SECTOR_SIZE ) {Quoted 8 lines
Quoted 6 lines
block/nfs.c new file +4
-0+return -EIO ; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 7 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
block/nfs.c new file +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; +const char *filename; +int ret =0 ; +QemuOpts *opts; +Error *local_err =NULL ; +char *server =NULL , *path =NULL , *file =NULL , *strp; +struct stat st; + + opts =qemu_opts_create_nofail (&runtime_opts); +qemu_opts_absorb_qdict (opts, options, &local_err); +if (error_is_set (&local_err)) { +qerror_report_err (local_err); +error_free (local_err); + ret = -EINVAL ; + goto fail; + } + + filename =qemu_opt_get (opts,"filename" ); + + client->context =nfs_init_context (); + +if (client->context ==NULL ) { +error_setg (errp,"Failed to init NFS context" );Quoted 8 lines
block/nfs.c line 272
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EINVAL ; + goto fail; + } + + server =g_strdup (filename +6 );Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 60 lines
Quoted 52 lines
Quoted 52 lines
block/nfs.c new file +31
-0+if (server[0 ] =='/' || server[0 ] =='\0' ) { +error_setg (errp,"Invalid server in URL" ); + ret = -EINVAL ; + goto fail; + } + strp =strchr (server,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + path =g_strdup (strp); + *strp =0 ; + strp =strrchr (path,'/' ); +if (strp ==NULL ) { +error_setg (errp,"Invalid URL specified.\n" ); + ret = -EINVAL ; + goto fail; + } + file =g_strdup (strp); + *strp =0 ; + +if (nfs_mount (client->context, server, path) !=0 ) { +error_setg (errp,"Failed to mount nfs share: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + +if (open_flags &O_CREAT ) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
block/nfs.c new file +8
-0+error_setg (errp,"Failed to create file: %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + }else { + open_flags = (flags &BDRV_O_RDWR ) ?O_RDWR :O_RDONLY ; + if (nfs_open(client->context, file, open_flags, &client->fh)!= 0) {
block/nfs.c new file +10
-0+error_setg (errp,"Failed to open file : %s" , +nfs_get_error (client->context)); + ret = -EINVAL ; + goto fail; + } + } + +if (nfs_fstat (client->context, client->fh, &st) !=0 ) { +error_setg (errp,"Failed to fstat file: %s" , +nfs_get_error (client->context));Quoted 8 lines
block/nfs.c line 326
Quoted 5 lines
block/nfs.c new file +5
-0+ ret = -EIO ; + goto fail; + } + + bs->total_sectors = st.st_size /BDRV_SECTOR_SIZE ;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Quoted 6 lines
Quoted 4 lines
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.You don't need to care about libnfs' EOF behavior,
nfs_pread_asyncis in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.
isn't this something that is already in bdrv_co_do_readv?
do you have an example of an VMDK with descriptor file for me. I would try the implementation then.
Peter
Quoted 169 lines · Peter Lieven
Quoted 168 lines · Fam Zheng
于2013年 12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 166 lines · Fam Zheng
Quoted 156 lines · Peter Lieven
Quoted 42 lines
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,(quoted diff) +27
-0+ QEMUIOVector *iov) +{ + nfsclient *client = bs->opaque; + struct NFSTask Task; + char *buf = NULL; + + nfs_co_init_task(client, &Task); + + buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE); + qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE); + + if (nfs_pwrite_async(client->context, client->fh, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + buf, nfs_co_generic_cb, &Task) != 0) { + g_free(buf); + return -EIO; + } + + while (!Task.complete) { + nfs_set_events(client); + qemu_coroutine_yield(); + } + + g_free(buf); + + if (Task.status != nb_sectors * BDRV_SECTOR_SIZE) {Quoted 8 lines
Quoted 6 lines
(quoted diff) +4
-0+ return -EIO; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 7 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
(quoted diff) +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; + const char *filename; + int ret = 0; + QemuOpts *opts; + Error *local_err = NULL; + char *server = NULL, *path = NULL, *file = NULL, *strp; + struct stat st; + + opts = qemu_opts_create_nofail(&runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto fail; + } + + filename = qemu_opt_get(opts, "filename"); + + client->context = nfs_init_context(); + + if (client->context == NULL) { + error_setg(errp, "Failed to init NFS context");Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ ret = -EINVAL; + goto fail; + } + + server = g_strdup(filename + 6);Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
(quoted diff) +31
-0+ if (server[0] == '/' || server[0] == '\0') { + error_setg(errp, "Invalid server in URL"); + ret = -EINVAL; + goto fail; + } + strp = strchr(server, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + path = g_strdup(strp); + *strp = 0; + strp = strrchr(path, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + file = g_strdup(strp); + *strp = 0; + + if (nfs_mount(client->context, server, path) != 0) { + error_setg(errp, "Failed to mount nfs share: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + + if (open_flags & O_CREAT) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
(quoted diff) +8
-0+ error_setg(errp, "Failed to create file: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + } else { + open_flags = (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY; + if (nfs_open(client->context, file, open_flags,
&client->fh)
!= 0) {(quoted diff) +5
-0+ error_setg(errp, "Failed to open file : %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + }Review
Quoted 10 lines
(quoted diff) +10
-0+ } + + if (nfs_fstat(client->context, client->fh, &st) != 0) { + error_setg(errp, "Failed to fstat file: %s", + nfs_get_error(client->context)); + ret = -EIO; + goto fail; + } + + bs->total_sectors = st.st_size / BDRV_SECTOR_SIZE;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.Quoted 5 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.
Quoted 8 lines
Quoted 3 lines
You don't need to care about libnfs' EOF behavior,
nfs_pread_asyncis in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.isn't this something that is already in
bdrv_co_do_readv?do you have an example of an VMDK with descriptor file for me. I would try the implementation then.
You can create a VMDK with description file with:
Quoted 13 lines
$ qemu-img create -f vmdk -o subformat=monolithicFlat foo.vmdk 1G Formatting 'foo.vmdk', fmt=vmdk size=1073741824 compat6=off subformat='monolithicFlat' zeroed_grain=off$ cat foo.vmdk # Disk DescriptorFile version=1 CID=52b01245 parentCID=ffffffff createType="monolithicFlat"# Extent description
RW 2097152 FLAT "foo-flat.vmdk" 0
Quoted 8 lines
# The Disk Data Base
#DDBddb.virtualHWVersion = "4"
ddb.geometry.cylinders = "2080"
ddb.geometry.heads = "16"
ddb.geometry.sectors = "63"
ddb.adapterType = "ide"
It's a 313 bytes text file which I assume might not work with nfs backend here. Please have a try.
Thanks :)
Fam
Quoted 203 lines · Fam Zheng
Quoted 169 lines · Peter Lieven
Quoted 168 lines · Fam Zheng
于2013年 12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 166 lines · Fam Zheng
Quoted 156 lines · Peter Lieven
Quoted 42 lines
Hi Fam,
Quoted 31 lines · Fam Zheng
Quoted 30 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,
+ QEMUIOVector *iov)(quoted diff) +26
-0+{ + nfsclient *client = bs->opaque; + struct NFSTask Task; + char *buf = NULL; + + nfs_co_init_task(client, &Task); + + buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE); + qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE); + + if (nfs_pwrite_async(client->context, client->fh, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + buf, nfs_co_generic_cb, &Task) != 0) { + g_free(buf); + return -EIO; + } + + while (!Task.complete) { + nfs_set_events(client); + qemu_coroutine_yield(); + } + + g_free(buf); + + if (Task.status != nb_sectors * BDRV_SECTOR_SIZE) {Quoted 8 lines
Quoted 6 lines
(quoted diff) +4
-0+ return -EIO; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 7 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call. On open I fstat anyway and store that value. For qemu-img info this is sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 35 lines
Quoted 27 lines
Quoted 27 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
(quoted diff) +25
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; + const char *filename; + int ret = 0; + QemuOpts *opts; + Error *local_err = NULL; + char *server = NULL, *path = NULL, *file = NULL, *strp; + struct stat st; + + opts = qemu_opts_create_nofail(&runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto fail; + } + + filename = qemu_opt_get(opts, "filename"); + + client->context = nfs_init_context(); + + if (client->context == NULL) { + error_setg(errp, "Failed to init NFS context");Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ ret = -EINVAL; + goto fail; + } + + server = g_strdup(filename + 6);Please check the length of filename is longer than 6 before accessing filename[6].
Quoted 3 lines
Good point. I will check for this, but in fact I think it can't happen because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
(quoted diff) +31
-0+ if (server[0] == '/' || server[0] == '\0') { + error_setg(errp, "Invalid server in URL"); + ret = -EINVAL; + goto fail; + } + strp = strchr(server, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + path = g_strdup(strp); + *strp = 0; + strp = strrchr(path, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + file = g_strdup(strp); + *strp = 0; + + if (nfs_mount(client->context, server, path) != 0) { + error_setg(errp, "Failed to mount nfs share: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + + if (open_flags & O_CREAT) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
(quoted diff) +8
-0+ error_setg(errp, "Failed to create file: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + } else { + open_flags = (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY; + if (nfs_open(client->context, file, open_flags,
&client->fh)
!= 0) {(quoted diff) +5
-0+ error_setg(errp, "Failed to open file : %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + }Review
Quoted 10 lines
(quoted diff) +10
-0+ } + + if (nfs_fstat(client->context, client->fh, &st) != 0) { + error_setg(errp, "Failed to fstat file: %s", + nfs_get_error(client->context)); + ret = -EIO; + goto fail; + } + + bs->total_sectors = st.st_size / BDRV_SECTOR_SIZE;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.Quoted 5 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.Quoted 8 lines
Quoted 3 lines
You don't need to care about libnfs' EOF behavior,
nfs_pread_asyncis in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.isn't this something that is already in
bdrv_co_do_readv?do you have an example of an VMDK with descriptor file for me. I would try the implementation then.
You can create a VMDK with description file with:
Quoted 13 lines
$ qemu-img create -f vmdk -o subformat=monolithicFlat foo.vmdk 1G Formatting 'foo.vmdk', fmt=vmdk size=1073741824 compat6=off subformat='monolithicFlat' zeroed_grain=off$ cat foo.vmdk # Disk DescriptorFile version=1 CID=52b01245 parentCID=ffffffff createType="monolithicFlat"# Extent description
RW 2097152 FLAT "foo-flat.vmdk" 0Quoted 8 lines
# The Disk Data Base
#DDBddb.virtualHWVersion = "4"
ddb.geometry.cylinders = "2080"
ddb.geometry.heads = "16"
ddb.geometry.sectors = "63"
ddb.adapterType = "ide"
Quoted 3 lines
It's a 313 bytes text file which I assume might not work with nfs backend here. Please have a try.
Thanks :)
It works better than expected. Just creating does not work for obvious reasons, but if I have those files on NFS it works *g*
image: nfs://172.21.200.61/vcore-dev-cdrom/foo.vmdk file format: vmdk
virtual size: 1.0G (1073741824 bytes)
disk size: 1.0G
Format specific information:
cid: 1387271102
parent cid: 4294967295
create type: monolithicFlat
extents:
[0]:
virtual size: 1073741824
filename: nfs://172.21.200.61/vcore-dev-cdrom/foo-flat.vmdk
format: FLATYou should prioritze the conversion of vmdk_create ;-)
Peter
Quoted 222 lines · Peter Lieven
Quoted 209 lines · Fam Zheng
Quoted 174 lines · Peter Lieven
Quoted 173 lines · Fam Zheng
于2013年 12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 171 lines · Fam Zheng
Quoted 161 lines · Peter Lieven
Quoted 43 lines
Hi Fam,
Quoted 32 lines · Fam Zheng
Quoted 31 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,
+ QEMUIOVector *iov)(quoted diff) +9
-0+{ + nfsclient *client = bs->opaque; + struct NFSTask Task; + char *buf = NULL; + + nfs_co_init_task(client, &Task); + + buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE); + qemu_iovec_to_buf(iov, 0, buf, nb_sectors *
BDRV_SECTOR_SIZE);(quoted diff) +17
-0+ + if (nfs_pwrite_async(client->context, client->fh, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + buf, nfs_co_generic_cb, &Task) != 0) { + g_free(buf); + return -EIO; + } + + while (!Task.complete) { + nfs_set_events(client); + qemu_coroutine_yield(); + } + + g_free(buf); + + if (Task.status != nb_sectors * BDRV_SECTOR_SIZE) {Quoted 8 lines
Quoted 6 lines
(quoted diff) +4
-0+ return -EIO; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 9 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call.
On open I fstat anyway and store that value. For qemu-img info this is
sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 36 lines
Quoted 28 lines
Quoted 28 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
(quoted diff) +26
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; + const char *filename; + int ret = 0; + QemuOpts *opts; + Error *local_err = NULL; + char *server = NULL, *path = NULL, *file = NULL, *strp; + struct stat st; + + opts = qemu_opts_create_nofail(&runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto fail; + } + + filename = qemu_opt_get(opts, "filename"); + + client->context = nfs_init_context(); + + if (client->context == NULL) { + error_setg(errp, "Failed to init NFS context"); + ret = -EINVAL;Quoted 8 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ goto fail; + } + + server = g_strdup(filename + 6);Please check the length of filename is longer than 6 before accessing
filename[6].Quoted 4 lines
Good point. I will check for this, but in fact I think it can't happen
because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
(quoted diff) +31
-0+ if (server[0] == '/' || server[0] == '\0') { + error_setg(errp, "Invalid server in URL"); + ret = -EINVAL; + goto fail; + } + strp = strchr(server, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + path = g_strdup(strp); + *strp = 0; + strp = strrchr(path, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + file = g_strdup(strp); + *strp = 0; + + if (nfs_mount(client->context, server, path) != 0) { + error_setg(errp, "Failed to mount nfs share: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + + if (open_flags & O_CREAT) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
(quoted diff) +8
-0+ error_setg(errp, "Failed to create file: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + } else { + open_flags = (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY; + if (nfs_open(client->context, file, open_flags,
&client->fh)
!= 0) {(quoted diff) +5
-0+ error_setg(errp, "Failed to open file : %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + }Review
Quoted 10 lines
(quoted diff) +10
-0+ } + + if (nfs_fstat(client->context, client->fh, &st) != 0) { + error_setg(errp, "Failed to fstat file: %s", + nfs_get_error(client->context)); + ret = -EIO; + goto fail; + } + + bs->total_sectors = st.st_size / BDRV_SECTOR_SIZE;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.Quoted 5 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.Quoted 8 lines
Quoted 3 lines
You don't need to care about libnfs' EOF behavior,
nfs_pread_asyncis in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.isn't this something that is already in
bdrv_co_do_readv?do you have an example of an VMDK with descriptor file for me. I would try the implementation then.
You can create a VMDK with description file with:
Quoted 14 lines
$ qemu-img create -f vmdk -o subformat=monolithicFlat foo.vmdk 1G Formatting 'foo.vmdk', fmt=vmdk size=1073741824 compat6=off subformat='monolithicFlat' zeroed_grain=off$ cat foo.vmdk # Disk DescriptorFile version=1 CID=52b01245 parentCID=ffffffff createType="monolithicFlat"# Extent description
RW 2097152 FLAT "foo-flat.vmdk" 0Quoted 8 lines
# The Disk Data Base
#DDBddb.virtualHWVersion = "4"
ddb.geometry.cylinders = "2080"
ddb.geometry.heads = "16"
ddb.geometry.sectors = "63"
ddb.adapterType = "ide"Quoted 4 lines
It's a 313 bytes text file which I assume might not work with nfs backend here. Please have a try.
Thanks :)
It works better than expected. Just creating does not work for obvious reasons, but if I have those files on NFS it works *g*
image: nfs://172.21.200.61/vcore-dev-cdrom/foo.vmdk file format: vmdk
virtual size: 1.0G (1073741824 bytes)
disk size: 1.0G
Format specific information:
Quoted 9 lines
cid: 1387271102
parent cid: 4294967295
create type: monolithicFlat
extents:
[0]:
virtual size: 1073741824
filename: nfs://172.21.200.61/vcore-dev-cdrom/foo-flat.vmdk
format: FLATWithout DIV_ROUND_UP? That would be conditional on zero_beyond_eof. I tried this as well, it's not working if total_sectors is not rounded up:
Quoted 5 lines
$ sudo ./qemu-img info nfs://127.0.0.1/stor/vmdk/foo.vmdk image: nfs://127.0.0.1/stor/vmdk/foo.vmdk file format: raw virtual size: 0 (0 bytes) disk size: 0
Fam
Quoted 233 lines · Fam Zheng
Quoted 222 lines · Peter Lieven
Quoted 209 lines · Fam Zheng
Quoted 174 lines · Peter Lieven
Quoted 173 lines · Fam Zheng
于2013年 12月17日 星期二 16时46分50秒,Peter Lieven写到:
Quoted 171 lines · Fam Zheng
Quoted 161 lines · Peter Lieven
Quoted 43 lines
Hi Fam,
Quoted 32 lines · Fam Zheng
Quoted 31 lines · Peter Lieven
(quoted diff) +2
-0+static int coroutine_fn nfs_co_writev(BlockDriverState *bs, + int64_t sector_num, int
nb_sectors,
+ QEMUIOVector *iov)(quoted diff) +9
-0+{ + nfsclient *client = bs->opaque; + struct NFSTask Task; + char *buf = NULL; + + nfs_co_init_task(client, &Task); + + buf = g_malloc(nb_sectors * BDRV_SECTOR_SIZE); + qemu_iovec_to_buf(iov, 0, buf, nb_sectors *
BDRV_SECTOR_SIZE);(quoted diff) +17
-0+ + if (nfs_pwrite_async(client->context, client->fh, + sector_num * BDRV_SECTOR_SIZE, + nb_sectors * BDRV_SECTOR_SIZE, + buf, nfs_co_generic_cb, &Task) != 0) { + g_free(buf); + return -EIO; + } + + while (!Task.complete) { + nfs_set_events(client); + qemu_coroutine_yield(); + } + + g_free(buf); + + if (Task.status != nb_sectors * BDRV_SECTOR_SIZE) {Quoted 8 lines
Quoted 6 lines
(quoted diff) +4
-0+ return -EIO; + } + + bs->total_sectors = MAX(bs->total_sectors, sector_num +
nb_sectors);
+client->allocated_file_size=-ENOTSUP;Why does
allocated_file_sizebecome not supported after a write?Quoted 9 lines
I thought that someone would ask this ;-)
bdrv_allocated_file_sizeis only
used in image info. I saved some code here implementing an async call.
On open I fstat anyway and store that value. For qemu-img info this is
sufficient, but the allocated size likely changes after a write.-ENOTSUP
is the default ifbdrv_allocated_file_sizeis not implemented.OK. Please add some comment here.
Quoted 36 lines
Quoted 28 lines
Quoted 28 lines
+static int nfs_file_open_common(BlockDriverState *bs, QDict *options, int flags,
(quoted diff) +26
-0+ int open_flags, Error **errp) +{ + nfsclient *client = bs->opaque; + const char *filename; + int ret = 0; + QemuOpts *opts; + Error *local_err = NULL; + char *server = NULL, *path = NULL, *file = NULL, *strp; + struct stat st; + + opts = qemu_opts_create_nofail(&runtime_opts); + qemu_opts_absorb_qdict(opts, options, &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); + ret = -EINVAL; + goto fail; + } + + filename = qemu_opt_get(opts, "filename"); + + client->context = nfs_init_context(); + + if (client->context == NULL) { + error_setg(errp, "Failed to init NFS context"); + ret = -EINVAL;Quoted 8 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+ goto fail; + } + + server = g_strdup(filename + 6);Please check the length of filename is longer than 6 before accessing
filename[6].Quoted 4 lines
Good point. I will check for this, but in fact I think it can't happen
because we will
never end up there if filename does not start with nfs://True, at least for now, but it doesn't hurt to be defensive, especially with strings.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
(quoted diff) +31
-0+ if (server[0] == '/' || server[0] == '\0') { + error_setg(errp, "Invalid server in URL"); + ret = -EINVAL; + goto fail; + } + strp = strchr(server, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + path = g_strdup(strp); + *strp = 0; + strp = strrchr(path, '/'); + if (strp == NULL) { + error_setg(errp, "Invalid URL specified.\n"); + ret = -EINVAL; + goto fail; + } + file = g_strdup(strp); + *strp = 0; + + if (nfs_mount(client->context, server, path) != 0) { + error_setg(errp, "Failed to mount nfs share: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + + if (open_flags & O_CREAT) { + if (nfs_creat(client->context, file, 0600, &client->fh)!= 0) {
(quoted diff) +8
-0+ error_setg(errp, "Failed to create file: %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + } + } else { + open_flags = (flags & BDRV_O_RDWR) ? O_RDWR : O_RDONLY; + if (nfs_open(client->context, file, open_flags,
&client->fh)
!= 0) {(quoted diff) +5
-0+ error_setg(errp, "Failed to open file : %s", + nfs_get_error(client->context)); + ret = -EINVAL; + goto fail; + }Review
Quoted 10 lines
(quoted diff) +10
-0+ } + + if (nfs_fstat(client->context, client->fh, &st) != 0) { + error_setg(errp, "Failed to fstat file: %s", + nfs_get_error(client->context)); + ret = -EIO; + goto fail; + } + + bs->total_sectors = st.st_size / BDRV_SECTOR_SIZE;Please use
DIV_ROUND_UP(). Otherwise the remainder in last sector couldn't be read.Quoted 5 lines
Quoted 1 line
Will do. Can't it happen that we end up reading unallocated sectors?
Hmm, maybe. Not missing last bytes of unaligned sector is essential for VMDK description file. But you are right, please add check code and make sure that we don't read beyond EOF as well.
Actually it would like to keep
bs->total_sectors= st.st_size /BDRV_SECTOR_SIZE; for now until I have checked how libnfs and the whole stack react on beyond EOF reads.Quoted 8 lines
Quoted 3 lines
You don't need to care about libnfs' EOF behavior,
nfs_pread_asyncis in bytes granularity, you could just read the last partial sector till EOF and zero padding the buffer.isn't this something that is already in
bdrv_co_do_readv?do you have an example of an VMDK with descriptor file for me. I would try the implementation then.
You can create a VMDK with description file with:
Quoted 14 lines
$ qemu-img create -f vmdk -o subformat=monolithicFlat foo.vmdk 1G Formatting 'foo.vmdk', fmt=vmdk size=1073741824 compat6=off subformat='monolithicFlat' zeroed_grain=off$ cat foo.vmdk # Disk DescriptorFile version=1 CID=52b01245 parentCID=ffffffff createType="monolithicFlat"# Extent description
RW 2097152 FLAT "foo-flat.vmdk" 0Quoted 8 lines
# The Disk Data Base
#DDBddb.virtualHWVersion = "4"
ddb.geometry.cylinders = "2080"
ddb.geometry.heads = "16"
ddb.geometry.sectors = "63"
ddb.adapterType = "ide"Quoted 4 lines
It's a 313 bytes text file which I assume might not work with nfs backend here. Please have a try.
Thanks :)
It works better than expected. Just creating does not work for obvious reasons, but if I have those files on NFS it works *g*
image: nfs://172.21.200.61/vcore-dev-cdrom/foo.vmdk file format: vmdk
virtual size: 1.0G (1073741824 bytes)
disk size: 1.0G
Format specific information:Quoted 9 lines
cid: 1387271102 parent cid: 4294967295 create type: monolithicFlat extents: [0]: virtual size: 1073741824 filename: nfs://172.21.200.61/vcore-dev-cdrom/foo-flat.vmdk format: FLAT
Quoted 1 line
Without
DIV_ROUND_UP? That would be conditional onzero_beyond_eof. I tried this as well, it's not working iftotal_sectorsis not rounded up:
no, with round up. I've just sent v2 of the patch.
Peter