On Wed, Feb 03, 2021 at 11:38:57AM -0600, Jonathon Jongsma wrote:
> Abstract out the function used to generate the commandline for 'mdevctl
> start' since they take the same arguments. Add tests to ensure that
> we're generating the command properly.
>
> Signed-off-by: Jonathon Jongsma <[email protected]>
> ---
...
> static int
> testMdevctlStart(const char *virt_type,
I think ^this now needs to become testMdevctlStartOrDefine or something like
that
> int create,
> + MdevctlCmdFunc mdevctl_cmd_func,
> const char *mdevxml,
> - const char *startcmdfile,
> - const char *startjsonfile)
> + const char *cmdfile,
> + const char *jsonfile)
> {
> g_autoptr(virNodeDeviceDef) def = NULL;
> virNodeDeviceObjPtr obj = NULL;
> @@ -66,7 +77,7 @@ testMdevctlStart(const char *virt_type,
>
> /* this function will set a stdin buffer containing the json
> configuration
> * of the device. The json value is captured in the callback above */
> - cmd = nodeDeviceGetMdevctlStartCommand(def, &uuid);
> + cmd = mdevctl_cmd_func(def, &uuid);
>
> if (!cmd)
> goto cleanup;
> @@ -78,10 +89,10 @@ testMdevctlStart(const char *virt_type,
> if (!(actualCmdline = virBufferCurrentContent(&buf)))
> goto cleanup;
>
> - if (nodedevCompareToFile(actualCmdline, startcmdfile) < 0)
> + if (nodedevCompareToFile(actualCmdline, cmdfile) < 0)
> goto cleanup;
>
> - if (virTestCompareToFile(stdinbuf, startjsonfile) < 0)
> + if (virTestCompareToFile(stdinbuf, jsonfile) < 0)
> goto cleanup;
>
> ret = 0;
> @@ -96,17 +107,31 @@ static int
> testMdevctlStartHelper(const void *data)
and ^this one similarly should become StartOrDefine or use a similar name along
the lines.
Reviewed-by: Erik Skultety <[email protected]>
