Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[qemu.git] / qemu-nbd.c

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 626e5844f9bd167dda5a8f46722c1c4c8b0572de..5cd6c6d18720bd23e72ab2232776930e9019274b 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -17,12 +17,14 @@
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

-#include "block/block.h"
+#include "sysemu/block-backend.h"
+#include "block/block_int.h"

 #include "block/nbd.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
 #include "block/snapshot.h"
 #include "block/nbd.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
 #include "block/snapshot.h"

+#include "qapi/util.h"

 
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <stdarg.h>
 #include <stdio.h>


@@ -37,10 +39,11 @@
 #include <libgen.h>
 #include <pthread.h>
 
 #include <libgen.h>
 #include <pthread.h>
 

-#define SOCKET_PATH          "/var/lock/qemu-nbd-%s"
-#define QEMU_NBD_OPT_CACHE   1
-#define QEMU_NBD_OPT_AIO     2
-#define QEMU_NBD_OPT_DISCARD 3
+#define SOCKET_PATH                "/var/lock/qemu-nbd-%s"
+#define QEMU_NBD_OPT_CACHE         1
+#define QEMU_NBD_OPT_AIO           2
+#define QEMU_NBD_OPT_DISCARD       3
+#define QEMU_NBD_OPT_DETECT_ZEROES 4

 
 static NBDExport *exp;
 static int verbose;
 
 static NBDExport *exp;
 static int verbose;


@@ -57,45 +60,47 @@ static void usage(const char *name)
 "Usage: %s [OPTIONS] FILE\n"
 "QEMU Disk Network Block Device Server\n"
 "\n"
 "Usage: %s [OPTIONS] FILE\n"
 "QEMU Disk Network Block Device Server\n"
 "\n"

-"  -h, --help           display this help and exit\n"
-"  -V, --version        output version information and exit\n"
+"  -h, --help                display this help and exit\n"
+"  -V, --version             output version information and exit\n"

 "\n"
 "Connection properties:\n"
 "\n"
 "Connection properties:\n"

-"  -p, --port=PORT      port to listen on (default `%d')\n"
-"  -b, --bind=IFACE     interface to bind to (default `0.0.0.0')\n"
-"  -k, --socket=PATH    path to the unix socket\n"
-"                       (default '"SOCKET_PATH"')\n"
-"  -e, --shared=NUM     device can be shared by NUM clients (default '1')\n"
-"  -t, --persistent     don't exit on the last connection\n"
-"  -v, --verbose        display extra debugging information\n"
+"  -p, --port=PORT           port to listen on (default `%d')\n"
+"  -b, --bind=IFACE          interface to bind to (default `0.0.0.0')\n"
+"  -k, --socket=PATH         path to the unix socket\n"
+"                            (default '"SOCKET_PATH"')\n"
+"  -e, --shared=NUM          device can be shared by NUM clients (default '1')\n"
+"  -t, --persistent          don't exit on the last connection\n"
+"  -v, --verbose             display extra debugging information\n"

 "\n"
 "Exposing part of the image:\n"
 "\n"
 "Exposing part of the image:\n"

-"  -o, --offset=OFFSET  offset into the image\n"
-"  -P, --partition=NUM  only expose partition NUM\n"
+"  -o, --offset=OFFSET       offset into the image\n"
+"  -P, --partition=NUM       only expose partition NUM\n"

 "\n"
 #ifdef __linux__
 "Kernel NBD client support:\n"
 "\n"
 #ifdef __linux__
 "Kernel NBD client support:\n"

-"  -c, --connect=DEV    connect FILE to the local NBD device DEV\n"
-"  -d, --disconnect     disconnect the specified device\n"
+"  -c, --connect=DEV         connect FILE to the local NBD device DEV\n"
+"  -d, --disconnect          disconnect the specified device\n"

 "\n"
 #endif
 "\n"
 "Block device options:\n"
 "\n"
 #endif
 "\n"
 "Block device options:\n"

-"  -f, --format=FORMAT  set image format (raw, qcow2, ...)\n"
-"  -r, --read-only      export read-only\n"
-"  -s, --snapshot       use FILE as an external snapshot, create a temporary\n"
-"                       file with backing_file=FILE, redirect the write to\n"
-"                       the temporary one\n"
+"  -f, --format=FORMAT       set image format (raw, qcow2, ...)\n"
+"  -r, --read-only           export read-only\n"
+"  -s, --snapshot            use FILE as an external snapshot, create a temporary\n"
+"                            file with backing_file=FILE, redirect the write to\n"
+"                            the temporary one\n"

 "  -l, --load-snapshot=SNAPSHOT_PARAM\n"
 "  -l, --load-snapshot=SNAPSHOT_PARAM\n"

-"                       load an internal snapshot inside FILE and export it\n"
-"                       as an read-only device, SNAPSHOT_PARAM format is\n"
-"                       'snapshot.id=[ID],snapshot.name=[NAME]', or\n"
-"                       '[ID_OR_NAME]'\n"
-"  -n, --nocache        disable host cache\n"
-"      --cache=MODE     set cache mode (none, writeback, ...)\n"
+"                            load an internal snapshot inside FILE and export it\n"
+"                            as an read-only device, SNAPSHOT_PARAM format is\n"
+"                            'snapshot.id=[ID],snapshot.name=[NAME]', or\n"
+"                            '[ID_OR_NAME]'\n"
+"  -n, --nocache             disable host cache\n"
+"      --cache=MODE          set cache mode (none, writeback, ...)\n"

 #ifdef CONFIG_LINUX_AIO
 #ifdef CONFIG_LINUX_AIO

-"      --aio=MODE       set AIO mode (native or threads)\n"
+"      --aio=MODE            set AIO mode (native or threads)\n"

 #endif
 #endif

+"      --discard=MODE        set discard mode (ignore, unmap)\n"
+"      --detect-zeroes=MODE  set detect-zeroes mode (off, on, discard)\n"

 "\n"
 "Report bugs to <[email protected]>\n"
     , name, NBD_DEFAULT_PORT, "DEVICE");
 "\n"
 "Report bugs to <[email protected]>\n"
     , name, NBD_DEFAULT_PORT, "DEVICE");


@@ -379,6 +384,7 @@ static void nbd_accept(void *opaque)
 
 int main(int argc, char **argv)
 {
 
 int main(int argc, char **argv)
 {

+    BlockBackend *blk;

     BlockDriverState *bs;
     BlockDriver *drv;
     off_t dev_offset = 0;
     BlockDriverState *bs;
     BlockDriver *drv;
     off_t dev_offset = 0;


@@ -410,6 +416,7 @@ int main(int argc, char **argv)
         { "aio", 1, NULL, QEMU_NBD_OPT_AIO },
 #endif
         { "discard", 1, NULL, QEMU_NBD_OPT_DISCARD },
         { "aio", 1, NULL, QEMU_NBD_OPT_AIO },
 #endif
         { "discard", 1, NULL, QEMU_NBD_OPT_DISCARD },

+        { "detect-zeroes", 1, NULL, QEMU_NBD_OPT_DETECT_ZEROES },

         { "shared", 1, NULL, 'e' },
         { "format", 1, NULL, 'f' },
         { "persistent", 0, NULL, 't' },
         { "shared", 1, NULL, 'e' },
         { "format", 1, NULL, 'f' },
         { "persistent", 0, NULL, 't' },


@@ -432,6 +439,7 @@ int main(int argc, char **argv)
     pthread_t client_thread;
     const char *fmt = NULL;
     Error *local_err = NULL;
     pthread_t client_thread;
     const char *fmt = NULL;
     Error *local_err = NULL;

+    BlockdevDetectZeroesOptions detect_zeroes = BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;

 
     /* The client thread uses SIGTERM to interrupt the server.  A signal
      * handler ensures that "qemu-nbd -v -c" exits with a nice status code.
 
     /* The client thread uses SIGTERM to interrupt the server.  A signal
      * handler ensures that "qemu-nbd -v -c" exits with a nice status code.


@@ -483,6 +491,23 @@ int main(int argc, char **argv)
                 errx(EXIT_FAILURE, "Invalid discard mode `%s'", optarg);
             }
             break;
                 errx(EXIT_FAILURE, "Invalid discard mode `%s'", optarg);
             }
             break;

+        case QEMU_NBD_OPT_DETECT_ZEROES:
+            detect_zeroes =
+                qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,
+                                optarg,
+                                BLOCKDEV_DETECT_ZEROES_OPTIONS_MAX,
+                                BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,
+                                &local_err);
+            if (local_err) {
+                errx(EXIT_FAILURE, "Failed to parse detect_zeroes mode: %s", 
+                     error_get_pretty(local_err));
+            }
+            if (detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP &&
+                !(flags & BDRV_O_UNMAP)) {
+                errx(EXIT_FAILURE, "setting detect-zeroes to unmap is not allowed "
+                                   "without setting discard operation to unmap"); 
+            }
+            break;

         case 'b':
             bindto = optarg;
             break;
         case 'b':
             bindto = optarg;
             break;


@@ -522,15 +547,18 @@ int main(int argc, char **argv)
             break;
         case 'P':
             partition = strtol(optarg, &end, 0);
             break;
         case 'P':
             partition = strtol(optarg, &end, 0);

-            if (*end)
+            if (*end) {

                 errx(EXIT_FAILURE, "Invalid partition `%s'", optarg);
                 errx(EXIT_FAILURE, "Invalid partition `%s'", optarg);

-            if (partition < 1 || partition > 8)
+            }
+            if (partition < 1 || partition > 8) {

                 errx(EXIT_FAILURE, "Invalid partition %d", partition);
                 errx(EXIT_FAILURE, "Invalid partition %d", partition);

+            }

             break;
         case 'k':
             sockpath = optarg;
             break;
         case 'k':
             sockpath = optarg;

-            if (sockpath[0] != '/')
+            if (sockpath[0] != '/') {

                 errx(EXIT_FAILURE, "socket path must be absolute\n");
                 errx(EXIT_FAILURE, "socket path must be absolute\n");

+            }

             break;
         case 'd':
             disconnect = true;
             break;
         case 'd':
             disconnect = true;


@@ -550,9 +578,9 @@ int main(int argc, char **argv)
         case 'f':
             fmt = optarg;
             break;
         case 'f':
             fmt = optarg;
             break;

-       case 't':
-           persistent = 1;
-           break;
+        case 't':
+            persistent = 1;
+            break;

         case 'v':
             verbose = 1;
             break;
         case 'v':
             verbose = 1;
             break;


@@ -587,7 +615,7 @@ int main(int argc, char **argv)
 
         printf("%s disconnected\n", argv[optind]);
 
 
         printf("%s disconnected\n", argv[optind]);
 

-       return 0;
+        return 0;

     }
 
     if (device && !verbose) {
     }
 
     if (device && !verbose) {


@@ -647,7 +675,11 @@ int main(int argc, char **argv)
         snprintf(sockpath, 128, SOCKET_PATH, basename(device));
     }
 
         snprintf(sockpath, 128, SOCKET_PATH, basename(device));
     }
 

-    qemu_init_main_loop();
+    if (qemu_init_main_loop(&local_err)) {
+        error_report("%s", error_get_pretty(local_err));
+        error_free(local_err);
+        exit(EXIT_FAILURE);
+    }

     bdrv_init();
     atexit(bdrv_close_all);
 
     bdrv_init();
     atexit(bdrv_close_all);
 


@@ -660,7 +692,8 @@ int main(int argc, char **argv)
         drv = NULL;
     }
 
         drv = NULL;
     }
 

-    bs = bdrv_new("hda", &error_abort);
+    blk = blk_new_with_bs("hda", &error_abort);
+    bs = blk_bs(blk);

 
     srcpath = argv[optind];
     ret = bdrv_open(&bs, srcpath, NULL, NULL, flags, drv, &local_err);
 
     srcpath = argv[optind];
     ret = bdrv_open(&bs, srcpath, NULL, NULL, flags, drv, &local_err);


@@ -686,6 +719,7 @@ int main(int argc, char **argv)
             error_get_pretty(local_err));
     }
 
             error_get_pretty(local_err));
     }
 

+    bs->detect_zeroes = detect_zeroes;

     fd_size = bdrv_getlength(bs);
 
     if (partition != -1) {
     fd_size = bdrv_getlength(bs);
 
     if (partition != -1) {


@@ -741,14 +775,12 @@ int main(int argc, char **argv)
         }
     } while (state != TERMINATED);
 
         }
     } while (state != TERMINATED);
 

-    bdrv_close(bs);
+    blk_unref(blk);

     if (sockpath) {
         unlink(sockpath);
     }
 
     if (sockpath) {
         unlink(sockpath);
     }
 

-    if (sn_opts) {
-        qemu_opts_del(sn_opts);
-    }
+    qemu_opts_del(sn_opts);

 
     if (device) {
         void *ret;
 
     if (device) {
         void *ret;