Merge "Remove spaces in the console service names"

6 files changed, 15 insertions, 15 deletions

diff --git a/android/console.c b/android/console.c
index 9382e8d..81c2efe 100644
--- a/android/console.c
+++ b/android/console.c
@@ -2686,7 +2686,7 @@ static const CommandDefRec  qemu_commands[] =
     NULL, do_qemu_monitor, NULL },
 
 #ifdef CONFIG_STANDALONE_CORE
-    { "attach UI", "attach UI to the core",
+    { "attach-UI", "attach UI to the core",
     "Attach UI to the core\r\n",
     NULL, do_attach_ui, NULL },
 
@@ -2694,15 +2694,15 @@ static const CommandDefRec  qemu_commands[] =
     "Create framebuffer service\r\n",
     NULL, do_create_framebuffer_service, NULL },
 
-    { "user events", "create user events service",
+    { "user-events", "create user events service",
     "Create user events service\r\n",
     NULL, do_create_user_events_service, NULL },
 
-    { "ui-core control", "create UI control service",
+    { "ui-core-control", "create UI control service",
     "Create UI control service\r\n",
     NULL, do_create_ui_core_ctl_service, NULL },
 
-    { "core-ui control", "create UI control service",
+    { "core-ui-control", "create UI control service",
     "Create UI control service\r\n",
     NULL, do_create_core_ui_ctl_service, NULL },
 #endif  // CONFIG_STANDALONE_CORE
diff --git a/android/core-connection.c b/android/core-connection.c
index f3950a7..93a3efe 100644
--- a/android/core-connection.c
+++ b/android/core-connection.c
@@ -32,7 +32,7 @@ struct CoreConnection {
 
     /* Stream name. Can be:
      *  - NULL for the console itself.
-     *  - "attach UI" for the attached UI client.
+     *  - "attach-UI" for the attached UI client.
      */
     char* stream_name;
 };
diff --git a/android/main-ui.c b/android/main-ui.c
index 8b25f9c..d150be5 100644
--- a/android/main-ui.c
+++ b/android/main-ui.c
@@ -101,7 +101,7 @@ extern void  stop_tracing(void);
 
 unsigned long   android_verbose;
 
-/* Instance of the "attach UI" Emulator's core console client. */
+/* Instance of the "attach-UI" Emulator's core console client. */
 CoreConnection*   attach_client = NULL;
 
 /* Instance of the "framebuffer" console client. */
@@ -929,7 +929,7 @@ attach_to_core(AndroidOptions* opts) {
     attach_client = core_connection_create(&console_socket);
     if (attach_client != NULL) {
         if (!core_connection_open(attach_client)) {
-            if (!core_connection_switch_stream(attach_client, "attach UI",
+            if (!core_connection_switch_stream(attach_client, "attach-UI",
                                                &core_ui_settings)) {
                 fprintf(stdout, "UI is now attached to the core %s\n",
                         sock_address_to_string(&console_socket));
@@ -973,8 +973,8 @@ attach_to_core(AndroidOptions* opts) {
     }
 
     // Connect to the core's UI control services. For the simplicity of
-    // implementation there are two UI control services: "ui-core control" that
-    // handle UI controls initiated in the UI, and "core-ui control" that handle
+    // implementation there are two UI control services: "ui-core-control" that
+    // handle UI controls initiated in the UI, and "core-ui-control" that handle
     // UI controls initiated in the core.
     if (clientuictl_create(&console_socket)) {
         return -1;
diff --git a/android/ui-ctl-core.h b/android/ui-ctl-core.h
index 4f1f09a..f7d7ecf 100644
--- a/android/ui-ctl-core.h
+++ b/android/ui-ctl-core.h
@@ -15,8 +15,8 @@
 
 /*
  * Contains core-side of UI control protocols. For the simplicity of the
- * implementation there are two UI control services: "ui-core control" that
- * handle UI controls initiated in the UI, and "core-ui control" that handle UI
+ * implementation there are two UI control services: "ui-core-control" that
+ * handle UI controls initiated in the UI, and "core-ui-control" that handle UI
  * controls initiated in the core. The reason for hawing two services is that
  * some of the UI controls expect the core to respond with some data. The
  * simplest way to differentiate core commands from core responses to the UI
diff --git a/android/ui-ctl-ui.c b/android/ui-ctl-ui.c
index 9928124..47d0603 100644
--- a/android/ui-ctl-ui.c
+++ b/android/ui-ctl-ui.c
@@ -531,7 +531,7 @@ int
 clientuictl_create(SockAddress* console_socket)
 {
     // Connect to Core->UI service
-    if (_clientuictl_create_client(console_socket, "core-ui control",
+    if (_clientuictl_create_client(console_socket, "core-ui-control",
                                    &_core_ui_client.common)) {
         return -1;
     }
@@ -548,7 +548,7 @@ clientuictl_create(SockAddress* console_socket)
             sock_address_to_string(console_socket));
 
     // Connect to UI->Core service
-    if (_clientuictl_create_client(console_socket, "ui-core control",
+    if (_clientuictl_create_client(console_socket, "ui-core-control",
                                    &_ui_core_client.common)) {
         _core_ui_client_destroy();
         return -1;
diff --git a/android/ui-ctl-ui.h b/android/ui-ctl-ui.h
index 3c0e97f..4359ba1 100644
--- a/android/ui-ctl-ui.h
+++ b/android/ui-ctl-ui.h
@@ -15,8 +15,8 @@
 
 /*
  * Contains UI-side of UI control protocols. For the simplicity of implementation
- * there are two UI control services: "ui-core control" that handle UI controls
- * initiated in the UI, and "core-ui control" that handle UI controls initiated
+ * there are two UI control services: "ui-core-control" that handle UI controls
+ * initiated in the UI, and "core-ui-control" that handle UI controls initiated
  * in the core. The reason for hawing two services is that some of the UI
  * controls expect the core to respond with some data. The simplest way to
  * differentiate core commands from core responses to the UI commands, is to have