tcg: Pass tb and index to tcg_gen_exit_tb separately

[qemu.git] / blockdev-nbd.c

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index c437d32573e5a0f1b35751df1bb574f559015cbe..65a84739edc7ec005a62b33f074e61352217a682 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -13,42 +13,32 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"

-#include "qapi/qmp/qerror.h"
+#include "qapi/error.h"
+#include "qapi/qapi-commands-block.h"

 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"

-#include "qmp-commands.h"
-#include "trace.h"

 #include "block/nbd.h"
 #include "io/channel-socket.h"
 #include "block/nbd.h"
 #include "io/channel-socket.h"

+#include "io/net-listener.h"

 
 typedef struct NBDServerData {
 
 typedef struct NBDServerData {

-    QIOChannelSocket *listen_ioc;
-    int watch;
+    QIONetListener *listener;

     QCryptoTLSCreds *tlscreds;
 } NBDServerData;
 
 static NBDServerData *nbd_server;
 
     QCryptoTLSCreds *tlscreds;
 } NBDServerData;
 
 static NBDServerData *nbd_server;
 

-
-static gboolean nbd_accept(QIOChannel *ioc, GIOCondition condition,
-                           gpointer opaque)
+static void nbd_blockdev_client_closed(NBDClient *client, bool ignored)

 {
 {

-    QIOChannelSocket *cioc;
-
-    if (!nbd_server) {
-        return FALSE;
-    }
-
-    cioc = qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc),
-                                     NULL);
-    if (!cioc) {
-        return TRUE;
-    }
+    nbd_client_put(client);
+}

 
 

+static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
+                       gpointer opaque)
+{
+    qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");

     nbd_client_new(NULL, cioc,
                    nbd_server->tlscreds, NULL,
     nbd_client_new(NULL, cioc,
                    nbd_server->tlscreds, NULL,

-                   nbd_client_put);
-    object_unref(OBJECT(cioc));
-    return TRUE;
+                   nbd_blockdev_client_closed);

 }
 
 
 }
 
 


@@ -58,10 +48,8 @@ static void nbd_server_free(NBDServerData *server)
         return;
     }
 
         return;
     }
 

-    if (server->watch != -1) {
-        g_source_remove(server->watch);
-    }
-    object_unref(OBJECT(server->listen_ioc));
+    qio_net_listener_disconnect(server->listener);
+    object_unref(OBJECT(server->listener));

     if (server->tlscreds) {
         object_unref(OBJECT(server->tlscreds));
     }
     if (server->tlscreds) {
         object_unref(OBJECT(server->tlscreds));
     }


@@ -99,9 +87,8 @@ static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
 }
 
 
 }
 
 

-void qmp_nbd_server_start(SocketAddress *addr,
-                          bool has_tls_creds, const char *tls_creds,
-                          Error **errp)
+void nbd_server_start(SocketAddress *addr, const char *tls_creds,
+                      Error **errp)

 {
     if (nbd_server) {
         error_setg(errp, "NBD server already running");
 {
     if (nbd_server) {
         error_setg(errp, "NBD server already running");


@@ -109,31 +96,32 @@ void qmp_nbd_server_start(SocketAddress *addr,
     }
 
     nbd_server = g_new0(NBDServerData, 1);
     }
 
     nbd_server = g_new0(NBDServerData, 1);

-    nbd_server->watch = -1;
-    nbd_server->listen_ioc = qio_channel_socket_new();
-    if (qio_channel_socket_listen_sync(
-            nbd_server->listen_ioc, addr, errp) < 0) {
+    nbd_server->listener = qio_net_listener_new();
+
+    qio_net_listener_set_name(nbd_server->listener,
+                              "nbd-listener");
+
+    if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) {

         goto error;
     }
 
         goto error;
     }
 

-    if (has_tls_creds) {
+    if (tls_creds) {

         nbd_server->tlscreds = nbd_get_tls_creds(tls_creds, errp);
         if (!nbd_server->tlscreds) {
             goto error;
         }
 
         nbd_server->tlscreds = nbd_get_tls_creds(tls_creds, errp);
         if (!nbd_server->tlscreds) {
             goto error;
         }
 

-        if (addr->type != SOCKET_ADDRESS_KIND_INET) {
+        /* TODO SOCKET_ADDRESS_TYPE_FD where fd has AF_INET or AF_INET6 */
+        if (addr->type != SOCKET_ADDRESS_TYPE_INET) {

             error_setg(errp, "TLS is only supported with IPv4/IPv6");
             goto error;
         }
     }
 
             error_setg(errp, "TLS is only supported with IPv4/IPv6");
             goto error;
         }
     }
 

-    nbd_server->watch = qio_channel_add_watch(
-        QIO_CHANNEL(nbd_server->listen_ioc),
-        G_IO_IN,
-        nbd_accept,
-        NULL,
-        NULL);
+    qio_net_listener_set_client_func(nbd_server->listener,
+                                     nbd_accept,
+                                     NULL,
+                                     NULL);

 
     return;
 
 
     return;
 


@@ -142,10 +130,21 @@ void qmp_nbd_server_start(SocketAddress *addr,
     nbd_server = NULL;
 }
 
     nbd_server = NULL;
 }
 

-void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
-                        Error **errp)
+void qmp_nbd_server_start(SocketAddressLegacy *addr,
+                          bool has_tls_creds, const char *tls_creds,
+                          Error **errp)

 {
 {

-    BlockBackend *blk;
+    SocketAddress *addr_flat = socket_address_flatten(addr);
+
+    nbd_server_start(addr_flat, tls_creds, errp);
+    qapi_free_SocketAddress(addr_flat);
+}
+
+void qmp_nbd_server_add(const char *device, bool has_name, const char *name,
+                        bool has_writable, bool writable, Error **errp)
+{
+    BlockDriverState *bs = NULL;
+    BlockBackend *on_eject_blk;

     NBDExport *exp;
 
     if (!nbd_server) {
     NBDExport *exp;
 
     if (!nbd_server) {


@@ -153,36 +152,36 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
         return;
     }
 
         return;
     }
 

-    if (nbd_export_find(device)) {
-        error_setg(errp, "NBD server already exporting device '%s'", device);
-        return;
+    if (!has_name) {
+        name = device;

     }
 
     }
 

-    blk = blk_by_name(device);
-    if (!blk) {
-        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
-                  "Device '%s' not found", device);
+    if (nbd_export_find(name)) {
+        error_setg(errp, "NBD server already has export named '%s'", name);

         return;
     }
         return;
     }

-    if (!blk_is_inserted(blk)) {
-        error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
+
+    on_eject_blk = blk_by_name(device);
+
+    bs = bdrv_lookup_bs(device, device, errp);
+    if (!bs) {

         return;
     }
 
     if (!has_writable) {
         writable = false;
     }
         return;
     }
 
     if (!has_writable) {
         writable = false;
     }

-    if (blk_is_read_only(blk)) {
+    if (bdrv_is_read_only(bs)) {

         writable = false;
     }
 
         writable = false;
     }
 

-    exp = nbd_export_new(blk_bs(blk), 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY,
-                         NULL, false, blk, errp);
+    exp = nbd_export_new(bs, 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY,
+                         NULL, false, on_eject_blk, errp);

     if (!exp) {
         return;
     }
 
     if (!exp) {
         return;
     }
 

-    nbd_export_set_name(exp, device);
+    nbd_export_set_name(exp, name);

 
     /* The list of named exports has a strong reference to this export now and
      * our only way of accessing it is through nbd_export_find(), so we can drop
 
     /* The list of named exports has a strong reference to this export now and
      * our only way of accessing it is through nbd_export_find(), so we can drop


@@ -190,6 +189,30 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
     nbd_export_put(exp);
 }
 
     nbd_export_put(exp);
 }
 

+void qmp_nbd_server_remove(const char *name,
+                           bool has_mode, NbdServerRemoveMode mode,
+                           Error **errp)
+{
+    NBDExport *exp;
+
+    if (!nbd_server) {
+        error_setg(errp, "NBD server not running");
+        return;
+    }
+
+    exp = nbd_export_find(name);
+    if (exp == NULL) {
+        error_setg(errp, "Export '%s' is not found", name);
+        return;
+    }
+
+    if (!has_mode) {
+        mode = NBD_SERVER_REMOVE_MODE_SAFE;
+    }
+
+    nbd_export_remove(exp, mode, errp);
+}
+

 void qmp_nbd_server_stop(Error **errp)
 {
     nbd_export_close_all();
 void qmp_nbd_server_stop(Error **errp)
 {
     nbd_export_close_all();