From: Jon Ludlam Date: Tue, 25 Aug 2009 17:21:55 +0000 (+0100) Subject: Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1178ad74521c1b22515b1474de72ccc518fe1ee9;p=xenclient%2Ftoolstack.git Merge branch 'master' of git://git.uk.xensource.com/xenclient/toolstack Conflicts: xenvm/tasks.ml --- 1178ad74521c1b22515b1474de72ccc518fe1ee9 diff --cc xenvm/tasks.ml index 92998fe,35e8f4c..4f4701f --- a/xenvm/tasks.ml +++ b/xenvm/tasks.ml @@@ -97,28 -94,20 +97,30 @@@ let actions_table = "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"); + - (CDEject, mk_desc_args "cd_eject" [ "virtpath", R, ArgString; ]); - (CDInsertFile,mk_desc_args "cd_insert_file" [ "virtpath", R, ArgString; ++ (CDEject, mk_desc_args "cd-eject" [ "virtpath", R, ArgString; ]); ++ (CDInsertFile,mk_desc_args "cd-insert-file" [ "virtpath", R, ArgString; + "physpath", R, ArgString ]); - (CDInsertReal,mk_desc_args "cd_insert_real" [ "virtpath", R, ArgString; ++ (CDInsertReal,mk_desc_args "cd-insert-real" [ "virtpath", R, ArgString; + "physpath", R, ArgString ]); + + - (ReadConfig, mk_desc_args_nb "read_config" [ "path", O, ArgString ]); ++ (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));