Commit: 66c58f1968b2f9251738442139f8918701aa919d - vmtui (git)

Virtual machine Management Terminal User Interface

Commit MetaInfo

• Revision: 66c58f1968b2f9251738442139f8918701aa919d (tree)
• Time: 2023-04-04 21:24:02
• Author: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

Improve HVisor line output in VM list.

Change Summary

• modified: src/tuivmlist.c

Incremental Difference

--- a/src/tuivmlist.c
+++ b/src/tuivmlist.c
@@ -192,6 +192,8 @@ int
 	VmList_Item		*p_item;
 	char	str_fmt[32];
 	char	str_stat[16];
+	char	*pstr_con;
+	char	*pstr_type;
 	char	str_animation[5]	= "-\\|/";
 	chtype	ch_line;
 
@@ -218,6 +220,30 @@ int
 			// HVisor ---
 			p_hvisor	= HVisor_Ref( p_item->i_hvisor );
 
+			switch( p_hvisor->b_connection )	{
+				case HVISOR_CON_LOCALHOST:
+					pstr_con	= "LocalHost";		break;
+				case HVISOR_CON_REMOTE_DIRECT:
+					pstr_con	= "Remote(Direct)"; break;
+				case HVISOR_CON_REMOTE_SSH:
+					pstr_con	= "Remote(SSH)";	break;
+				default:
+					pstr_con	= "?UNKNOWN?";		break;
+			}
+
+			switch( p_hvisor->dw_type )	{
+				case HVISOR_TYPE_BHYVE_VMBHYVE:
+					pstr_type	= "vm-bhyve";		break;
+				case HVISOR_TYPE_BHYVE_DIRECTBHYVE:
+					pstr_type	= "bhyve";			break;
+				case HVISOR_TYPE_BHYVE_LIBVIRT:
+					pstr_type	= "libvirt(bhyve)";	break;
+				case HVISOR_TYPE_QEMUKVM_LIBVIRT:
+					pstr_type	= "libvirt(qemu)";	break;
+				default:
+					pstr_type	= "?UNKNOWN?";		break;
+			}
+
 			if( HVISOR_STATUS_CONNECTED & p_hvisor->dw_status )	{
 				strncpy( str_stat, "* ONLINE", 15 );
 				i_attr	= COLOR_PAIR(2);		// Green-Black
@@ -243,9 +269,10 @@ int
 
 			// Indent(2) + HyperName&fqdn(48+) + ConnectType(16) + State(10)
 			//    ConnectType: "Local", "SSH(vmbhyve)
-			snprintf( str_fmt, 32, "  %%-%d.%ds %%-16s %%-14s",
-							(COLS - 2 - 16 - 14 - 2 - 2) , (COLS - 2 - 16 - 14 - 2 - 2) );
-			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt, p_hvisor->str_name, "contype", str_stat );
+			snprintf( str_fmt, 32, "  %%-%d.%ds %%-16s %%-16s %%-14s",
+							(COLS -2 -1 -16 -1 -16 -1 -14 -2) , (COLS -2 -1 -16 -1 -16 -1 -14 -2) );
+			mvwprintw( gp_vmlist_win, i_line, 1, str_fmt,
+						p_hvisor->str_name, pstr_con, pstr_type, str_stat );
 
 			HVisor_Release( p_hvisor );