From 1c8940a2b817ed3cb559e7d0fb96e25783b3dbfe Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 2 Nov 2016 16:06:48 +0000 Subject: [PATCH] qemu: add xen support --- pkgs/applications/virtualization/qemu/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a8f11de96bcf..8d462395ce07 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,6 +11,7 @@ , vncSupport ? true, libjpeg, libpng , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol , usbredirSupport ? spiceSupport, usbredir +, xenSupport ? false, xen , x86Only ? false , nixosTestRunner ? false }: @@ -25,6 +26,7 @@ in stdenv.mkDerivation rec { name = "qemu-" + + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString x86Only "x86-only-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + version; @@ -47,7 +49,8 @@ stdenv.mkDerivation rec { ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice_protocol spice ] ++ optionals usbredirSupport [ usbredir ] - ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; + ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ] + ++ optionals xenSupport [ xen ]; enableParallelBuilding = true; @@ -100,7 +103,8 @@ stdenv.mkDerivation rec { ++ optional usbredirSupport "--enable-usb-redir" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" ++ optional stdenv.isDarwin "--enable-cocoa" - ++ optional stdenv.isLinux "--enable-linux-aio"; + ++ optional stdenv.isLinux "--enable-linux-aio" + ++ optional xenSupport "--enable-xen"; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3a660dc7108..87c575d55551 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11892,6 +11892,8 @@ with pkgs; watch = callPackage ../os-specific/linux/procps/watch.nix { }; qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; }); + qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };