From nobody Tue Feb 10 16:22:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524157251000299.3156370714621; Thu, 19 Apr 2018 10:00:51 -0700 (PDT) Received: from localhost ([::1]:60628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9CvS-00067w-5C for importer@patchew.org; Thu, 19 Apr 2018 13:00:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9CiC-0003Hu-88 for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9Ci8-0007PY-5n for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:08 -0400 Received: from mail-qt0-x229.google.com ([2607:f8b0:400d:c0d::229]:42513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9Ci8-0007P9-0X; Thu, 19 Apr 2018 12:47:04 -0400 Received: by mail-qt0-x229.google.com with SMTP id j3-v6so6499091qtn.9; Thu, 19 Apr 2018 09:47:03 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id k126sm3040039qkd.34.2018.04.19.09.46.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 09:47:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QO0osnrYgT45mBxQLv4e00Z78uT8KzTZuIsimkthMD0=; b=tSk1Uy7wCRo/j3wTId7pntjV4Z6iWBj5+bkXO1ILVfYVuPmEX0ej76sRneNu5Kzlhk F+2BbZMaGy4EMfEs8YXye1/HLfjUK/oKWZ96kBEkJlgTzZpDFv98tSXZpqVKP6b6TT1G mxi3x/bX8YkpV4gV2x2BWMR6YD+CWwMb59BUf9FbWy45EldS1VyHwAFNw66QRR9FkXqK /+OfQxWl/4YBRwu0xWdnEYJi7eHYC890oOh31o3TJsnm7Sa47bRJQEtysg1xleq6L/Wc w0oU/zEr+kaf2KYKMND2QKu6UROSyD7Pc5Eh5t8JkscQdweQ6484lhaFVu3adWXFkVIs mNZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QO0osnrYgT45mBxQLv4e00Z78uT8KzTZuIsimkthMD0=; b=cYe1ajdnjjenR8GBLNBztHNRCTwJPTVvHJEWbdEmfbeYEBuWi78GEZMwss5i74BYBU bc5GuP6jZFWWcMVuEuLljl1lHWNSXkrFdKR6Pc/Acj1D1SmArNFhiOt75akiLiAOevYJ 9o/FxrqLKuPxtCgas974dYRD0KvYMn9pmznW4JyzphbTB6R7h09f0WuddjUoYljfjaMo LFkdw2TO+zLP8Yt/3FZU2fTWAXkjy9UI0jqMFKbxFIatWMVYfQu+s33HrwJgNx7qock1 rFysHjQ8sN/vz2ESrQQRFiQMJC+/JreVweAxxhcu0RhhXqR3IDxaRdo6PnzoKQUYspou 0Exg== X-Gm-Message-State: ALQs6tBkh9WqOp5+xYiosRxurLql5oZKRg6uJRdAwyAjUeYS5vnY/Abv A/QPuweY+riL4M96q+krtdixGG8w X-Google-Smtp-Source: AB8JxZrWosrlzDqvyMMlXbd6mlQA29ra3BzT2VcZ6K6PhEonBXhxJfGbc8g5satYqjgX69zRXp+Z0g== X-Received: by 2002:ac8:2912:: with SMTP id y18-v6mr3740250qty.336.1524156423321; Thu, 19 Apr 2018 09:47:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cleber Rosa , Amador Pahim , Stefan Hajnoczi , Zheng Xiang Date: Thu, 19 Apr 2018 13:46:37 -0300 Message-Id: <20180419164642.9536-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419164642.9536-1-f4bug@amsat.org> References: <20180419164642.9536-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::229 Subject: [Qemu-devel] [RFC PATCH 2/7] avocado: Update python scripts to upstream codebase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Eduardo Habkost , "open list:Block layer core" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Alistair Francis , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 QEMUMachine arguments member is called '_args'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qemu.py | 14 +++++++------- tests/avocado/avocado_qemu/test.py | 12 ++++++------ tests/qemu-iotests/iotests.py | 28 ++++++++++++++-------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index bd66620f45..0eecc44d09 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -81,7 +81,7 @@ class QEMUMachine(object): self._qemu_log_file =3D None self._popen =3D None self._binary =3D binary - self.args =3D list(args) # Force copy args in case we modify t= hem + self._args =3D list(args) # Force copy args in case we modify = them self._wrapper =3D wrapper self._events =3D [] self._iolog =3D None @@ -109,8 +109,8 @@ class QEMUMachine(object): # This can be used to add an unused monitor instance. def add_monitor_telnet(self, ip, port): args =3D 'tcp:%s:%d,server,nowait,telnet' % (ip, port) - self.args.append('-monitor') - self.args.append(args) + self._args.append('-monitor') + self._args.append(args) =20 def add_fd(self, fd, fdset, opaque, opts=3D''): '''Pass a file descriptor to the VM''' @@ -120,8 +120,8 @@ class QEMUMachine(object): if opts: options.append(opts) =20 - self.args.append('-add-fd') - self.args.append(','.join(options)) + self._args.append('-add-fd') + self._args.append(','.join(options)) return self =20 def send_fd_scm(self, fd_file_path): @@ -184,7 +184,7 @@ class QEMUMachine(object): '-display', 'none', '-vga', 'none'] =20 def _create_console(self, console_address): - for item in self.args: + for item in self._args: for option in ['isa-serial', 'spapr-vty', 'sclpconsole']: if option in item: return [] @@ -274,7 +274,7 @@ class QEMUMachine(object): bargs =3D self._base_args() bargs.extend(self._create_console(console_address)) self._qemu_full_args =3D (self._wrapper + [self._binary] + - bargs + self.args) + bargs + self._args) self._popen =3D subprocess.Popen(self._qemu_full_args, stdin=3Ddevnull, stdout=3Dself._qemu_log_file, diff --git a/tests/avocado/avocado_qemu/test.py b/tests/avocado/avocado_qem= u/test.py index 5a08dace45..1ead917014 100644 --- a/tests/avocado/avocado_qemu/test.py +++ b/tests/avocado/avocado_qemu/test.py @@ -297,8 +297,8 @@ class _VM(qemu.QEMUMachine): port =3D self.ports.find_free_port() newvm =3D _VM(self.qemu_dst_bin, self._arch, username=3Dself.usern= ame, password=3Dself.password) - newvm.args =3D self.args - newvm.args.extend(['-incoming', 'tcp:0:%s' % port]) + newvm._args =3D self._args + newvm._args.extend(['-incoming', 'tcp:0:%s' % port]) newvm.username =3D self.username newvm.password =3D self.password =20 @@ -329,7 +329,7 @@ class _VM(qemu.QEMUMachine): :param extra: Extra parameters to the -drive option """ file_option =3D 'file=3D%s' % path - for item in self.args: + for item in self._args: if file_option in item: logging.error('Image %s already present', path) return @@ -340,7 +340,7 @@ class _VM(qemu.QEMUMachine): if snapshot: file_option +=3D ',snapshot=3Don' =20 - self.args.extend(['-drive', file_option]) + self._args.extend(['-drive', file_option]) =20 if username is not None: self.username =3D username @@ -387,7 +387,7 @@ class _VM(qemu.QEMUMachine): process.run("%s -output %s -volid cidata -joliet -rock %s %s" % (geniso_bin, iso_path, metadata_path, userdata_path)) =20 - self.args.extend(['-cdrom', iso_path]) + self._args.extend(['-cdrom', iso_path]) =20 class QemuTest(Test): =20 @@ -415,4 +415,4 @@ class QemuTest(Test): if machine_kvm_type is not None: machine +=3D "kvm-type=3D%s," % machine_kvm_type if machine: - self.vm.args.extend(['-machine', machine]) + self.vm._args.extend(['-machine', machine]) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index a2e4f03743..b25d48a91b 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -293,18 +293,18 @@ class VM(qtest.QEMUQtestMachine): self._num_drives =3D 0 =20 def add_object(self, opts): - self.args.append('-object') - self.args.append(opts) + self._args.append('-object') + self._args.append(opts) return self =20 def add_device(self, opts): - self.args.append('-device') - self.args.append(opts) + self._args.append('-device') + self._args.append(opts) return self =20 def add_drive_raw(self, opts): - self.args.append('-drive') - self.args.append(opts) + self._args.append('-drive') + self._args.append(opts) return self =20 def add_drive(self, path, opts=3D'', interface=3D'virtio', format=3Dim= gfmt): @@ -322,27 +322,27 @@ class VM(qtest.QEMUQtestMachine): =20 if format =3D=3D 'luks' and 'key-secret' not in opts: # default luks support - if luks_default_secret_object not in self.args: + if luks_default_secret_object not in self._args: self.add_object(luks_default_secret_object) =20 options.append(luks_default_key_secret_opt) =20 - self.args.append('-drive') - self.args.append(','.join(options)) + self._args.append('-drive') + self._args.append(','.join(options)) self._num_drives +=3D 1 return self =20 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 =20 def add_incoming(self, addr): - self.args.append('-incoming') - self.args.append(addr) + self._args.append('-incoming') + self._args.append(addr) return self =20 def pause_drive(self, drive, event=3DNone): --=20 2.17.0