Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160328.0' into...

[qemu.git] / contrib / ivshmem-server / main.c

diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index 3332a8cee6c20c2c423535c4b2df9fd96273979f..45776d8af4775a6b2eb72d22d93c56e6ac69d776 100644 (file)
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -7,7 +7,8 @@
  */
 
 #include "qemu/osdep.h"
  */
 
 #include "qemu/osdep.h"

-#include "qemu-common.h"
+#include "qapi/error.h"
+#include "qemu/cutils.h"

 
 #include "ivshmem-server.h"
 
 
 #include "ivshmem-server.h"
 


@@ -29,6 +30,7 @@ typedef struct IvshmemServerArgs {
     const char *pid_file;
     const char *unix_socket_path;
     const char *shm_path;
     const char *pid_file;
     const char *unix_socket_path;
     const char *shm_path;

+    bool use_shm_open;

     uint64_t shm_size;
     unsigned n_vectors;
 } IvshmemServerArgs;
     uint64_t shm_size;
     unsigned n_vectors;
 } IvshmemServerArgs;


@@ -44,8 +46,9 @@ ivshmem_server_usage(const char *progname)
            "     default " IVSHMEM_SERVER_DEFAULT_PID_FILE "\n"
            "  -S <unix-socket-path>: path to the unix socket to listen to\n"
            "     default " IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH "\n"
            "     default " IVSHMEM_SERVER_DEFAULT_PID_FILE "\n"
            "  -S <unix-socket-path>: path to the unix socket to listen to\n"
            "     default " IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH "\n"

-           "  -m <shm-path>: POSIX shared memory object name or a hugetlbfs mount point\n"
+           "  -M <shm-name>: POSIX shared memory object to use\n"

            "     default " IVSHMEM_SERVER_DEFAULT_SHM_PATH "\n"
            "     default " IVSHMEM_SERVER_DEFAULT_SHM_PATH "\n"

+           "  -m <dir-name>: where to create shared memory\n"

            "  -l <size>: size of shared memory in bytes\n"
            "     suffixes K, M and G can be used, e.g. 1K means 1024\n"
            "     default %u\n"
            "  -l <size>: size of shared memory in bytes\n"
            "     suffixes K, M and G can be used, e.g. 1K means 1024\n"
            "     default %u\n"


@@ -69,7 +72,7 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int argc, char *argv[])
     unsigned long long v;
     Error *err = NULL;
 
     unsigned long long v;
     Error *err = NULL;
 

-    while ((c = getopt(argc, argv, "hvFp:S:m:l:n:")) != -1) {
+    while ((c = getopt(argc, argv, "hvFp:S:m:M:l:n:")) != -1) {

 
         switch (c) {
         case 'h': /* help */
 
         switch (c) {
         case 'h': /* help */


@@ -93,8 +96,10 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int argc, char *argv[])
             args->unix_socket_path = optarg;
             break;
 
             args->unix_socket_path = optarg;
             break;
 

-        case 'm': /* shm path */
+        case 'M': /* shm name */
+        case 'm': /* dir name */

             args->shm_path = optarg;
             args->shm_path = optarg;

+            args->use_shm_open = c == 'M';

             break;
 
         case 'l': /* shm size */
             break;
 
         case 'l': /* shm size */


@@ -190,11 +195,18 @@ main(int argc, char *argv[])
         .pid_file = IVSHMEM_SERVER_DEFAULT_PID_FILE,
         .unix_socket_path = IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH,
         .shm_path = IVSHMEM_SERVER_DEFAULT_SHM_PATH,
         .pid_file = IVSHMEM_SERVER_DEFAULT_PID_FILE,
         .unix_socket_path = IVSHMEM_SERVER_DEFAULT_UNIX_SOCK_PATH,
         .shm_path = IVSHMEM_SERVER_DEFAULT_SHM_PATH,

+        .use_shm_open = true,

         .shm_size = IVSHMEM_SERVER_DEFAULT_SHM_SIZE,
         .n_vectors = IVSHMEM_SERVER_DEFAULT_N_VECTORS,
     };
     int ret = 1;
 
         .shm_size = IVSHMEM_SERVER_DEFAULT_SHM_SIZE,
         .n_vectors = IVSHMEM_SERVER_DEFAULT_N_VECTORS,
     };
     int ret = 1;
 

+    /*
+     * Do not remove this notice without adding proper error handling!
+     * Start with handling ivshmem_server_send_one_msg() failure.
+     */
+    printf("*** Example code, do not use in production ***\n");
+

     /* parse arguments, will exit on error */
     ivshmem_server_parse_args(&args, argc, argv);
 
     /* parse arguments, will exit on error */
     ivshmem_server_parse_args(&args, argc, argv);
 


@@ -217,7 +229,8 @@ main(int argc, char *argv[])
     }
 
     /* init the ivshms structure */
     }
 
     /* init the ivshms structure */

-    if (ivshmem_server_init(&server, args.unix_socket_path, args.shm_path,
+    if (ivshmem_server_init(&server, args.unix_socket_path,
+                            args.shm_path, args.use_shm_open,

                             args.shm_size, args.n_vectors, args.verbose) < 0) {
         fprintf(stderr, "cannot init server\n");
         goto err;
                             args.shm_size, args.n_vectors, args.verbose) < 0) {
         fprintf(stderr, "cannot init server\n");
         goto err;