public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-vm: removes warning when running build-vm 

get rid of deprecated qemu commands
This commit is contained in:
Matthieu Coudron 2018-03-12 17:27:43 +09:00
parent cc4677c36e
commit b7a2333ebe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -319,8 +319,8 @@ in
networkingOptions = networkingOptions =
mkOption { mkOption {
default = [ default = [
"-net nic,vlan=0,model=virtio" "-net nic,netdev=user.0,model=virtio"
"-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
]; ];
type = types.listOf types.str; type = types.listOf types.str;
description = '' description = ''
@ -436,7 +436,7 @@ in
# FIXME: Figure out how to make this work on non-x86 # FIXME: Figure out how to make this work on non-x86
virtualisation.qemu.options = virtualisation.qemu.options =
mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ]; mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ];
# Mount the host filesystem via 9P, and bind-mount the Nix store # Mount the host filesystem via 9P, and bind-mount the Nix store
# of the host into our own filesystem. We use mkVMOverride to # of the host into our own filesystem. We use mkVMOverride to