diff options
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 | ||||
-rwxr-xr-x | scripts/runqemu | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index df76ee668e..da59c338e4 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -16,7 +16,7 @@ QB_MACHINE = "-machine virt" | |||
16 | QB_CPU = "-cpu cortex-a57" | 16 | QB_CPU = "-cpu cortex-a57" |
17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" | 17 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,38400" |
18 | QB_OPT_APPEND = "-show-cursor" | 18 | QB_OPT_APPEND = "-show-cursor" |
19 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0" | 19 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-device,netdev=net0,mac=@MAC@" |
20 | QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" | 20 | QB_SLIRP_OPT = "-netdev user,id=net0 -device virtio-net-device,netdev=net0" |
21 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" | 21 | QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0" |
22 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 22 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index 939c834a33..e4c8dace7d 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -17,4 +17,4 @@ QB_MACHINE = "-machine mac99" | |||
17 | QB_CPU = "-cpu G4" | 17 | QB_CPU = "-cpu G4" |
18 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 18 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
19 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet" | 19 | QB_OPT_APPEND = "-show-cursor -usb -usbdevice tablet" |
20 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0" | 20 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -device virtio-net-pci,netdev=net0,mac=@MAC@" |
diff --git a/scripts/runqemu b/scripts/runqemu index 91e72cbc50..c43db8c227 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -736,11 +736,12 @@ class BaseConfig(object): | |||
736 | if self.fstype == 'nfs': | 736 | if self.fstype == 'nfs': |
737 | self.setup_nfs() | 737 | self.setup_nfs() |
738 | self.kernel_cmdline_script += " ip=192.168.7.%s::192.168.7.%s:255.255.255.0" % (n2, n1) | 738 | self.kernel_cmdline_script += " ip=192.168.7.%s::192.168.7.%s:255.255.255.0" % (n2, n1) |
739 | mac = "52:54:00:12:34:%02x" % n2 | ||
739 | qb_tap_opt = self.get('QB_TAP_OPT') | 740 | qb_tap_opt = self.get('QB_TAP_OPT') |
740 | if qb_tap_opt: | 741 | if qb_tap_opt: |
741 | qemu_tap_opt = qb_tap_opt.replace('@TAP@', tap) | 742 | qemu_tap_opt = qb_tap_opt.replace('@TAP@', tap).replace('@MAC@', mac) |
742 | else: | 743 | else: |
743 | qemu_tap_opt = "-net nic,model=virtio -net tap,vlan=0,ifname=%s,script=no,downscript=no" % self.tap | 744 | qemu_tap_opt = "-net nic,model=virtio,mac=%s -net tap,vlan=0,ifname=%s,script=no,downscript=no" % (mac, self.tap) |
744 | 745 | ||
745 | if self.vhost_enabled: | 746 | if self.vhost_enabled: |
746 | qemu_tap_opt += ',vhost=on' | 747 | qemu_tap_opt += ',vhost=on' |