client/virt/kvm_monitor.py - Issue 6883246: Merge autotest upstream from @5318 ~ @5336

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: client/virt/kvm_monitor.py

Issue 6883246: Merge autotest upstream from @5318 ~ @5336 (Closed) Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: client/virt/kvm_monitor.py

diff --git a/client/tests/kvm/kvm_monitor.py b/client/virt/kvm_monitor.py

similarity index 99%

rename from client/tests/kvm/kvm_monitor.py

rename to client/virt/kvm_monitor.py

index 159c575a76a0341d3ce679a6285bb2652cfb1299..7934b071f1515db0ffd7e469d4fdd4769fbb5b85 100644

--- a/client/tests/kvm/kvm_monitor.py

+++ b/client/virt/kvm_monitor.py

@@ -5,7 +5,7 @@ Interfaces to the QEMU monitor.

"""

import socket, time, threading, logging, select

-import kvm_utils

+import virt_utils

try:

import json

except ImportError:

@@ -553,7 +553,7 @@ class QMPMonitor(Monitor):

# Read any data that might be available

self._read_objects()

# Send command

- id = kvm_utils.generate_random_string(8)

+ id = virt_utils.generate_random_string(8)

self._send(json.dumps(self._build_cmd(cmd, args, id)) + "\n")

# Read response

r = self._get_response(id, timeout)

« no previous file with comments | « client/virt/kvm_installer.py ('k') | client/virt/kvm_vm.py » ('j') | no next file with comments »