]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
nodedev: Switch to using long options for mdevctl
authorJonathon Jongsma <jjongsma@redhat.com>
Thu, 8 Apr 2021 21:53:27 +0000 (16:53 -0500)
committerJonathon Jongsma <jjongsma@redhat.com>
Mon, 19 Apr 2021 15:24:13 +0000 (10:24 -0500)
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>
src/node_device/node_device_driver.c
tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-create.argv
tests/nodedevmdevctldata/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366-define.argv
tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-create.argv
tests/nodedevmdevctldata/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9-define.argv
tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-create.argv
tests/nodedevmdevctldata/mdev_fedc4916_1ca8_49ac_b176_871d16c13076-define.argv
tests/nodedevmdevctldata/mdevctl-start.argv
tests/nodedevmdevctldata/mdevctl-stop.argv
tests/nodedevmdevctldata/mdevctl-undefine.argv

index b4465162cb6fa8f44202bea142d970c31a3b28f4..107e48c925fe8d0b833c7151962436c7ef499d8d 100644 (file)
@@ -735,10 +735,9 @@ nodeDeviceGetMdevctlDefineCreateCommand(virNodeDeviceDef *def,
         return NULL;
     }
 
-    cmd = virCommandNewArgList(MDEVCTL, subcommand,
-                               "-p", parent_addr,
-                               "--jsonfile", "/dev/stdin",
-                               NULL);
+    cmd = virCommandNewArgList(MDEVCTL, subcommand, NULL);
+    virCommandAddArgPair(cmd, "--parent", parent_addr);
+    virCommandAddArgPair(cmd, "--jsonfile", "/dev/stdin");
 
     virCommandSetInputBuffer(cmd, json);
 
@@ -902,11 +901,8 @@ nodeDeviceCreateXML(virConnectPtr conn,
 virCommand *
 nodeDeviceGetMdevctlStopCommand(const char *uuid, char **errmsg)
 {
-    virCommand *cmd = virCommandNewArgList(MDEVCTL,
-                                           "stop",
-                                           "-u",
-                                           uuid,
-                                           NULL);
+    virCommand *cmd = virCommandNewArgList(MDEVCTL, "stop", NULL);
+    virCommandAddArgPair(cmd, "--uuid", uuid);
     virCommandSetErrorBuffer(cmd, errmsg);
     return cmd;
 
@@ -915,11 +911,8 @@ nodeDeviceGetMdevctlStopCommand(const char *uuid, char **errmsg)
 virCommand *
 nodeDeviceGetMdevctlUndefineCommand(const char *uuid, char **errmsg)
 {
-    virCommand *cmd = virCommandNewArgList(MDEVCTL,
-                                           "undefine",
-                                           "-u",
-                                           uuid,
-                                           NULL);
+    virCommand *cmd = virCommandNewArgList(MDEVCTL, "undefine", NULL);
+    virCommandAddArgPair(cmd, "--uuid", uuid);
     virCommandSetErrorBuffer(cmd, errmsg);
     return cmd;
 }
@@ -927,11 +920,8 @@ nodeDeviceGetMdevctlUndefineCommand(const char *uuid, char **errmsg)
 virCommand *
 nodeDeviceGetMdevctlStartCommand(const char *uuid, char **errmsg)
 {
-    virCommand *cmd = virCommandNewArgList(MDEVCTL,
-                                           "start",
-                                           "-u",
-                                           uuid,
-                                           NULL);
+    virCommand *cmd = virCommandNewArgList(MDEVCTL, "start", NULL);
+    virCommandAddArgPair(cmd, "--uuid", uuid);
     virCommandSetErrorBuffer(cmd, errmsg);
     return cmd;
 }
index 73a8046d8401b2c62f55266a444f0be1ee5f5ede..3cf66f8a91a7acb60c61448203f9f289b7029b8f 100644 (file)
@@ -1,5 +1,5 @@
 mdevctl \
 start \
--0000:00:02.0 \
---jsonfile /dev/stdin \
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin \
 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366
index b8bb276f9f77444aecda1ae4015dedfaebac9d86..a8c2feaed4ee2da2d002dc9573e16c8ff0321082 100644 (file)
@@ -1,5 +1,5 @@
 mdevctl \
 define \
--0000:00:02.0 \
---jsonfile /dev/stdin \
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin \
 --uuid=d069d019-36ea-4111-8f0a-8c9a70e21366
index eae63f7a7fa51f9169c725e5c0ec8be1649b2a5b..010e562026c2ca089e0b757bec2089374ba79042 100644 (file)
@@ -1,4 +1,4 @@
 mdevctl \
 start \
--0000:00:02.0 \
---jsonfile /dev/stdin
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin
index bf8637ed577069992833e0ed052845f480c4ea83..46d1e95f1500fa4d226a1db58dc0fde1a505d56b 100644 (file)
@@ -1,4 +1,4 @@
 mdevctl \
 define \
--0000:00:02.0 \
---jsonfile /dev/stdin
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin
index eae63f7a7fa51f9169c725e5c0ec8be1649b2a5b..010e562026c2ca089e0b757bec2089374ba79042 100644 (file)
@@ -1,4 +1,4 @@
 mdevctl \
 start \
--0000:00:02.0 \
---jsonfile /dev/stdin
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin
index bf8637ed577069992833e0ed052845f480c4ea83..46d1e95f1500fa4d226a1db58dc0fde1a505d56b 100644 (file)
@@ -1,4 +1,4 @@
 mdevctl \
 define \
--0000:00:02.0 \
---jsonfile /dev/stdin
+--parent=0000:00:02.0 \
+--jsonfile=/dev/stdin
index ccb8e2992c14326d157714fea62fb6c95211519e..e876d08ad3f433fd5f0f88c211be803e77875d3d 100644 (file)
@@ -1,3 +1,3 @@
 mdevctl \
 start \
--d069d019-36ea-4111-8f0a-8c9a70e21366
+--uuid=d069d019-36ea-4111-8f0a-8c9a70e21366
index a07d339e474fe1157e60e554286ee6b3cad2ced3..e422b2c3eab800ddd1068d3ff75762b9196ee30b 100644 (file)
@@ -1,3 +1,3 @@
 mdevctl \
 stop \
--d069d019-36ea-4111-8f0a-8c9a70e21366
+--uuid=d069d019-36ea-4111-8f0a-8c9a70e21366
index dbde32e2a8be316731cfb05f370b86eaae8203b3..fa35a646be03e7925eaf24053d078554fdd6d30d 100644 (file)
@@ -1,3 +1,3 @@
 mdevctl \
 undefine \
--d069d019-36ea-4111-8f0a-8c9a70e21366
+--uuid=d069d019-36ea-4111-8f0a-8c9a70e21366