NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nodedev: Switch to using long options for mdevctl

Browse Source 
rather than using short opentions (e.g. "-p 0000:00:02.0"), use long
options everywhere (e.g. "--parent=0000:00:02.0")

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Jonathon Jongsma 2021-04-08 16:53:27 -05:00
parent 963888f288
commit 123ea7d51c
10 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/node_device/node_device_driver.c
View File

@ -735,10 +735,9 @@ nodeDeviceGetMdevctlDefineCreateCommand(virNodeDeviceDef *def,
return NULL; return NULL;
} }
cmd = virCommandNewArgList(MDEVCTL, subcommand, cmd = virCommandNewArgList(MDEVCTL, subcommand, NULL);
"-p", parent_addr, virCommandAddArgPair(cmd, "--parent", parent_addr);
"--jsonfile", "/dev/stdin", virCommandAddArgPair(cmd, "--jsonfile", "/dev/stdin");
NULL);
virCommandSetInputBuffer(cmd, json); virCommandSetInputBuffer(cmd, json);
@ -902,11 +901,8 @@ nodeDeviceCreateXML(virConnectPtr conn,
virCommand * virCommand *
nodeDeviceGetMdevctlStopCommand(const char *uuid, char **errmsg) nodeDeviceGetMdevctlStopCommand(const char *uuid, char **errmsg)
{ {
virCommand *cmd = virCommandNewArgList(MDEVCTL, virCommand *cmd = virCommandNewArgList(MDEVCTL, "stop", NULL);
"stop", virCommandAddArgPair(cmd, "--uuid", uuid);
"-u",
uuid,
NULL);
virCommandSetErrorBuffer(cmd, errmsg); virCommandSetErrorBuffer(cmd, errmsg);
return cmd; return cmd;
@ -915,11 +911,8 @@ nodeDeviceGetMdevctlStopCommand(const char *uuid, char **errmsg)
virCommand * virCommand *
nodeDeviceGetMdevctlUndefineCommand(const char *uuid, char **errmsg) nodeDeviceGetMdevctlUndefineCommand(const char *uuid, char **errmsg)
{ {
virCommand *cmd = virCommandNewArgList(MDEVCTL, virCommand *cmd = virCommandNewArgList(MDEVCTL, "undefine", NULL);
"undefine", virCommandAddArgPair(cmd, "--uuid", uuid);
"-u",
uuid,
NULL);
virCommandSetErrorBuffer(cmd, errmsg); virCommandSetErrorBuffer(cmd, errmsg);
return cmd; return cmd;
} }
@ -927,11 +920,8 @@ nodeDeviceGetMdevctlUndefineCommand(const char *uuid, char **errmsg)
virCommand * virCommand *
nodeDeviceGetMdevctlStartCommand(const char *uuid, char **errmsg) nodeDeviceGetMdevctlStartCommand(const char *uuid, char **errmsg)
{ {
virCommand *cmd = virCommandNewArgList(MDEVCTL, virCommand *cmd = virCommandNewArgList(MDEVCTL, "start", NULL);
"start", virCommandAddArgPair(cmd, "--uuid", uuid);
"-u",
uuid,
NULL);
virCommandSetErrorBuffer(cmd, errmsg); virCommandSetErrorBuffer(cmd, errmsg);
return cmd; return cmd;
} }

4
tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-create.argv
View File

@ -1,5 +1,5 @@
mdevctl \ mdevctl \
start \ start \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin \ --jsonfile=/dev/stdin \
--uuid=d069d019-36ea-4111-8f0a-8c9a70e21366 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366

4
tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-define.argv
View File

@ -1,5 +1,5 @@
mdevctl \ mdevctl \
define \ define \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin \ --jsonfile=/dev/stdin \
--uuid=d069d019-36ea-4111-8f0a-8c9a70e21366 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366

4
tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-create.argv
View File

@ -1,4 +1,4 @@
mdevctl \ mdevctl \
start \ start \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin --jsonfile=/dev/stdin

4
tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-define.argv
View File

@ -1,4 +1,4 @@
mdevctl \ mdevctl \
define \ define \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin --jsonfile=/dev/stdin

4
tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-create.argv
View File

@ -1,4 +1,4 @@
mdevctl \ mdevctl \
start \ start \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin --jsonfile=/dev/stdin

4
tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-define.argv
View File

@ -1,4 +1,4 @@
mdevctl \ mdevctl \
define \ define \
-p 0000:00:02.0 \ --parent=0000:00:02.0 \
--jsonfile /dev/stdin --jsonfile=/dev/stdin

2
tests/nodedevmdevctldata/mdevctl-start.argv
View File

@ -1,3 +1,3 @@
mdevctl \ mdevctl \
start \ start \
-u d069d019-36ea-4111-8f0a-8c9a70e21366 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366

2
tests/nodedevmdevctldata/mdevctl-stop.argv
View File

@ -1,3 +1,3 @@
mdevctl \ mdevctl \
stop \ stop \
-u d069d019-36ea-4111-8f0a-8c9a70e21366 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366

2
tests/nodedevmdevctldata/mdevctl-undefine.argv
View File

@ -1,3 +1,3 @@
mdevctl \ mdevctl \
undefine \ undefine \
-u d069d019-36ea-4111-8f0a-8c9a70e21366 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366