[client] main: format the guest information a bit better

This commit is contained in:
Geoffrey McRae 2022-01-06 15:19:16 +11:00
parent c20bb27b67
commit 67509d7a2d

View File

@ -1312,6 +1312,9 @@ restart:
return -1; return -1;
} }
DEBUG_INFO("Guest Information:");
DEBUG_INFO("Version : %s", udata->hostver);
/* parse the kvmfr records from the userdata */ /* parse the kvmfr records from the userdata */
udataSize -= sizeof(*udata); udataSize -= sizeof(*udata);
uint8_t * p = (uint8_t *)(udata + 1); uint8_t * p = (uint8_t *)(udata + 1);
@ -1331,7 +1334,7 @@ restart:
case KVMFR_RECORD_VMINFO: case KVMFR_RECORD_VMINFO:
{ {
KVMFRRecord_VMInfo * vmInfo = (KVMFRRecord_VMInfo *)p; KVMFRRecord_VMInfo * vmInfo = (KVMFRRecord_VMInfo *)p;
DEBUG_INFO("SMBIOS UUID : " DEBUG_INFO("UUID : "
"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
vmInfo->uuid[ 0], vmInfo->uuid[ 1], vmInfo->uuid[ 2], vmInfo->uuid[ 0], vmInfo->uuid[ 1], vmInfo->uuid[ 2],
vmInfo->uuid[ 3], vmInfo->uuid[ 4], vmInfo->uuid[ 5], vmInfo->uuid[ 3], vmInfo->uuid[ 4], vmInfo->uuid[ 5],
@ -1340,10 +1343,10 @@ restart:
vmInfo->uuid[12], vmInfo->uuid[13], vmInfo->uuid[14], vmInfo->uuid[12], vmInfo->uuid[13], vmInfo->uuid[14],
vmInfo->uuid[15]); vmInfo->uuid[15]);
DEBUG_INFO("Guest CPU Model: %s", vmInfo->model); DEBUG_INFO("CPU Model: %s", vmInfo->model);
DEBUG_INFO("Guest CPU : %u cores, %u threads", DEBUG_INFO("CPU : %u cores, %u threads",
vmInfo->cores, vmInfo->cpus); vmInfo->cores, vmInfo->cpus);
DEBUG_INFO("Capture Device : %s", vmInfo->capture); DEBUG_INFO("Using : %s", vmInfo->capture);
bool uuidValid = false; bool uuidValid = false;
for(int i = 0; i < sizeof(vmInfo->uuid); ++i) for(int i = 0; i < sizeof(vmInfo->uuid); ++i)
@ -1379,8 +1382,9 @@ restart:
else else
type = typeStr[osInfo->os]; type = typeStr[osInfo->os];
DEBUG_INFO("Guest OS : %s", type); DEBUG_INFO("OS : %s", type);
DEBUG_INFO("Guest OS Name : %s", osInfo->name); if (osInfo->name[0])
DEBUG_INFO("OS Name : %s", osInfo->name);
break; break;
} }