Overview
Comment: | vws list --state now outputs IP and mac addresses |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5b974714bc5e5e3fc6534932de576687 |
User & Date: | vitus on 2016-04-15 12:23:56 |
Other Links: | manifest | tags |
Context
2016-04-15
| ||
14:28 | Implemented shutdown command. Added systemd servcice file check-in: f1d54672c8 user: vitus tags: trunk | |
12:23 | vws list --state now outputs IP and mac addresses check-in: 5b974714bc user: vitus tags: trunk | |
2016-04-14
| ||
20:10 | documented permission setction of config file. Make autostart_user option work check-in: 57c08957e3 user: vitus tags: trunk | |
Changes
Modified Makefile from [e05303f1dd] to [c8d4867043].
︙ | |||
9 10 11 12 13 14 15 | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | - - - + + + | %.1:%.mkd pandoc -s -t man -o $@ $+ clean: rm *.1 install: vws vws.1 find_free_port.1 vws.conf |
Modified vws from [e599101b46] to [f9837316dc].
︙ | |||
85 86 87 88 89 90 91 92 93 94 95 96 97 98 | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | + + + + + + + + + + + + + + + + + | if idx <= 0: continue name = line[:idx] if name == "bridge name": continue lst.append(name) return lst def parse_arp(iface): """ Returns map which maps mac addresses to IPs for specified interface" """ addr_map = {} pipe = os.popen(config.get("tools","arp")+" -n -i "+iface, "r") for line in pipe: data = line.split() mac=data[2] if mac == "HWAddress": continue if mac == iface: # Foind line with (incomplete) entry continue addr_map[data[2]]=data[0] return addr_map def validate_size(size): """ Checks if size argument has proper format """ return re.match('\\d+[KMG]', size) is not None def get_drives(vm_dir): """ Return list of drive files in the VW directory """ |
︙ | |||
107 108 109 110 111 112 113 | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | return result def snapshot_mode(sock): """ Returns True if VM is running in snapshot mode """ answer = send_command(sock, "info block") return re.search(": /tmp", answer) is not None |
︙ | |||
305 306 307 308 309 310 311 312 313 314 315 316 317 | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | + - + - + - - + + + + + + - + - - + + + - - - + + + + + + + + + - + | count = 0 search_path = [("private",os.environ['HOME'] + "/VWs"), ("shared",config.get("directories", "SharedVMs")), ("autostart",config.get("directories", "AutostartVMs"))] maxlen = 0 vms = [] bridges = set() for (vmtype,dirname) in search_path: if not os.access(dirname + "/.", os.X_OK): continue for vmname in os.listdir(dirname): if os.access(dirname + "/" + vmname + "/start", os.X_OK): count += 1 |
︙ | |||
698 699 700 701 702 703 704 705 706 707 708 709 710 711 | 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 | + | ('diskif', 'virtio'), ('sound', 'hda'), ('arch', arch), ('vga', 'qxl')]: config.set('create options', option, value) config.add_section('tools') config.set('tools', 'viewer', 'remote-viewer %s') config.set('tools', 'bridge_list', '/sbin/brctl show') config.set('tools', 'lsusb', 'lsusb') config.set('tools', 'arp', '/usr/sbin/arp') config.add_section('permissions') config.set('permissions','vm_group','kvm') config.set('permissions','autostart_user','root') config.set('permissions','setgid_vm','yes') # Read configration files config.read(['/etc/vws.conf', os.environ['HOME'] + '/.vwsrc']) # Parse argument |
︙ |
Modified vws.mkd from [dc1c3f9b66] to [5f40be7393].
︙ | |||
262 263 264 265 266 267 268 | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | - + - + + + | **vws stoprecord** *machine* Stop recording sound. **vws monitor** *machine* Attaches to the machine monitor and allows user to send monitor commands |
︙ |