From: munkyu.im <munkyu.im@samsung.com>
Date: Thu, 15 Dec 2011 06:44:58 +0000 (+0900)
Subject: [Title]fix kvm checking function
X-Git-Tag: TizenStudio_2.0_p2.3~1694^2~152^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7cae4ca8efdbf50b0e1d4603a0ce34c9bbea9b2;p=sdk%2Femulator%2Fqemu.git

[Title]fix kvm checking function
[Type]Bugfix
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/tizen/src/dialog.c b/tizen/src/dialog.c
index c166b4e..99ca68c 100644
--- a/tizen/src/dialog.c
+++ b/tizen/src/dialog.c
@@ -155,7 +155,7 @@ void show_sized_message(const char *szTitle, const char *szMessage, const int ma
 	gtk_label_set_line_wrap(GTK_LABEL(label),TRUE);
 	gtk_label_set_line_wrap_mode(GTK_LABEL(label), PANGO_WRAP_CHAR);
 	gtk_label_set_ellipsize(GTK_LABEL(label),PANGO_ELLIPSIZE_MIDDLE);
-	gtk_widget_set_tooltip_text(GTK_LABEL(label),szMessage);
+	gtk_widget_set_tooltip_text(GTK_WIDGET(label),szMessage);
 	/* set Padding arround Label */ 
 	
 	gtk_misc_set_padding(GTK_MISC(label), 10, 10);
diff --git a/tizen/src/vtm.c b/tizen/src/vtm.c
index 8be689e..6e83984 100644
--- a/tizen/src/vtm.c
+++ b/tizen/src/vtm.c
@@ -284,45 +284,25 @@ void activate_target(char *target_name)
 char *check_kvm(char *info_file, int *status)
 {
 	char *kvm = NULL;
-	char *s_out = NULL;
-	char *s_err = NULL;
-	int exit_status;
-	GError *err = NULL;
-	char *s_out2 = NULL;
-	char *s_err2 = NULL;
 	char *enable_kvm = NULL;
+	int fd;
 #ifndef _WIN32
 	kvm = get_config_value(info_file, QEMU_GROUP, KVM_KEY);
-	if(g_file_test("/dev/kvm", G_FILE_TEST_EXISTS) && (strcmp(kvm,"1") == 0))
+	if(g_file_test("/dev/kvm", G_FILE_TEST_EXISTS) && strcmp(kvm,"1") == 0)
 	{
-	
-		if (!g_spawn_command_line_sync("grep kvm /etc/group", &s_out, &s_err, &exit_status, &err)) {
-			TRACE( "Failed to invoke command: %s\n", err->message);
-			g_error_free(err);
-			g_free(s_out);
-			g_free(s_err);
-			*status = -1;
-		}
-		if (!g_spawn_command_line_sync("whoami", &s_out2, &s_err2, &exit_status, &err)) {
-			TRACE( "Failed to invoke command: %s\n", err->message);
-			g_error_free(err);
-			g_free(s_out2);
-			g_free(s_err2);
-			*status = -1;
-		}
-		if(strstr(s_out,s_out2) != NULL)
-			enable_kvm = g_strdup_printf("-enable-kvm");
-		else
+		fd = open("/dev/kvm", O_RDWR);
+		if (fd == -1)
 		{
-			INFO("check if you've done [sudo addgroup `whoami` kvm]\n");
-			enable_kvm = g_strdup_printf(" ");
-		}
-	
-		g_free(s_out);
-		g_free(s_err);
-		g_free(s_out2);
-		g_free(s_err2);
-
+			ERR( "Could not access KVM kernel module: %m\n");
+			show_message("Error", "Could not access KVM kernel module: Permission denied\n"
+                "You can add the login user to the KVM group by following command \n"
+                 " - $sudo addgroup `whoami` kvm");
+			*status = fd;
+	    }
+		else
+			enable_kvm = g_strdup_printf("-enable-kvm");
+		 
+		close(fd);
 	}
 	else
 		enable_kvm = g_strdup_printf(" ");