Alyssa Ross writes: > Cloud Hypervisor now contains the generic vhost-user device, and all > necessary vhost patches are now upstream, so we can simplify the GPU > patch quite a bit. > > Signed-off-by: Alyssa Ross > --- > .../software/cloud-hypervisor/index.html | 19 +- > host/efi.nix | 2 +- > host/initramfs/shell.nix | 2 +- > host/rootfs/shell.nix | 2 +- > img/app/Makefile | 2 +- > img/app/default.nix | 2 +- > lib/nixpkgs.default.nix | 4 +- > .../0001-build-use-local-vhost.patch | 55 - > ...0002-virtio-devices-add-a-GPU-device.patch | 1632 ----------------- > pkgs/cloud-hypervisor/default.nix | 34 +- > pkgs/cloud-hypervisor/gpu.patch | 719 ++++++++ > ...vhost_user-add-get_size-to-MsgHeader.patch | 82 - > ...2-vhost-fix-receiving-reply-payloads.patch | 165 -- > ...ser-add-shared-memory-region-support.patch | 484 ----- > ...ost_user-add-protocol-flag-for-shmem.patch | 43 - > pkgs/gtk3/default.nix | 13 - > pkgs/overlay.nix | 4 - > pkgs/skaware-packages/default.nix | 24 - > release/checks/no-roothash.nix | 4 +- > release/checks/wayland/default.nix | 2 +- > .../checks/wayland/surface-notify/meson.build | 2 +- > release/live/default.nix | 2 +- > scripts/dist-cloud-hypervisor.sh | 1 - > tools/start-vmm/ch.rs | 6 +- > tools/start-vmm/lib.rs | 8 +- > tools/start-vmm/tests/vm_command-basic.rs | 4 +- > vm/sys/net/default.nix | 2 +- > 27 files changed, 750 insertions(+), 2569 deletions(-) > delete mode 100644 pkgs/cloud-hypervisor/0001-build-use-local-vhost.patch > delete mode 100644 pkgs/cloud-hypervisor/0002-virtio-devices-add-a-GPU-device.patch > create mode 100644 pkgs/cloud-hypervisor/gpu.patch > delete mode 100644 pkgs/cloud-hypervisor/vhost/0001-vhost_user-add-get_size-to-MsgHeader.patch > delete mode 100644 pkgs/cloud-hypervisor/vhost/0002-vhost-fix-receiving-reply-payloads.patch > delete mode 100644 pkgs/cloud-hypervisor/vhost/0003-vhost_user-add-shared-memory-region-support.patch > delete mode 100644 pkgs/cloud-hypervisor/vhost/0004-vhost_user-add-protocol-flag-for-shmem.patch > delete mode 100644 pkgs/gtk3/default.nix > delete mode 100644 pkgs/skaware-packages/default.nix nixos-unstable just advanced, but I've observed that cosmic-files no longer starts on x86_64, so I'm going to hold off on this for now until we know what's going on there. (I think this is actually my fault, and was introduced by a fix I made to Meson for a different issue[1]. Real fix probably involves shifting this into rustc, and maybe making Meson behave more like it in the meantime as a mitigation.) [1]: https://github.com/mesonbuild/meson/commit/a01cedecc4fed77f468ee15d272f06c918f119e5