|
 |
1efd99 |
From 4c253ab87dff0ce65071a36fd1b79b617567f1d8 Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: Pavel Grunt <pgrunt@redhat.com>
|
|
|
1efd99 |
Date: Mon, 2 Jan 2017 16:32:31 +0100
|
|
|
1efd99 |
Subject: [PATCH 03/26] Set guest name at the same time as uuid
|
|
|
1efd99 |
|
|
|
1efd99 |
Avoid showing the "Unknown" name in the guest detail dialog when
|
|
|
1efd99 |
waiting for the domain to be started.
|
|
|
1efd99 |
|
|
|
1efd99 |
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/virt-viewer.c | 7 +++++--
|
|
|
1efd99 |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/virt-viewer.c b/src/virt-viewer.c
|
|
|
1efd99 |
index 3a3b64d..1121146 100644
|
|
|
1efd99 |
--- a/src/virt-viewer.c
|
|
|
1efd99 |
+++ b/src/virt-viewer.c
|
|
|
1efd99 |
@@ -601,8 +601,6 @@ virt_viewer_update_display(VirtViewer *self, virDomainPtr dom, GError **error)
|
|
|
1efd99 |
virt_viewer_app_trace(app, "Guest %s is running, determining display",
|
|
|
1efd99 |
priv->domkey);
|
|
|
1efd99 |
|
|
|
1efd99 |
- g_object_set(app, "guest-name", virDomainGetName(dom), NULL);
|
|
|
1efd99 |
-
|
|
|
1efd99 |
if (virt_viewer_app_has_session(app))
|
|
|
1efd99 |
return TRUE;
|
|
|
1efd99 |
|
|
|
1efd99 |
@@ -801,6 +799,7 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
|
|
|
1efd99 |
VirtViewer *self = VIRT_VIEWER(app);
|
|
|
1efd99 |
VirtViewerPrivate *priv = self->priv;
|
|
|
1efd99 |
char uuid_string[VIR_UUID_STRING_BUFLEN];
|
|
|
1efd99 |
+ const char *guest_name;
|
|
|
1efd99 |
GError *err = NULL;
|
|
|
1efd99 |
|
|
|
1efd99 |
g_debug("initial connect");
|
|
|
1efd99 |
@@ -836,6 +835,10 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error)
|
|
|
1efd99 |
} else {
|
|
|
1efd99 |
g_object_set(app, "uuid", uuid_string, NULL);
|
|
|
1efd99 |
}
|
|
|
1efd99 |
+ guest_name = virDomainGetName(dom);
|
|
|
1efd99 |
+ if (guest_name != NULL) {
|
|
|
1efd99 |
+ g_object_set(app, "guest-name", guest_name, NULL);
|
|
|
1efd99 |
+ }
|
|
|
1efd99 |
|
|
|
1efd99 |
virt_viewer_app_show_status(app, _("Checking guest domain status"));
|
|
|
1efd99 |
if (virDomainGetInfo(dom, &info) < 0) {
|
|
|
1efd99 |
--
|
|
|
1efd99 |
2.12.0
|
|
|
1efd99 |
|