Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

qemu: improve networking (#482)

Browse source 
* qemu: network improvements (fixes #433)
- Use hostfwd instead of -redir, which is deprecated
- qemu devices: add interfaces configuration and virtio_net module
- redirect telnet ports 23 and 24 (debug)

* Added 'interfaces' files
* qemu: added aarch64 network device
* qemu: use default_ip
This commit is contained in:
Pablo Castellano 2017-09-03 16:01:21 +02:00 • committed by Oliver Smith
parent 471006b798
commit 188382e04c
8 changed files with 54 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pmb/qemu/run.py
View file

@ -25,6 +25,7 @@ import pmb.chroot
import pmb.chroot.apk
import pmb.chroot.other
import pmb.chroot.initfs
import pmb.config
import pmb.helpers.devices
import pmb.helpers.run
import pmb.parse.arch
@ -72,13 +73,23 @@ def qemu_command(args, arch, device, img_path):
cmdline = args.cmdline
logging.info("cmdline: " + cmdline)
ssh_port = str(args.port)
telnet_port = str(args.port + 1)
telnet_debug_port = str(args.port + 2)
rootfs = args.work + "/chroot_rootfs_" + device
command = [qemu_bin]
command += ["-kernel", rootfs + "/boot/vmlinuz-postmarketos"]
command += ["-initrd", rootfs + "/boot/initramfs-postmarketos"]
command += ["-append", '"' + cmdline + '"']
command += ["-m", str(args.memory)]
command += ["-redir", "tcp:" + str(args.port) + "::22"]
command += ["-netdev",
"user,id=net0,"
"hostfwd=tcp::" + ssh_port + "-:22,"
"hostfwd=tcp::" + telnet_port + "-:23,"
"hostfwd=tcp::" + telnet_debug_port + "-:24"
",net=172.16.42.0/24,dhcpstart=" + pmb.config.default_ip
]
if deviceinfo["dtb"] != "":
dtb_image = rootfs + "/usr/share/dtb/" + deviceinfo["dtb"] + ".dtb"
@ -89,15 +100,18 @@ def qemu_command(args, arch, device, img_path):
if arch == "x86_64":
command += ["-serial", "stdio"]
command += ["-drive", "file=" + img_path + ",format=raw"]
command += ["-device", "e1000,netdev=net0"]
elif arch == "arm":
command += ["-M", "vexpress-a9"]
command += ["-sd", img_path]
command += ["-device", "virtio-net-device,netdev=net0"]
elif arch == "aarch64":
command += ["-M", "virt"]
command += ["-cpu", "cortex-a57"]
command += ["-device", "virtio-gpu-pci"]
command += ["-device", "virtio-net-device,netdev=net0"]
# add storage
command += ["-device", "virtio-blk-device,drive=system"]
@ -140,6 +154,10 @@ def run(args):
command = qemu_command(args, arch, device, img_path)
logging.info("Command: " + " ".join(command))
logging.info("You can login to postmarketOS using SSH:")
logging.info("ssh -p " + str(args.port) + " user@localhost")
print()
logging.info("You can connect to the Virtual Machine using the"
" following services:")
logging.info("(ssh) ssh -p " + str(args.port) + " user@localhost")
logging.info("(telnet) telnet localhost " + str(args.port + 1))
logging.info("(telnet debug) telnet localhost " + str(args.port + 2))
pmb.helpers.run.user(args, command)