diff options
| author | Peter Maydell | 2016-07-26 19:22:49 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-07-26 19:22:49 +0200 |
| commit | c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511 (patch) | |
| tree | e930fed8593d6842ea04099bf29867b1ec2e65f4 /scripts/qtest.py | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.7-20160726' into... (diff) | |
| parent | iotest: fix python based IO tests (diff) | |
| download | qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.tar.gz qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.tar.xz qemu-c1fdfe9fcaf4e47ec3def98c5a7c52d2cae6c511.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2016-07-26' into staging
Block patches for 2.7.0-rc1
# gpg: Signature made Tue 26 Jul 2016 18:11:36 BST
# gpg: using RSA key 0x3BB14202E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
# Subkey fingerprint: 58B3 81CE 2DC8 9CF9 9730 EE64 3BB1 4202 E838 ACAD
* remotes/maxreitz/tags/pull-block-2016-07-26:
iotest: fix python based IO tests
block: export LUKS specific data to qemu-img info
crypto: add support for querying parameters for block encryption
AioContext: correct comments
qcow2: do not allocate extra memory
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qtest.py')
| -rw-r--r-- | scripts/qtest.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/scripts/qtest.py b/scripts/qtest.py index 03bc7f6c9b..d5aecb5f49 100644 --- a/scripts/qtest.py +++ b/scripts/qtest.py @@ -79,25 +79,30 @@ class QEMUQtestProtocol(object): class QEMUQtestMachine(qemu.QEMUMachine): '''A QEMU VM''' - def __init__(self, binary, args=[], name=None, test_dir="/var/tmp"): - super(self, QEMUQtestMachine).__init__(binary, args, name, test_dir) + def __init__(self, binary, args=[], name=None, test_dir="/var/tmp", + socket_scm_helper=None): + if name is None: + name = "qemu-%d" % os.getpid() + super(QEMUQtestMachine, self).__init__(binary, args, name=name, test_dir=test_dir, + socket_scm_helper=socket_scm_helper) self._qtest_path = os.path.join(test_dir, name + "-qtest.sock") def _base_args(self): - args = super(self, QEMUQtestMachine)._base_args() - args.extend(['-qtest', 'unix:path=' + self._qtest_path]) + args = super(QEMUQtestMachine, self)._base_args() + args.extend(['-qtest', 'unix:path=' + self._qtest_path, + '-machine', 'accel=qtest']) return args def _pre_launch(self): - super(self, QEMUQtestMachine)._pre_launch() + super(QEMUQtestMachine, self)._pre_launch() self._qtest = QEMUQtestProtocol(self._qtest_path, server=True) def _post_launch(self): - super(self, QEMUQtestMachine)._post_launch() + super(QEMUQtestMachine, self)._post_launch() self._qtest.accept() def _post_shutdown(self): - super(self, QEMUQtestMachine)._post_shutdown() + super(QEMUQtestMachine, self)._post_shutdown() self._remove_if_exists(self._qtest_path) def qtest(self, cmd): |