From 7fff5907ca601ec8b8bb57c32af3d552b50e7024 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Tue, 25 Aug 2009 17:45:49 +0100 Subject: [PATCH] Revert "Replace - with _ in xenvm cmd names as - is illegal in dbus RPC method names" This reverts commit daa7f7189ede5e024093bff6f5a1595437a30f1d. --- xenvm/tasks.ml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/xenvm/tasks.ml b/xenvm/tasks.ml index 953fb17..35e8f4c 100644 --- a/xenvm/tasks.ml +++ b/xenvm/tasks.ml @@ -85,29 +85,29 @@ let actions_table = [ (Suspend, mk_desc_args "suspend" [ ("live", D (ValBool false), ArgBool); ("file", R, ArgString); ] ); (Restore, mk_desc_args "restore" [ "file", R, ArgString ] ); - (GetDomid, mk_desc_nb "get_domid"); - (GetStatus, mk_desc_nb "get_status"); - (GetVNC, mk_desc_nb "get_vnc"); + (GetDomid, mk_desc_nb "get-domid"); + (GetStatus, mk_desc_nb "get-status"); + (GetVNC, mk_desc_nb "get-vnc"); (Trigger, mk_desc_args "trigger" [ "params", R, ArgString ]); (Device, mk_desc_args "device" [ "type", R, ArgString; "cmd", R, ArgString; "extra", O, ArgListString; ]); (Get, mk_desc_args_nb "get" [ "field", R, ArgString; ]); (Set, mk_desc_args_nb "set" [ "field", R, ArgString; "value", R, ArgString ]); - (AddDisk, mk_desc_args "disk_add" [ "path", R, ArgString; "device", R, ArgString; + (AddDisk, mk_desc_args "disk-add" [ "path", R, ArgString; "device", R, ArgString; "type", R, ArgString; "mode", R, ArgString; "devtype", R, ArgString ]); - (AddNic, mk_desc_args "nic_add" [ "bridge", O, ArgString; "mac", O, ArgString; "model", O, ArgString ]); - (AddPCI, mk_desc_args "pci_add" [ "id", R, ArgInt; "domain", R, ArgInt; "bus", R, ArgInt; + (AddNic, mk_desc_args "nic-add" [ "bridge", O, ArgString; "mac", O, ArgString; "model", O, ArgString ]); + (AddPCI, mk_desc_args "pci-add" [ "id", R, ArgInt; "domain", R, ArgInt; "bus", R, ArgInt; "slot", R, ArgInt; "func", R, ArgInt; "msitranslate", O, ArgBool; "power_mgmt", O, ArgBool ]); - (DelDisk, mk_desc "disk_del"); - (DelNic, mk_desc "nic_del"); - (DelPCI, mk_desc "pci_del"); - (ListDisk, mk_desc_nb "disk_list"); - (ListNic, mk_desc_nb "nic_list"); - (ListPCI, mk_desc_nb "pci_list"); - (ReadConfig, mk_desc_args_nb "read_config" [ "path", O, ArgString ]); + (DelDisk, mk_desc "disk-del"); + (DelNic, mk_desc "nic-del"); + (DelPCI, mk_desc "pci-del"); + (ListDisk, mk_desc_nb "disk-list"); + (ListNic, mk_desc_nb "nic-list"); + (ListPCI, mk_desc_nb "pci-list"); + (ReadConfig, mk_desc_args_nb "read-config" [ "path", O, ArgString ]); (Help, mk_desc_nb "help"); (* (Checkpoint, ("checkpoint", Some VmRunning)); -- 2.39.5