コミット: 01c83b9362e3eef794c28048629b151a6a0c5bd8 - vmtui (git)

Virtual machine Management Terminal User Interface

コミットメタ情報

• リビジョン: 01c83b9362e3eef794c28048629b151a6a0c5bd8 (tree)
• 日時: 2023-01-15 22:07:52
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

WorkBackup

変更サマリ

• modified: src/vmbhyve.c

差分

--- a/src/vmbhyve.c
+++ b/src/vmbhyve.c
@@ -215,114 +215,118 @@ int
 	// Parse Line ---
 	while( NULL != (pstr_line = strsep( &pstr_next, "\n\r" )))	{
 		// Parse Item ---
-		if( '\0' != *pstr_line )	{
-			pstr_item[0]	= NULL;
-			i_item	= 0;
-			while( NULL != (pstr_now = strsep( &pstr_line, " \t" )))	{
-				if( '\0' != *(pstr_now + 0) )
-					{ pstr_item[i_item++]	= pstr_now; }
-			}
-
-			// VM Name ---
-			i_gtype	= GuestCtl_ObtainGuest( &i_gnow, p_hvcon->i_id, pstr_item[0] );
-			if( 0x00 > i_gtype )	{ continue; }
+		if( '\0' == *pstr_line )	{ continue; }
 
-			p_gnow = Guest_Use( i_gnow );
-			if( NULL != p_gnow)	{
-				// DataStore ---
-				memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
-				KEYVAL_DATA_SET_STRING( t_val, pstr_item[1] );
-				i_err	= KeyVal_SetData(
-							&(p_gnow->t_info), GUEST_DATASTORE_NAME_KEY,
-							&t_val, GUEST_DATASTORE_NAME_PRI );
+		pstr_item[0]	= NULL;
+		i_item	= 0;
+		while( NULL != (pstr_now = strsep( &pstr_line, " \t" )))	{
+			if( '\0' != *(pstr_now + 0) )
+				{ pstr_item[i_item++]	= pstr_now; }
+		}
 
-				// Loader ---
+		// VM Name ---
+		i_gtype	= GuestCtl_ObtainGuest( &i_gnow, p_hvcon->i_id, pstr_item[0] );
+		if( 0x00 > i_gtype )	{ continue; }
+
+		p_gnow = Guest_Use( i_gnow );
+		if( NULL == p_gnow)	{ continue; }
+
+		// DataStore ---
+		memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
+		KEYVAL_DATA_SET_STRING( t_val, pstr_item[1] );
+		i_err	= KeyVal_SetData(
+						&(p_gnow->t_info), GUEST_DATASTORE_NAME_KEY,
+						&t_val, GUEST_DATASTORE_NAME_PRI );
+
+		// Loader ---
+		memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
+		KEYVAL_DATA_SET_STRING( t_val, pstr_item[2] );
+		i_err	= KeyVal_SetData(
+						&(p_gnow->t_info), GUEST_LOADER_KEY, &t_val, GUEST_LOADER_PRI );
+
+		// CPU cores ---
+		i_temp	= (int)strtol( pstr_item[3], NULL, 10 );
+		memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
+		KEYVAL_DATA_SET_INT( t_val, i_temp );
+		i_err	= KeyVal_SetData(
+						&(p_gnow->t_info), GUEST_CPU_VCPUS_KEY, &t_val, GUEST_CPU_VCPUS_PRI );
+
+		// Memory ---
+		dw_temp	= 0;
+		i_len	= strnlen( pstr_item[4], 8 );
+		if( 4 <= i_len )	{
+			strncpy( str_temp, pstr_item[4], 8 );
+			c_unit	= str_temp[ i_len - 1 ];
+			str_temp[ i_len - 1 ]	= '\0';
+
+			dw_temp	= strtol( str_temp, NULL, 10 );
+			switch( c_unit )	{
+				case 'k':
+				case 'K':
+					break;
+				case 'm':
+				case 'M':
+					dw_temp	*= 1024;
+					break;
+				case 'g':
+				case 'G':
+					dw_temp	*= 1024 * 1024;
+					break;
+				case 't':
+				case 'T':
+					dw_temp	*= 1024 * 1024 * 1024;
+					break;
+			}
+		}
+		memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
+		KEYVAL_DATA_SET_DWORD( t_val, dw_temp );
+		i_err	= KeyVal_SetData(
+						&(p_gnow->t_info), GUEST_MEM_SIZE_KEY, &t_val, GUEST_MEM_SIZE_PRI );
+
+		// VNC ---
+		strncpy( str_temp, pstr_item[5], sizeof( str_temp ) );
+		if( '-' != str_temp[0] )	{
+			pstr_host	= NULL;
+			i_vnc		= 0;
+			pstr_now	= str_temp;
+			pstr_host	= strsep( &pstr_now, ":" );
+
+			if(( NULL != pstr_host ) && ( NULL != pstr_now ))	{
 				memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
-				KEYVAL_DATA_SET_STRING( t_val, pstr_item[2] );
+				KEYVAL_DATA_SET_STRING( t_val, pstr_host );
 				i_err	= KeyVal_SetData(
-							&(p_gnow->t_info), GUEST_LOADER_KEY, &t_val, GUEST_LOADER_PRI );
+								&(p_gnow->t_info), GUEST_VNC_HOST_KEY,
+								&t_val, GUEST_VNC_HOST_PRI );
 
-				// CPU cores ---
-				i_temp	= (int)strtol( pstr_item[3], NULL, 10 );
+				i_temp	= (int)strtol( pstr_now, NULL, 10 );
 				memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
 				KEYVAL_DATA_SET_INT( t_val, i_temp );
 				i_err	= KeyVal_SetData(
-							&(p_gnow->t_info), GUEST_CPU_VCPUS_KEY, &t_val, GUEST_CPU_VCPUS_PRI );
-
-				// Memory ---
-				dw_temp	= 0;
-				i_len	= strnlen( pstr_item[4], 8 );
-				if( 4 <= i_len )	{
-					strncpy( str_temp, pstr_item[4], 8 );
-					c_unit	= str_temp[ i_len - 1 ];
-					str_temp[ i_len - 1 ]	= '\0';
-
-					dw_temp	= strtol( str_temp, NULL, 10 );
-					switch( c_unit )	{
-						case 'k':
-						case 'K':
-							break;
-						case 'm':
-						case 'M':
-							dw_temp	*= 1024;
-							break;
-						case 'g':
-						case 'G':
-							dw_temp	*= 1024 * 1024;
-							break;
-						case 't':
-						case 'T':
-							dw_temp	*= 1024 * 1024 * 1024;
-							break;
-					}
-				}
-				memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
-				KEYVAL_DATA_SET_DWORD( t_val, dw_temp );
-				i_err	= KeyVal_SetData(
-							&(p_gnow->t_info), GUEST_MEM_SIZE_KEY, &t_val, GUEST_MEM_SIZE_PRI );
-
-				// VNC ---
-				strncpy( str_temp, pstr_item[5], sizeof( str_temp ) );
-				if( '-' != str_temp[0] )	{
-					pstr_host	= NULL;
-					i_vnc		= 0;
-					pstr_now	= str_temp;
-					pstr_host	= strsep( &pstr_now, ":" );
-
-					if(( NULL != pstr_host ) && ( NULL != pstr_now ))	{
-						memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
-						KEYVAL_DATA_SET_STRING( t_val, pstr_host );
-						i_err	= KeyVal_SetData(
-										&(p_gnow->t_info), GUEST_VNC_HOST_KEY,
-										&t_val, GUEST_VNC_HOST_PRI );
-
-						i_temp	= (int)strtol( pstr_now, NULL, 10 );
-						memset( &t_val, 0x00, sizeof( KeyVal_Data ) );
-						KEYVAL_DATA_SET_INT( t_val, i_temp );
-						i_err	= KeyVal_SetData(
-										&(p_gnow->t_info), GUEST_VNC_PORT_KEY,
-										&t_val, GUEST_VNC_PORT_PRI );
-					}
-				}
-
-				// Auto Start ---
-
-				// Set Status ---
-				if( 7 <= i_item )	{
-					if( !strncmp( pstr_item[7], "Running", 16 ))
-						{ p_gnow->dw_status	= GUEST_STATUS_RUN; }
-					else if( !strncmp( pstr_item[7], "Locked", 16 ))
-						{ p_gnow->dw_status	= GUEST_STATUS_WAIT; }
-					else if( !strncmp( pstr_item[7], "Stopped", 16 ))
-						{ p_gnow->dw_status	= GUEST_STATUS_STOP; }
-					else
-						{ p_gnow->dw_status	= GUEST_STATUS_UNKNOWN; }
-
-				}
-
-				Guest_Release( p_gnow );
+								&(p_gnow->t_info), GUEST_VNC_PORT_KEY,
+								&t_val, GUEST_VNC_PORT_PRI );
 			}
 		}
+
+		// Auto Start ---
+
+		// Set Status ---
+		if( 7 <= i_item )	{
+			if( !strncmp( pstr_item[7], "Running", 16 ))
+				{ p_gnow->dw_status	= GUEST_STATUS_RUN; }
+			else if( !strncmp( pstr_item[7], "Locked", 16 ))
+				{ p_gnow->dw_status	= GUEST_STATUS_WAIT; }
+			else if( !strncmp( pstr_item[7], "Stopped", 16 ))
+				{ p_gnow->dw_status	= GUEST_STATUS_STOP; }
+			else
+				{ p_gnow->dw_status	= GUEST_STATUS_UNKNOWN; }
+		}
+
+		Guest_Release( p_gnow );
+
+		if( GUEST_OBTAIN_NEW == i_gtype )	{
+			ErrInfo_DebugMsg( "NEW" );
+		}
+
 	}
 
 	return 0x00;