Overview
Comment: | Fix some unnoticed problems introduced by python3 switch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e54cffda53c00078e3bf39922ec2ecf3 |
User & Date: | vitus on 2019-10-03 07:19:23 |
Other Links: | manifest | tags |
Context
2019-10-03
| ||
07:27 | More info on bridge configuration check-in: 46b8264cac user: vitus tags: trunk | |
07:19 | Fix some unnoticed problems introduced by python3 switch check-in: e54cffda53 user: vitus tags: trunk | |
2019-10-01
| ||
19:29 | Made debian package ver 0.8. Removed lintian warining. Converted find_free_port to python3 check-in: 5bd9419845 user: vitus tags: trunk | |
Changes
Modified vws from [6a51b18933] to [d549c75576].
︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | + + | readfd, dummy_w, dummy_x = select.select([sock], [], [], 0.1) if sock in readfd: dummy_greeting = sock.recv(1024) return sock def send_command(sock, command): """ Sends monitor command to given socket and returns answer """ if sock is None: raise RuntimeError("None socket is passed to send_command") fcntl.flock(sock, fcntl.LOCK_EX) try: # There can be stray (qemu) prompt in the socket. Try to drain # it try: sock.recv(64, socket.MSG_DONTWAIT) except socket.error as ex: |
︙ | |||
183 184 185 186 187 188 189 | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | - + | Checks if bridge listed in network configuration exists on this machine, and replaces it with default one from config, if not so """ f = open(filename, "r+") data = f.read() idx0 = data.find("-net bridge,br=") |
︙ | |||
250 251 252 253 254 255 256 | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | - + + + + | # Check for snapshot snapshot_id = check_for_snapshot(options.dir) if snapshot_id is not None: arg = arg + " -loadvm " + snapshot_id # Check for correct brige name try: os.stat("monitor") |
︙ |