Commit Graph

261 Commits

Author SHA1 Message Date
Alyssa Ross
c738e61a94 qemu: put virtiofsd in bin/
According to the QEMU documentation, virtiofsd is supposed to be run
directly by users.  It therefore makes sense to have it in bin/, so it
will be in PATH.  Such a change wouldn't make sense upstream, because
it would then conflict with the virtiofsd package, which is generally
preferred if available.  But in Nixpkgs, we don't have to worry about
that and can just make QEMU's virtiofsd a lower priority than the one
from the dedicated package.

[1]: https://qemu.readthedocs.io/en/latest/tools/virtiofsd.html

Fixes: https://github.com/NixOS/nixpkgs/issues/113172 ("QEmu: virtiofsd prone to be garbage collected.")
Fixes: https://github.com/NixOS/nixpkgs/pull/153007 ("nixos/libvirtd: add ${cfg.qemu.package}/libexec to PATH")
2022-03-04 12:42:08 +00:00
Matthias Treydte
38cf6fea69 qemu: fix qemu.ga including qemu in it's closure
The qemu-ga binary is already moved to a separate
output but still depends on qemu, adding about
600MiB to it's closure.

The command "strings qemu-ga" reveals that something
like

/nix/store/bqgpvv5qrpb741swczqk3lrdm5gzaqx2-qemu-host-cpu-only-6.2.0/bin

is contained, causing this false positive. So use
remove-references-to to reduce the closure to about
600KiB.
2022-03-03 21:37:25 +00:00
Robert Scott
b0cb215474
Merge pull request #144946 from risicle/ris-qemu-tests
qemu: enable some basic tests
2022-02-19 15:25:18 +00:00
Robert Scott
5adc3817a0 qemu: fixup basic tests, enable in passthru.tests
these may not be reliable enough to enable by default, but enabling
them as a passthru may allow us to get a feel for which platforms
have trouble with them
2022-02-06 18:31:29 +00:00
Jonathan Ringer
9a16965c75
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/awesomeversion/default.nix
	pkgs/development/python-modules/md2gemini/default.nix
	pkgs/development/python-modules/mill-local/default.nix
	pkgs/development/python-modules/pyatv/default.nix
	pkgs/development/python-modules/pyezviz/default.nix
	pkgs/development/python-modules/pyinsteon/default.nix
	pkgs/development/python-modules/pylitterbot/default.nix
	pkgs/development/python-modules/pynuki/default.nix
	pkgs/development/python-modules/pypck/default.nix
	pkgs/development/python-modules/types-requests/default.nix
	pkgs/top-level/aliases.nix
2022-02-03 21:29:24 -08:00
Peter Hoeg
c52e85672b qemu: remove broker wrapper script 2022-02-03 11:33:38 +08:00
Alyssa Ross
6c92b6516a qemu: 6.1.0 -> 6.2.0
QEMU now supports automatically detecting which audio drivers to
build, so we don't need to pass --audio-drv-list anymore.

pkgsMusl.qemu* doesn't build at the moment because of dependency
issues, but with a lot of hacks I was able to do enough of a build to
be confident the changes to patches etc. are correct for Musl.
2022-01-20 15:29:33 +00:00
0x4A6F
29acc14f0d
Merge pull request #143060 from zhaofengli/binfmt-argv0
nixos/binfmt: Add QEMU wrapper to preserve argv[0]
2022-01-06 19:21:47 +01:00
PedroRegisPOAR
80b3160c21 qemu: add meta.mainProgram 2022-01-04 12:31:11 -03:00
Sandro
a25dd4744e
Merge pull request #151233 from Madouura/dev/qemu 2022-01-02 11:27:50 +01:00
Nick Cao
f90a24f944
qemu: fix cross compilation 2021-12-27 18:02:12 +08:00
Vladimír Čunát
c3131d5c32
qemu: disable debug info on aarch64-linux
This is basically a partial revert of a0262a0802.
2021-12-26 12:45:05 +01:00
Madoura
a1b28586d9
qemu: add support for JACK audio 2021-12-18 14:42:57 -06:00
Alyssa Ross
16fb150e03
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/libraries/libunwind/default.nix
2021-12-07 23:56:16 +00:00
Zhaofeng Li
feb86343bd qemu: Add patch for socket_sockaddr_to_address_unix assertion errors
See also:
- http://bugs.debian.org/993145
- https://bugs.archlinux.org/task/72115
2021-12-07 23:46:26 +00:00
Alyssa Ross
f404068903
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/servers/search/groonga/default.nix
2021-12-02 14:52:44 +00:00
Jörg Thalheim
56ea0c9308 qemu: fix darwin build 2021-12-02 09:55:00 +01:00
Zhaofeng Li
3011531cf9 qemu: Add binfmt preserve-argv[0] wrapper 2021-12-01 22:20:48 -08:00
Alyssa Ross
01bce76b11
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/applications/virtualization/qemu/default.nix
2021-11-30 18:54:47 +00:00
Martin Schwaighofer
08bbd123d5 qemu: emit warnings when KVM acceleration is not usable
This fixes the qemu-kvm wrapper we add for convenience
silently not using KVM, when the system would support it
by at least leaving an indication in the log that the build ran
slower because it ran without KVM.
2021-11-30 13:06:22 +00:00
Martin Schwaighofer
5d06f6933d qemu, runInLinuxVM: fix KVM availability check
KVM should only be considered abailable if /dev/kvm exists and
is read-writable by the user that is trying to launch it.

The previous check for existance only had the consequence that
on some Linux distributions running VMs with Nix's QEMU only worked
if KVM was NOT installed.

fixes #124371
2021-11-30 13:06:22 +00:00
Maximilian Bosch
8f3eb58a96
Merge pull request #146961 from alyssais/qemu-debug
qemu: enable debug info
2021-11-29 16:18:46 +01:00
Alyssa Ross
4b5c3d9376 qemu: only include alsa-lib for alsa support 2021-11-25 19:48:48 +00:00
Alyssa Ross
5d9e0f86b9 qemu: never use bundled Meson
It's better to fail to build if our version of Meson isn't compatible
with QEMU's, so we'll know something is wrong.  Otherwise, we'll get
subtle breakages that only manifest at runtime, which I think might be
what happened in 9e403b19a1 ("qemu: 5.1.0 -> 5.2.0") to necessitate
autoPatchelfHook.
2021-11-25 19:47:56 +00:00
github-actions[bot]
cbcbfb4901
Merge master into staging-next 2021-11-22 06:01:10 +00:00
László Vaskó
7ea3e0f3f2 qemu: fix managedsave (snapshot creation) with QXL video device
Backport patch from 6.2.0-rc0
2021-11-22 02:16:40 +00:00
Alyssa Ross
a0262a0802
qemu: enable debug info
I dropped autoPatchelfHook because it got confused with the debug
objects, and I can't reproduce the pixman linker errors that caused it
to be introduced in #106988 ("qemu: 5.1.0 -> 5.2.0").
2021-11-21 21:44:29 +00:00
github-actions[bot]
cfaff97318
Merge staging-next into staging 2021-11-15 18:01:43 +00:00
Artturi
11952924f1
Merge pull request #146036 from jmgao/qemu_io_uring 2021-11-15 17:33:17 +02:00
Josh Gao
3f772a5f2b qemu: add support for io_uring 2021-11-14 17:31:50 -08:00
github-actions[bot]
a4e03b8977
Merge staging-next into staging 2021-11-11 18:01:50 +00:00
Sandro
95cce00929
Merge pull request #141717 from r-burns/qemu 2021-11-11 18:13:59 +01:00
Kerstin Humm
bb799694db
epoxy: rename to libepoxy
https://github.com/NixOS/nixpkgs/issues/145040
2021-11-11 05:55:32 +01:00
Emil Karlson
d222938650 qemu: add upstream patches for qemu-6.1.0 regressions
first patch fixes crash in 9p code that occasionally happens also in nixos tests
second patch fixes io errors from discards in aio io engine with virtio-scsi
2021-11-04 08:17:50 +02:00
Ryan Burns
18451cb59a qemu: fix CVE-2021-3713
Backport patch from 6.2.0-rc0
2021-10-27 21:51:17 -07:00
Ryan Burns
92ed47487f qemu: drop obsolete musl patch
not needed as of
b1d2e476e9,
in qemu v6.0+
2021-10-14 23:19:20 -07:00
Ivan Babrou
decdbc3569
qemu: enable hvf acceleration on aarch64-darwin (#139960) 2021-10-01 01:42:17 -04:00
Artturin
b7fa38dcf6 qemu: add makeWrapper back to nativeBuildInputs 2021-09-29 15:53:21 +03:00
Alexandre Iooss
988da51d9c qemu: 6.0.0 -> 6.1.0 2021-09-29 09:56:09 +00:00
Vladimír Čunát
8ab6ba6b1c
Merge branch 'staging-next' into staging 2021-08-06 09:14:57 +02:00
Sandro Jäckel
22b442710a
qemu: format 2021-08-04 20:54:48 +02:00
arcnmx
14b3a15778 qemu: move makeWrapper to nativeBuildInputs 2021-08-04 10:08:53 -07:00
github-actions[bot]
dc802b2e19
Merge master into staging-next 2021-07-19 00:01:36 +00:00
Robert Scott
cddea297f2 qemu: add patches for CVE-2021-3545 & CVE-2021-3546 2021-07-18 14:49:50 +01:00
Maximilian Bosch
04be5ced7e
qemu: fix build w/glibc-2.33 2021-07-06 16:02:35 +02:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Stéphan Kochen
44a41a2e11 qemu: fix darwin build
Co-authored-by: Michael Roitzsch <reactorcontrol@icloud.com>
2021-05-21 08:55:51 +02:00
Ryan Mulligan
ddcd4ddc2c qemu_full: add glusterfs support 2021-05-05 13:05:21 -07:00
Alyssa Ross
c49a518f9f qemu: 5.2.0 -> 6.0.0; adopt; broaden platforms
Tested building qemu_kvm, qemu_full, and qemu_test on x86_64-linux.
Also tested booting a VM generated with nixos-rebuild build-vm.

I wasn't able to test building pkgsMusl.qemu_kvm, because of many
build failures in dependencies.
2021-05-01 11:31:02 +00:00
Martin Weinelt
08adc07811
Merge pull request #120616 from risicle/ris-qemu-fix-CVE-numbers
qemu: patches: use correct CVE numbers for CVE-2021-20221 & CVE-2021-20181
2021-04-27 00:36:44 +02:00