jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
tests/vm: fix basevm config
When the patch was merged it was part of a longer series which had
already merged the config changes. Semu-revert the config related
changes for now so things will build.
Fixes: b081986c85fd2
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200323161514.23952-6-alex.bennee@linaro.org>
+8
-8
+8
-8
tests/vm/basevm.py
+8
-8
tests/vm/basevm.py
···
358
358
"local-hostname: {}-guest\n".format(name)])
359
359
mdata.close()
360
360
udata = open(os.path.join(cidir, "user-data"), "w")
361
-
print("guest user:pw {}:{}".format(self._config['guest_user'],
362
-
self._config['guest_pass']))
361
+
print("guest user:pw {}:{}".format(self.GUEST_USER,
362
+
self.GUEST_PASS))
363
363
udata.writelines(["#cloud-config\n",
364
364
"chpasswd:\n",
365
365
" list: |\n",
366
-
" root:%s\n" % self._config['root_pass'],
367
-
" %s:%s\n" % (self._config['guest_user'],
368
-
self._config['guest_pass']),
366
+
" root:%s\n" % self.ROOT_PASS,
367
+
" %s:%s\n" % (self.GUEST_USER,
368
+
self.GUEST_PASS),
369
369
" expire: False\n",
370
370
"users:\n",
371
-
" - name: %s\n" % self._config['guest_user'],
371
+
" - name: %s\n" % self.GUEST_USER,
372
372
" sudo: ALL=(ALL) NOPASSWD:ALL\n",
373
373
" ssh-authorized-keys:\n",
374
-
" - %s\n" % self._config['ssh_pub_key'],
374
+
" - %s\n" % SSH_PUB_KEY,
375
375
" - name: root\n",
376
376
" ssh-authorized-keys:\n",
377
-
" - %s\n" % self._config['ssh_pub_key'],
377
+
" - %s\n" % SSH_PUB_KEY,
378
378
"locale: en_US.UTF-8\n"])
379
379
proxy = os.environ.get("http_proxy")
380
380
if not proxy is None: