Incfs6

sample/guest01.ini

@@ -1,6 +1,8 @@
 [global]
 name=civ-1
 flashfiles=/home/gvt/caas/caas-flashfiles-CR0000317.zip
+adb_port=5555
+fastboot_port=5554
 vsock_cid=3
 
 [emulator]
@@ -38,21 +40,6 @@ type=GVT-g
 gvtg_version=i915-GVTg_V5_4
 vgpu_uuid=1fc89c23-e8a6-47a9-83be-ec23d6f4bb17
 
-[net]
-#Optional ethernet model
-#default is e1000
-#if it is set to "none", the whole network emulation will be disabled
-model=e1000
-
-#Optional adb forwarding port
-#default is 5555
-adb_port=5555
-
-#Optional fastboot forwarding port
-#default is 5554
-fastboot_port=5554
-
-
 [vtpm]
 bin_path=/usr/bin/swtpm
 data_dir=/home/gvt/caas/vtpm0

src/guest/guest.c

@@ -21,14 +21,13 @@
 #include "guest.h"
 
 keyfile_group_t g_group[] = {
-	{ "global",   { "name", "flashfiles", "vsock_cid", NULL } },
+	{ "global",   { "name", "flashfiles", "adb_port", "fastboot_port", "vsock_cid", NULL } },
 	{ "emulator", { "path", NULL } },
 	{ "memory",   { "size", NULL } },
 	{ "vcpu",     { "num",  NULL } },
 	{ "firmware", { "type", "path", "code", "vars", NULL } },
 	{ "disk",     { "path", "size", NULL } },
-	{ "graphics", { "type", "gvtg_version", "vgpu_uuid", "monitor", NULL } },
-	{ "net",      { "model", "adb_port", "fastboot_port", NULL } },
+	{ "graphics", { "type", "gvtg_version", "vgpu_uuid", NULL } },
 	{ "vtpm",     { "bin_path", "data_dir", NULL } },
 	{ "rpmb",     { "bin_path", "data_dir", NULL } },
 	{ "passthrough", { "passthrough_pci", NULL}},
@@ -60,11 +59,9 @@ int load_form_data(char *name)
 	set_field_data(FORM_INDEX_NAME, name);
 	val = g_key_file_get_string(in, g->name, g->key[GLOB_FLASHFILES], NULL);
 	set_field_data(FORM_INDEX_FLASHFILES, val);
-
-	g = &g_group[GROUP_VNET];
-	val = g_key_file_get_string(in, g->name, g->key[VNET_ADB_PORT], NULL);
+	val = g_key_file_get_string(in, g->name, g->key[GLOB_ADB_PORT], NULL);
 	set_field_data(FORM_INDEX_ADB_PORT, val);
-	val = g_key_file_get_string(in, g->name, g->key[VNET_FASTBOOT_PORT], NULL);
+	val = g_key_file_get_string(in, g->name, g->key[GLOB_FASTBOOT_PORT], NULL);
 	set_field_data(FORM_INDEX_FASTBOOT_PORT, val);
 
 	g = &g_group[GROUP_EMUL];
@@ -141,6 +138,9 @@ int load_form_data(char *name)
 	set_field_data(FORM_INDEX_AAF_PATH, val);
 	val = g_key_file_get_string(in, g->name, g->key[AAF_SUSPEND], NULL);
 	set_field_data(FORM_INDEX_AAF_SUSPEND, val);
+	val = g_key_file_get_string(in, g->name, g->key[AAF_AUDIO_TYPE], NULL);
+	set_field_data(FORM_INDEX_AAF_AUDIO_TYPE, val);
+
 
 	g = &g_group[GROUP_GUEST_SERVICE];
 	val = g_key_file_get_string(in, g->name, g->key[GUEST_TIME_KEEP], NULL);
@@ -198,13 +198,13 @@ int generate_keyfile(void)
 	if (0 != check_field("adb port", temp)) {
 		goto exit;
 	}
-	g_key_file_set_string(out, g_group[GROUP_VNET].name, g_group[GROUP_VNET].key[VNET_ADB_PORT], temp);
+	g_key_file_set_string(out, g_group[GROUP_GLOB].name, g_group[GROUP_GLOB].key[GLOB_ADB_PORT], temp);
 
 	get_field_data(FORM_INDEX_FASTBOOT_PORT, temp, sizeof(temp) - 1);
 	if (0 != check_field("fastboot port", temp)) {
 		goto exit;
 	}
-	g_key_file_set_string(out, g_group[GROUP_VNET].name, g_group[GROUP_VNET].key[VNET_FASTBOOT_PORT], temp);
+	g_key_file_set_string(out, g_group[GROUP_GLOB].name, g_group[GROUP_GLOB].key[GLOB_FASTBOOT_PORT], temp);
 
 	get_field_data(FORM_INDEX_EMUL, temp, sizeof(temp) - 1);
 	if (0 != check_field(g_group[GROUP_EMUL].key[EMUL_PATH], temp)) {
@@ -396,6 +396,8 @@ int import_guest(char *in_path)
 		case GROUP_GLOB:
 			import_field(i, GLOB_NAME, in, out);
 			import_field(i, GLOB_FLASHFILES, in, out);
+			import_field(i, GLOB_ADB_PORT, in, out);
+			import_field(i, GLOB_FASTBOOT_PORT, in, out);
 
 			val = g_key_file_get_string(in, group->name, group->key[GLOB_NAME], NULL);
 			if (val == NULL) {
@@ -430,14 +432,11 @@ int import_guest(char *in_path)
 			} else if (strcmp(val, VGPU_OPTS_GVTD_STR) == 0) {
 			} else if (strcmp(val, VGPU_OPTS_VIRTIO_STR) == 0) {
 			} else if (strcmp(val, VGPU_OPTS_RAMFB_STR) == 0) {
-			} else if (strcmp(val, VGPU_OPTS_VIRTIO2D_STR) == 0) {
-			} else if (strcmp(val, VGPU_OPTS_SRIOV_STR) == 0) {
 			} else {
 				g_warning("cannot find graphics sub-key\n");
 				return -1;
 			}		
 			break;
-
 		default:
 			j = 0;
 			while (g_group[i].key[j]) {