summaryrefslogtreecommitdiffstats
path: root/nixos/modules/virtualisation/qemu-vm.nix
diff options
context:
space:
mode:
authorMatthieu Coudron <mattator@gmail.com>2018-03-12 17:27:43 +0900
committerMatthieu Coudron <mattator@gmail.com>2018-03-12 17:29:55 +0900
commitb7a2333ebe7a0916c9791f3b7a839e8095c39f7f (patch)
treed258eaf58770964bade12999c69257052c4ac5e4 /nixos/modules/virtualisation/qemu-vm.nix
parentcc4677c36ee8d880e881459ad114fd2224b3ac1c (diff)
qemu-vm: removes warning when running build-vm
get rid of deprecated qemu commands
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 13d0eb7de5c2..3270f1507f9a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -319,8 +319,8 @@ in
networkingOptions =
mkOption {
default = [
- "-net nic,vlan=0,model=virtio"
- "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
+ "-net nic,netdev=user.0,model=virtio"
+ "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}"
];
type = types.listOf types.str;
description = ''
@@ -436,7 +436,7 @@ in
# FIXME: Figure out how to make this work on non-x86
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
# of the host into our own filesystem. We use mkVMOverride to