Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 14:57:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[c-host] be compatible with new option ABI

Browse Source
This commit is contained in:
Geoffrey McRae 2019-05-11 20:59:31 +10:00
parent 538a6dc08e
commit 0090580a64
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
a12-181-g5b199d8f25+1 a12-182-g538a6dc08e+1

20
c-host/platform/Linux/src/platform.c
View File

@ -121,9 +121,9 @@ static int shmOpenDev(const char * shmDevice)
return fd; return fd;
} }
static bool shmDeviceValidator(struct OptionValue * value, const char ** error) static bool shmDeviceValidator(struct Option * opt, const char ** error)
{ {
char * name = uioGetName(value->v.x_string); char * name = uioGetName(opt->value.x_string);
if (!name) if (!name)
{ {
*error = "Failed to get the uio device name"; *error = "Failed to get the uio device name";
@ -174,15 +174,13 @@ int main(int argc, char * argv[])
struct Option options[] = struct Option options[] =
{ {
{ {
.module = "os", .module = "os",
.name = "shmDevice", .name = "shmDevice",
.description = "The IVSHMEM device to use", .description = "The IVSHMEM device to use",
.value = { .type = OPTION_TYPE_STRING,
.type = OPTION_TYPE_STRING, .value.x_string = "uio0",
.v.x_string = "uio0" .validator = shmDeviceValidator,
}, .printHelp = shmDevicePrintHelp
.validator = shmDeviceValidator,
.printHelp = shmDevicePrintHelp
}, },
{0} {0}
}; };

8
c-host/platform/Windows/src/platform.c
View File

@ -119,12 +119,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
.module = "os", .module = "os",
.name = "shmDevice", .name = "shmDevice",
.description = "The IVSHMEM device to use", .description = "The IVSHMEM device to use",
.value = { .type = OPTION_TYPE_INT,
.type = OPTION_TYPE_INT, .value.x_int = 0
.v.x_int = 0,
},
.validator = NULL,
.printHelp = NULL
}, },
{0} {0}
}; };