raw_bsd: add raw_create_options

[qemu.git] / qemu-nbd.c

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 80f08d8464749a01c62b6798f6ee951df3445ca6..f044546c28469bc8f289cb3b72e1d50b10c1a57b 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -17,8 +17,9 @@
  */
 
 #include "qemu-common.h"
  */
 
 #include "qemu-common.h"

-#include "block.h"
-#include "nbd.h"
+#include "block/block.h"
+#include "block/nbd.h"
+#include "qemu/main-loop.h"

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


@@ -33,9 +34,10 @@
 #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 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

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


@@ -305,6 +307,7 @@ static void nbd_accept(void *opaque)
 int main(int argc, char **argv)
 {
     BlockDriverState *bs;
 int main(int argc, char **argv)
 {
     BlockDriverState *bs;

+    BlockDriver *drv;

     off_t dev_offset = 0;
     uint32_t nbdflags = 0;
     bool disconnect = false;
     off_t dev_offset = 0;
     uint32_t nbdflags = 0;
     bool disconnect = false;


@@ -312,7 +315,7 @@ int main(int argc, char **argv)
     char *device = NULL;
     int port = NBD_DEFAULT_PORT;
     off_t fd_size;
     char *device = NULL;
     int port = NBD_DEFAULT_PORT;
     off_t fd_size;

-    const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t";
+    const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:t";

     struct option lopt[] = {
         { "help", 0, NULL, 'h' },
         { "version", 0, NULL, 'V' },
     struct option lopt[] = {
         { "help", 0, NULL, 'h' },
         { "version", 0, NULL, 'V' },


@@ -330,7 +333,9 @@ int main(int argc, char **argv)
 #ifdef CONFIG_LINUX_AIO
         { "aio", 1, NULL, QEMU_NBD_OPT_AIO },
 #endif
 #ifdef CONFIG_LINUX_AIO
         { "aio", 1, NULL, QEMU_NBD_OPT_AIO },
 #endif

+        { "discard", 1, NULL, QEMU_NBD_OPT_DISCARD },

         { "shared", 1, NULL, 'e' },
         { "shared", 1, NULL, 'e' },

+        { "format", 1, NULL, 'f' },

         { "persistent", 0, NULL, 't' },
         { "verbose", 0, NULL, 'v' },
         { NULL, 0, NULL, 0 }
         { "persistent", 0, NULL, 't' },
         { "verbose", 0, NULL, 'v' },
         { NULL, 0, NULL, 0 }


@@ -344,10 +349,12 @@ int main(int argc, char **argv)
     int ret;
     int fd;
     bool seen_cache = false;
     int ret;
     int fd;
     bool seen_cache = false;

+    bool seen_discard = false;

 #ifdef CONFIG_LINUX_AIO
     bool seen_aio = false;
 #endif
     pthread_t client_thread;
 #ifdef CONFIG_LINUX_AIO
     bool seen_aio = false;
 #endif
     pthread_t client_thread;

+    const char *fmt = NULL;

 
     /* 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.


@@ -389,6 +396,15 @@ int main(int argc, char **argv)
             }
             break;
 #endif
             }
             break;
 #endif

+        case QEMU_NBD_OPT_DISCARD:
+            if (seen_discard) {
+                errx(EXIT_FAILURE, "--discard can only be specified once");
+            }
+            seen_discard = true;
+            if (bdrv_parse_discard_flags(optarg, &flags) == -1) {
+                errx(EXIT_FAILURE, "Invalid discard mode `%s'", optarg);
+            }
+            break;

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


@@ -442,6 +458,9 @@ int main(int argc, char **argv)
                 errx(EXIT_FAILURE, "Shared device number must be greater than 0\n");
             }
             break;
                 errx(EXIT_FAILURE, "Shared device number must be greater than 0\n");
             }
             break;

+        case 'f':
+            fmt = optarg;
+            break;

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


@@ -543,9 +562,19 @@ int main(int argc, char **argv)
     bdrv_init();
     atexit(bdrv_close_all);
 
     bdrv_init();
     atexit(bdrv_close_all);
 

+    if (fmt) {
+        drv = bdrv_find_format(fmt);
+        if (!drv) {
+            errx(EXIT_FAILURE, "Unknown file format '%s'", fmt);
+        }
+    } else {
+        drv = NULL;
+    }
+

     bs = bdrv_new("hda");
     srcpath = argv[optind];
     bs = bdrv_new("hda");
     srcpath = argv[optind];

-    if ((ret = bdrv_open(bs, srcpath, flags, NULL)) < 0) {
+    ret = bdrv_open(bs, srcpath, NULL, flags, drv);
+    if (ret < 0) {

         errno = -ret;
         err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]);
     }
         errno = -ret;
         err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]);
     }