[c-host] be compatible with new option ABI

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

View file

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

View file

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

View file

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