On Wed, 07/19 18:31, Amador Pahim wrote: > Let's make args public so users can extend it without felling like > abusing the internal API.
s/felling/feeling/ ? Fam > > Signed-off-by: Amador Pahim <apa...@redhat.com> > --- > scripts/qemu.py | 13 +++++++------ > tests/qemu-iotests/iotests.py | 18 +++++++++--------- > 2 files changed, 16 insertions(+), 15 deletions(-) > > diff --git a/scripts/qemu.py b/scripts/qemu.py > index 2707ae7f75..2c2043f89a 100644 > --- a/scripts/qemu.py > +++ b/scripts/qemu.py > @@ -34,7 +34,7 @@ class QEMUMachine(object): > self._qemu_log_path = os.path.join(test_dir, name + ".log") > self._popen = None > self._binary = binary > - self._args = list(args) # Force copy args in case we modify them > + self.args = list(args) # Force copy args in case we modify them > self._wrapper = wrapper > self._events = [] > self._iolog = None > @@ -44,8 +44,8 @@ class QEMUMachine(object): > # This can be used to add an unused monitor instance. > def add_monitor_telnet(self, ip, port): > args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port) > - self._args.append('-monitor') > - self._args.append(args) > + self.args.append('-monitor') > + self.args.append(args) > > def add_fd(self, fd, fdset, opaque, opts=''): > '''Pass a file descriptor to the VM''' > @@ -55,8 +55,8 @@ class QEMUMachine(object): > if opts: > options.append(opts) > > - self._args.append('-add-fd') > - self._args.append(','.join(options)) > + self.args.append('-add-fd') > + self.args.append(','.join(options)) > return self > > def send_fd_scm(self, fd_file_path): > @@ -168,7 +168,8 @@ class QEMUMachine(object): > > exitcode = self._popen.wait() > if exitcode < 0: > - sys.stderr.write('qemu received signal %i: %s\n' % > (-exitcode, ' '.join(self._args))) > + sys.stderr.write('qemu received signal %i: %s\n' % > + (-exitcode, ' '.join(self.args))) > self._load_io_log() > self._post_shutdown() > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index abcf3c10e2..6925d8841e 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -150,13 +150,13 @@ class VM(qtest.QEMUQtestMachine): > self._num_drives = 0 > > def add_device(self, opts): > - self._args.append('-device') > - self._args.append(opts) > + self.args.append('-device') > + self.args.append(opts) > return self > > def add_drive_raw(self, opts): > - self._args.append('-drive') > - self._args.append(opts) > + self.args.append('-drive') > + self.args.append(opts) > return self > > def add_drive(self, path, opts='', interface='virtio', format=imgfmt): > @@ -172,17 +172,17 @@ class VM(qtest.QEMUQtestMachine): > if opts: > options.append(opts) > > - self._args.append('-drive') > - self._args.append(','.join(options)) > + self.args.append('-drive') > + self.args.append(','.join(options)) > self._num_drives += 1 > return self > > def add_blockdev(self, opts): > - self._args.append('-blockdev') > + self.args.append('-blockdev') > if isinstance(opts, str): > - self._args.append(opts) > + self.args.append(opts) > else: > - self._args.append(','.join(opts)) > + self.args.append(','.join(opts)) > return self > > def pause_drive(self, drive, event=None): > -- > 2.13.3 > >