summaryrefslogtreecommitdiffstats
path: root/QMP/qmp.py
diff options
context:
space:
mode:
authorAnthony Liguori2013-09-17 16:51:40 +0200
committerAnthony Liguori2013-09-17 16:51:40 +0200
commit5dc11192b23fbb09fab277d58ac3c42b9699a8b0 (patch)
tree3b6d2c93fa9da23b4da6d289a47882819a45351a /QMP/qmp.py
parentMerge remote-tracking branch 'rth/tgt-i386' into staging (diff)
parentqemu-iotests: Fix test 038 (diff)
downloadqemu-5dc11192b23fbb09fab277d58ac3c42b9699a8b0.tar.gz
qemu-5dc11192b23fbb09fab277d58ac3c42b9699a8b0.tar.xz
qemu-5dc11192b23fbb09fab277d58ac3c42b9699a8b0.zip
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Max Reitz (16) and others # Via Kevin Wolf * kwolf/for-anthony: (33 commits) qemu-iotests: Fix test 038 block: Assert validity of BdrvActionOps qemu-iotests: Cleanup test image in test number 007 qemu-img: fix invalid JSON coroutine: add ./configure --disable-coroutine-pool qemu-iotests: Adjustments due to error propagation qcow2: Use Error parameter qemu-img create: Emit filename on error block: Error parameter for create functions block: Error parameter for open functions bdrv: Use "Error" for creating images bdrv: Use "Error" for opening images qemu-iotests: add 057 internal snapshot for block device test case hmp: add interface hmp_snapshot_delete_blkdev_internal hmp: add interface hmp_snapshot_blkdev_internal qmp: add interface blockdev-snapshot-delete-internal-sync qmp: add interface blockdev-snapshot-internal-sync qmp: add internal snapshot support in qmp_transaction snapshot: distinguish id and name in snapshot delete snapshot: new function bdrv_snapshot_find_by_id_and_name() ... Message-id: 1379073063-14963-1-git-send-email-kwolf@redhat.com
Diffstat (limited to 'QMP/qmp.py')
-rw-r--r--QMP/qmp.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/QMP/qmp.py b/QMP/qmp.py
index c551df1ed7..074f09a063 100644
--- a/QMP/qmp.py
+++ b/QMP/qmp.py
@@ -188,3 +188,9 @@ class QEMUMonitorProtocol:
def settimeout(self, timeout):
self.__sock.settimeout(timeout)
+
+ def get_sock_fd(self):
+ return self.__sock.fileno()
+
+ def is_scm_available(self):
+ return self.__sock.family == socket.AF_UNIX