diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2008-02-24 20:20:17 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2008-02-24 20:20:17 +0000 |
| commit | 1d6df5b8d2f570fdcb837adf5bda01327ce391d0 (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /app-emulation/kvm | |
| parent | Spring cleaning. (diff) | |
| download | philantrop-master.tar.gz philantrop-master.tar.bz2 philantrop-master.zip | |
svn path=/trunk/; revision=62
Diffstat (limited to 'app-emulation/kvm')
24 files changed, 0 insertions, 1496 deletions
diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog deleted file mode 100644 index b668408..0000000 --- a/app-emulation/kvm/ChangeLog +++ /dev/null @@ -1,71 +0,0 @@ -# ChangeLog for app-emulation/kvm -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 25 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> - +files/kvm-50-libkvm-no-kernel.patch, - +files/kvm-50-qemu-bios-no-sparc.patch, +files/kvm-51-qemu-ramaddr.patch, - +files/kvm-53-qemu-checkext-inc.patch, +files/kvm-53-qemu-exec-fmt.patch, - +files/kvm-53-qemu-ramalloc-fmt.patch, +kvm-53.ebuild: - Version bump to kvm-53. - - 01 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-49.ebuild: - Version bump to kvm-49. - - 21 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> - +files/kvm-43-qemu-ifup.patch, +files/kvm-43-qemu-kvm-cmdline.patch, - +files/kvm-45-qemu-configure.patch, +files/kvm-45-qemu-gcc4.patch, - +files/kvm-45-qemu-kvm.patch, +files/kvm-45-qemu-kvm-doc.patch, - +files/kvm-45-qemu-no-img.patch, +files/kvm-45-user-no-kernel.patch, - +files/kvm-47-configure-qemu.patch, +files/kvm-47-qemu-gcc3.patch, - +files/kvm-48-kvm.patch, -files/kvm-kvm.patch, - -files/qemu-configure.patch, -files/qemu-vl.c.patch, - -files/scripts-qemu-ifup.patch, -kvm-43.ebuild, -kvm-44.ebuild, - -kvm-45.ebuild, +kvm-48.ebuild: - Version bump to kvm-48, removed obsolete versions and pulled in changes from - bug 157987. Thanks to Carlo Marcelo Arenas Belon for his good work! - - 03 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> - +files/kvm-45-qemu_configure.patch, kvm-45.ebuild: - Fixed broken patch. - - 02 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> -kvm-37.ebuild, - -kvm-39.ebuild, -kvm-40.ebuild, +kvm-45.ebuild: - Version bump to kvm-45. Removed obsolete versions. - - 23 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-44.ebuild: - Version bump to kvm-44. - - 21 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> -kvm-42.ebuild, - +kvm-43.ebuild: - Version bump to kvm-43. Removed obsolete and buggy version 42. - - 21 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-42.ebuild: - Version bump to kvm-42. - - 16 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-40.ebuild: - Version bump to kvm-40. - - 12 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> - -files/kvm_add-scripts-qemu-ifup.patch, - -files/kvm_use_bios_files_in_usr_share_kvm.patch, - -files/kvm_use_etc_kvm_kvm-ifup.patch, -kvm-33.ebuild, -kvm-35.ebuild, - -kvm-36-r1.ebuild, +kvm-39.ebuild: - Version bump to kvm-39. Removed obsolete versions. - - 10 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-37.ebuild: - Version bump to kvm-37. - - 22 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> +files/kvm-kvm.patch, - +files/qemu-configure.patch, +files/qemu-vl.c.patch, - +files/scripts-qemu-ifup.patch, +metadata.xml, kvm-33.ebuild, - kvm-35.ebuild, +kvm-36-r1.ebuild: - Version bump to kvm-36. Pulled in some changes from bug 157987. Some cleaning. - - 13 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> -kvm-27.ebuild, - -kvm-28.ebuild, -kvm-29.ebuild, -kvm-31.ebuild, +kvm-34.ebuild: - Version bump to 34. - - 23 Jul 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-33.ebuild: - Added kvm-33. - diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest deleted file mode 100644 index fc9ec3f..0000000 --- a/app-emulation/kvm/Manifest +++ /dev/null @@ -1,26 +0,0 @@ -AUX kvm-43-qemu-ifup.patch 661 RMD160 ba81120c30ca29186ee7d3537e72ea2b73f525dc SHA1 4717a6de7ac3d72745377329c349b1fe7601561f SHA256 a827bf7684f70e01202ab7939fe0846f2aaf98eb426832878d9fc6559b9864a9 -AUX kvm-43-qemu-kvm-cmdline.patch 597 RMD160 e4fa97c58c0f543481b4c5a0f84720137b58ba11 SHA1 4484cde17db330a5bf3bb634219e2720c7354bbb SHA256 66e93b02629d07b4d04a3803b815eba00b21bfd824a8d4443e253e49ca62224b -AUX kvm-45-qemu-configure.patch 350 RMD160 c84a6659c97ba1518c2cc98e6383af463f3de9a6 SHA1 11002bbca68fbd1f32f1020a5ddb28751003bcc2 SHA256 154c30bdc8e1682540f2f1264bc2fbffd52a77869684b0721cadb304ce06ea85 -AUX kvm-45-qemu-gcc4.patch 827 RMD160 29dd7af16446b965adadd840cb13b28c6d4fe72d SHA1 49e34391442dff5c2eb2892c9c4d3c17433cd90a SHA256 a7754ee355a8bc736a752131a166203505c2288d46a935039aaefec56f3ce931 -AUX kvm-45-qemu-kvm-doc.patch 9462 RMD160 774cc95d20292285c44eac7e0c253e8f1e1f7ae5 SHA1 09b1fd021e740f9a4ed3d5fc685582197e3dcb87 SHA256 4adf3f62141653f3406675feee712dac755722fe81e3ab741a789dff59c93cfd -AUX kvm-45-qemu-kvm.patch 414 RMD160 28bc35622dd840854f3a27701c748ea353c0e155 SHA1 e4612841db539a205ac2b5cbf045fbb71a64e909 SHA256 235e9b2be81af231da13f9c25392dd56d0c6a3345c66fc548a16158436240a41 -AUX kvm-45-qemu-no-img.patch 2648 RMD160 3e96db849c12a480d638498aa72bb85f370d0ae1 SHA1 0f9e07dbce34eee555b706395554135c09480f46 SHA256 704bb187ffc1c7712a08e8c764507aaa9341cd91b5dced23ee2829ce14c7636d -AUX kvm-45-qemu_configure.patch 378 RMD160 830e63dd2f9341985c8207d45b864758d800b3e4 SHA1 1a05d17ed502ee447f69b98bd6e38dca8e50203f SHA256 0e9310bfd7da5af8693aeed59f34c4811bac90dbfc9f1b53adc07093d4b100d0 -AUX kvm-45-user-no-kernel.patch 496 RMD160 6e657c015eefbfe2bf16ab64ecd6f65e065780b5 SHA1 3e6f62a4dd4dfb2ce8d993624ebe8ff22481bdc4 SHA256 3f8f70720a8b7ae618939c45b211014da574117a2548a1915ce330bd6cbc5208 -AUX kvm-47-configure-qemu.patch 1841 RMD160 15d1d9f81b8ab6ea363503e8388ab369078a2461 SHA1 b8e83696bb22cada38af02cd23b8573a6707aef5 SHA256 7bab629b254b0ac8b58c71d695a85f49d9da914c6714d060b72feb75a26a0ffa -AUX kvm-47-qemu-gcc3.patch 367 RMD160 02b0f4f66444f762727b092cb0fae0f6bd59cd65 SHA1 19fe0757bc7fc2c0ed937857e85904c8f6d818be SHA256 1ad70ec3a6e69f19694e7cdd3ada6b405b660da5253eebdc22031e17e4380ab1 -AUX kvm-48-kvm.patch 4199 RMD160 c1adae4599a554efefe0349690e06c0e8e874168 SHA1 ff9d73c10b477470a0955460ca985252cbf31d5d SHA256 0b2cfaca612318cad2d4b151d6d93ef24db72fd1e4af4d7311986824a27e85fa -AUX kvm-50-libkvm-no-kernel.patch 490 RMD160 c22405bafff3cb5ccffa4bd41c63adc3732b348e SHA1 99af338e6bd53bbe042a8ff448cda331ef069804 SHA256 c71cd76925bb1f59f24298400a330034e942b911d54525289f6425cdf088cef4 -AUX kvm-50-qemu-bios-no-sparc.patch 726 RMD160 b1b17ec7bceba4f44cb9e4d0a3c48d622cb38e9e SHA1 d1b320848db827451d285ebf5b246782f2706ba0 SHA256 6e15debd3ca2f3d1fa4499800575bb3b7fab0d40fb380a056d3aef163b680cc1 -AUX kvm-51-qemu-ramaddr.patch 3332 RMD160 a9aa512fdfcd72c8d97ea8f7525ad1b762b3b777 SHA1 16f58769994ef9472142d72bd6cb88ca5c2191ad SHA256 70d4d86aac00e38c00e534d5d15c42b6e9deedebaa10d3c50c78c809ac80f8cd -AUX kvm-53-qemu-checkext-inc.patch 428 RMD160 d59e6b19f92a0c83e9ef7fbb9a283da45ad7ee60 SHA1 4e2308299987f71340246405d073f00ecde9cce7 SHA256 1e081e7b4b278573f8863e22a5420329de3b86a62ae52b5c3778a61fb58ac75a -AUX kvm-53-qemu-exec-fmt.patch 2245 RMD160 de27024cef3aab59212d025f280adb4bbce13575 SHA1 44c0824f8f8e05090e2de404c8384105072201c3 SHA256 e03c5d8f7a6c85c4ed4694a567a4ce75a00ae620279d6791781fea725c7a27d2 -AUX kvm-53-qemu-ramalloc-fmt.patch 466 RMD160 8dc830e77015dce8fb8a5c29bd0e6287acf9ee6c SHA1 1b11d3a79eeb2e62cf2c072f449e35badb44edac SHA256 f7b35ef5a555943244ed5c8d0bfad55316d6b900ea7a14a0fe91a82c74b82b0c -DIST kvm-48.tar.gz 3271268 RMD160 cab2b7f99ebea323b903420abde223273ddd2536 SHA1 fbcf04ac87f27c05e7c476058ce5feb4c47e46d5 SHA256 04e410b82b2c6ab2ede4c483774ef11889f1b3ced8bb318c8134d9b2d77e0059 -DIST kvm-49.tar.gz 3280904 RMD160 de744a9c670714bbaf59ae6a0f6258c95756c33b SHA1 8bb0988eda2f8d9833c9c531b0ee1d347f573fbe SHA256 77a246fafd152b58b32cea35449d1d76517ed72872a04b1bcc902af33a6d8756 -DIST kvm-53.tar.gz 3305384 RMD160 cb09b74f7ef4ff15f52354f2931ae37611ba5b20 SHA1 e004d84a4721c772ceecda3b297e60ee03b7b243 SHA256 a506e3299a125731654d01ee627231e9be78737c2515574491e5fa92cc856680 -EBUILD kvm-48.ebuild 4684 RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 SHA1 d03d9192e92988e5c92ea702833ddb3000cb2ab6 SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67 -EBUILD kvm-49.ebuild 4684 RMD160 96a1302f263f243bf54cc84bbbcdf364637322b1 SHA1 d03d9192e92988e5c92ea702833ddb3000cb2ab6 SHA256 025224f03169458740fefed9680775ae95f9c537e6595ae75fc152d9879d6c67 -EBUILD kvm-53.ebuild 4945 RMD160 abaec90e1ed26ddf201451fca804de33c164a0ab SHA1 c0542f201096cd1250d2e952b8e7ade37fa92e3e SHA256 ad89f8f76ca01e4b4e4a0dbce03a1fc3991253647557b660efc6c36bf34f306e -MISC ChangeLog 3030 RMD160 f6d0244451db1347f64b3e6b4b13108df459e5a4 SHA1 e5bd360cadd6ae1c97759231e803bb040eff2e2c SHA256 3af88db9af925b60efcb7bb7a0a7a7a46332938e01e571d7d5262a1803588d48 -MISC metadata.xml 413 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f SHA1 c14660bd6d54594bef13c86f243308fc92687eb0 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988 diff --git a/app-emulation/kvm/files/kvm-43-qemu-ifup.patch b/app-emulation/kvm/files/kvm-43-qemu-ifup.patch deleted file mode 100644 index dba3840..0000000 --- a/app-emulation/kvm/files/kvm-43-qemu-ifup.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- kvm-43/scripts/qemu-ifup 2007-09-20 10:39:37.000000000 -0700 -+++ kvm-43/scripts/qemu-ifup 2007-09-22 02:27:28.000000000 -0700 -@@ -1,5 +1,18 @@ - #!/bin/sh - --switch=$(/sbin/ip route list | awk '/^default / { print $NF }') -+if [ -x /sbin/brctl ]; then -+ BRCTL="/sbin/brctl" -+elif [ -x /usr/sbin/brctl ]; then -+ BRCTL="/usr/sbin/brctl" -+else -+ echo "no bridge utils installed" -+ exit 1 -+fi -+ -+if [ -x /sbin/ip ]; then -+ switch=$(/sbin/ip route list | awk '/^default / { print $NF }') -+else -+ switch=$(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') -+fi - /sbin/ifconfig $1 0.0.0.0 up --/usr/sbin/brctl addif ${switch} $1 -+${BRCTL} addif ${switch} $1 diff --git a/app-emulation/kvm/files/kvm-43-qemu-kvm-cmdline.patch b/app-emulation/kvm/files/kvm-43-qemu-kvm-cmdline.patch deleted file mode 100644 index 942ec34..0000000 --- a/app-emulation/kvm/files/kvm-43-qemu-kvm-cmdline.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- kvm-43/qemu/vl.c 2007-09-20 10:39:37.000000000 -0700 -+++ kvm-43/qemu/vl.c 2007-09-22 02:09:17.000000000 -0700 -@@ -92,7 +92,7 @@ - #include "qemu-kvm.h" - #endif - --#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" -+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/qemu-ifup" - #ifdef __sun__ - #define SMBD_COMMAND "/usr/sfw/sbin/smbd" - #else -@@ -6500,7 +6500,7 @@ void help(void) - "\n" - "When using -nographic, press 'ctrl-a h' to get some help.\n" - , -- "qemu", -+ "kvm", - DEFAULT_RAM_SIZE, - #ifndef _WIN32 - DEFAULT_NETWORK_SCRIPT, diff --git a/app-emulation/kvm/files/kvm-45-qemu-configure.patch b/app-emulation/kvm/files/kvm-45-qemu-configure.patch deleted file mode 100644 index fc88d23..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kvm-45/qemu/configure.orig 2007-10-02 12:30:29.000000000 +0200 -+++ kvm-45/qemu/configure 2007-10-02 12:31:09.000000000 +0200 -@@ -666,8 +666,8 @@ - prefix="/usr/local" - fi - mansuffix="/share/man" -- datasuffix="/share/qemu" -- docsuffix="/share/doc/qemu" -+ datasuffix="/share/kvm" -+ docsuffix="/share/doc/kvm" - binsuffix="/bin" - fi - diff --git a/app-emulation/kvm/files/kvm-45-qemu-gcc4.patch b/app-emulation/kvm/files/kvm-45-qemu-gcc4.patch deleted file mode 100644 index 4fb3594..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-gcc4.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kvm-45/qemu/vl.c 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/qemu/vl.c 2007-10-07 23:32:19.000000000 -0700 -@@ -8421,8 +8421,13 @@ int main(int argc, char **argv) - #endif - #ifdef USE_KVM - case QEMU_OPTION_no_kvm: -+#if __GNUC__ >= 4 -+ fprintf(stderr, "Can't run without kvm if compiled with gcc4\n"); -+ exit(1); -+#else - kvm_allowed = 0; - break; -+#endif - case QEMU_OPTION_no_kvm_irqchip: - kvm_irqchip = 0; - break; -@@ -8552,8 +8557,13 @@ int main(int argc, char **argv) - #if USE_KVM - if (kvm_allowed) { - if (kvm_qemu_init() < 0) { -+#if __GNUC__ >= 4 -+ fprintf(stderr, "Could not initialize KVM, can't run without kvm if compiled with gcc4\n"); -+ exit(1); -+#else - fprintf(stderr, "Could not initialize KVM, will disable KVM support\n"); - kvm_allowed = 0; -+#endif - } - } - #endif diff --git a/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch b/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch deleted file mode 100644 index c34dea2..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-kvm-doc.patch +++ /dev/null @@ -1,269 +0,0 @@ ---- kvm-45/qemu/qemu-doc.texi 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/qemu/qemu-doc.texi 2007-10-06 22:12:49.000000000 -0700 -@@ -186,7 +186,7 @@ - Download and uncompress the linux image (@file{linux.img}) and type: - - @example --qemu linux.img -+kvm linux.img - @end example - - Linux should boot and give you a prompt. -@@ -196,7 +196,7 @@ - - @example - @c man begin SYNOPSIS --usage: qemu [options] [disk_image] -+usage: kvm [options] [disk_image] - @c man end - @end example - -@@ -255,10 +255,10 @@ - available sound hardware. - - @example --qemu -soundhw sb16,adlib hda --qemu -soundhw es1370 hda --qemu -soundhw all hda --qemu -soundhw ? -+kvm -soundhw sb16,adlib hda -+kvm -soundhw es1370 hda -+kvm -soundhw all hda -+kvm -soundhw ? - @end example - - @item -localtime -@@ -437,18 +437,18 @@ - @item -net tap[,vlan=n][,fd=h][,ifname=name][,script=file] - Connect the host TAP network interface @var{name} to VLAN @var{n} and - use the network script @var{file} to configure it. The default --network script is @file{/etc/qemu-ifup}. Use @option{script=no} to -+network script is @file{/etc/kvm/qemu-ifup}. Use @option{script=no} to - disable script execution. If @var{name} is not - provided, the OS automatically provides one. @option{fd=h} can be - used to specify the handle of an already opened host TAP interface. Example: - - @example --qemu linux.img -net nic -net tap -+kvm linux.img -net nic -net tap - @end example - - More complicated example (two NICs, each one connected to a TAP device) - @example --qemu linux.img -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \ -+kvm linux.img -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \ - -net nic,vlan=1 -net tap,vlan=1,ifname=tap1 - @end example - -@@ -465,11 +465,11 @@ - Example: - @example - # launch a first QEMU instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,listen=:1234 - # connect the VLAN 0 of this instance to the VLAN 0 - # of the first instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:57 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:57 \ - -net socket,connect=127.0.0.1:1234 - @end example - -@@ -493,13 +493,13 @@ - Example: - @example - # launch one QEMU instance --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,mcast=230.0.0.1:1234 - # launch another QEMU instance on same "bus" --qemu linux.img -net nic,macaddr=52:54:00:12:34:57 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:57 \ - -net socket,mcast=230.0.0.1:1234 - # launch yet another QEMU instance on same "bus" --qemu linux.img -net nic,macaddr=52:54:00:12:34:58 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:58 \ - -net socket,mcast=230.0.0.1:1234 - @end example - -@@ -507,7 +507,7 @@ - @example - # launch QEMU instance (note mcast address selected - # is UML's default) --qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \ -+kvm linux.img -net nic,macaddr=52:54:00:12:34:56 \ - -net socket,mcast=239.192.168.1:1102 - # launch UML - /path/to/linux ubd0=/path/to/root_fs eth0=mcast -@@ -532,7 +532,7 @@ - - Example (using pxelinux): - @example --qemu -hda linux.img -boot n -tftp /path/to/tftp/files -bootp /pxelinux.0 -+kvm -hda linux.img -boot n -tftp /path/to/tftp/files -bootp /pxelinux.0 - @end example - - @item -smb dir -@@ -566,7 +566,7 @@ - - @example - # on the host --qemu -redir tcp:6001::6000 [...] -+kvm -redir tcp:6001::6000 [...] - # this host xterm should open in the guest X11 server - xterm -display :1 - @end example -@@ -576,7 +576,7 @@ - - @example - # on the host --qemu -redir tcp:5555::23 [...] -+kvm -redir tcp:5555::23 [...] - telnet localhost 5555 - @end example - -@@ -650,19 +650,19 @@ - This implements UDP Net Console. When @var{remote_host} or @var{src_ip} are not specified they default to @code{0.0.0.0}. When not using a specified @var{src_port} a random port is automatically chosen. - - If you just want a simple readonly console you can use @code{netcat} or --@code{nc}, by starting qemu with: @code{-serial udp::4555} and nc as: --@code{nc -u -l -p 4555}. Any time qemu writes something to that port it -+@code{nc}, by starting kvm with: @code{-serial udp::4555} and nc as: -+@code{nc -u -l -p 4555}. Any time kvm writes something to that port it - will appear in the netconsole session. - - If you plan to send characters back via netconsole or you want to stop --and start qemu a lot of times, you should have qemu use the same -+and start kvm a lot of times, you should have kvm use the same - source port each time by using something like @code{-serial --udp::4555@@:4556} to qemu. Another approach is to use a patched -+udp::4555@@:4556} to kvm. Another approach is to use a patched - version of netcat which can listen to a TCP port and send and receive - characters via udp. If you have a patched version of netcat which - activates telnet remote echo and single char transfer, then you can - use the following options to step up a netcat redirector to allow --telnet on port 5555 to access the qemu port. -+telnet on port 5555 to access the kvm port. - @table @code - @item Qemu Options: - -serial udp::4555@@:4556 -@@ -1279,7 +1279,7 @@ - directory tree. In order to use it, just type: - - @example --qemu linux.img -hdb fat:/my_directory -+kvm linux.img -hdb fat:/my_directory - @end example - - Then you access access to all the files in the @file{/my_directory} -@@ -1289,14 +1289,14 @@ - Floppies can be emulated with the @code{:floppy:} option: - - @example --qemu linux.img -fda fat:floppy:/my_directory -+kvm linux.img -fda fat:floppy:/my_directory - @end example - - A read/write support is available for testing (beta stage) with the - @code{:rw:} option: - - @example --qemu linux.img -fda fat:floppy:rw:/my_directory -+kvm linux.img -fda fat:floppy:rw:/my_directory - @end example - - What you should @emph{never} do: -@@ -1334,7 +1334,7 @@ - @subsubsection Linux host - - As an example, you can download the @file{linux-test-xxx.tar.gz} --archive and copy the script @file{qemu-ifup} in @file{/etc} and -+archive and copy the script @file{qemu-ifup} in @file{/etc/kvm} and - configure properly @code{sudo} so that the command @code{ifconfig} - contained in @file{qemu-ifup} can be executed as root. You must verify - that your host kernel supports the TAP network interfaces: the -@@ -1402,7 +1402,7 @@ - - The syntax is: - @example --qemu -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda" -+kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img -append "root=/dev/hda" - @end example - - Use @option{-kernel} to provide the Linux kernel image and -@@ -1417,7 +1417,7 @@ - the virtual serial port and the QEMU monitor to the console with the - @option{-nographic} option. The typical command line is: - @example --qemu -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ -+kvm -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ - -append "root=/dev/hda console=ttyS0" -nographic - @end example - -@@ -1447,7 +1447,7 @@ - Virtual Mouse. This will override the PS/2 mouse emulation when activated. - @item @code{tablet} - Pointer device that uses absolute coordinates (like a touchscreen). --This means qemu is able to report the mouse position without having -+This means kvm is able to report the mouse position without having - to grab the mouse. Also overrides the PS/2 mouse emulation when activated. - @item @code{disk:file} - Mass storage device based on @var{file} (@pxref{disk_images}) -@@ -1536,7 +1536,7 @@ - socket only. For example - - @example --qemu [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc -+kvm [...OPTIONS...] -vnc unix:/home/joebloggs/.qemu-myvm-vnc - @end example - - This ensures that only users on local box with read/write access to that -@@ -1557,7 +1557,7 @@ - the monitor is used to set the password all clients will be rejected. - - @example --qemu [...OPTIONS...] -vnc :1,password -monitor stdio -+kvm [...OPTIONS...] -vnc :1,password -monitor stdio - (qemu) change vnc password - Password: ******** - (qemu) -@@ -1574,7 +1574,7 @@ - client to connect, and provides an encrypted session. - - @example --qemu [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,tls,x509=/etc/pki/qemu -monitor stdio - @end example - - In the above example @code{/etc/pki/qemu} should contain at least three files, -@@ -1592,7 +1592,7 @@ - in an environment with a private internal certificate authority. - - @example --qemu [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,tls,x509verify=/etc/pki/qemu -monitor stdio - @end example - - -@@ -1603,7 +1603,7 @@ - to provide two layers of authentication for clients. - - @example --qemu [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio -+kvm [...OPTIONS...] -vnc :1,password,tls,x509verify=/etc/pki/qemu -monitor stdio - (qemu) change vnc password - Password: ******** - (qemu) -@@ -1726,10 +1726,10 @@ - QEMU has a primitive support to work with gdb, so that you can do - 'Ctrl-C' while the virtual machine is running and inspect its state. - --In order to use gdb, launch qemu with the '-s' option. It will wait for a -+In order to use gdb, launch kvm with the '-s' option. It will wait for a - gdb connection: - @example --> qemu -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ -+> kvm -s -kernel arch/i386/boot/bzImage -hda root-2.4.20.img \ - -append "root=/dev/hda" - Connected to host network interface: tun0 - Waiting gdb connection on port 1234 diff --git a/app-emulation/kvm/files/kvm-45-qemu-kvm.patch b/app-emulation/kvm/files/kvm-45-qemu-kvm.patch deleted file mode 100644 index 526db7b..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-kvm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- kvm-45/qemu/Makefile.target 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/qemu/Makefile.target 2007-10-06 23:02:18.000000000 -0700 -@@ -70,11 +70,7 @@ - QEMU_USER=qemu-$(TARGET_ARCH2) - # system emulator name - ifdef CONFIG_SOFTMMU --ifeq ($(TARGET_ARCH), i386) --QEMU_SYSTEM=qemu$(EXESUF) --else --QEMU_SYSTEM=qemu-system-$(TARGET_ARCH2)$(EXESUF) --endif -+QEMU_SYSTEM=kvm$(EXESUF) - else - QEMU_SYSTEM=qemu-fast - endif diff --git a/app-emulation/kvm/files/kvm-45-qemu-no-img.patch b/app-emulation/kvm/files/kvm-45-qemu-no-img.patch deleted file mode 100644 index 2bbc692..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu-no-img.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- kvm-45/qemu/Makefile 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/qemu/Makefile 2007-10-07 01:37:38.000000000 -0700 -@@ -17,30 +17,27 @@ - BASE_LDFLAGS += -static - endif - ifdef BUILD_DOCS --DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 -+DOCS=qemu-doc.html qemu-tech.html qemu.1 - else - DOCS= - endif - - LIBS+=$(AIOLIBS) - --all: $(TOOLS) $(DOCS) recurse-all -+all: $(DOCS) recurse-all - - subdir-%: dyngen$(EXESUF) - $(MAKE) -C $(subst subdir-,,$@) all - - recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS)) - --qemu-img$(EXESUF): qemu-img.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c block-parallels.c -- $(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS) -- - dyngen$(EXESUF): dyngen.c - $(HOST_CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -o $@ $^ - - clean: - # avoid old build problems by removing potentially incorrect old files - rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h -- rm -f *.o *.a $(TOOLS) dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~ -+ rm -f *.o *.a dyngen$(EXESUF) TAGS cscope.* *.pod *~ */*~ - $(MAKE) -C tests clean - for d in $(TARGET_DIRS); do \ - $(MAKE) -C $$d $@ || exit 1 ; \ -@@ -62,12 +59,11 @@ - $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" - ifndef CONFIG_WIN32 - mkdir -p "$(DESTDIR)$(mandir)/man1" -- $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" -+ $(INSTALL) qemu.1 "$(DESTDIR)$(mandir)/man1" - endif - - install: all $(if $(BUILD_DOCS),install-doc) - mkdir -p "$(DESTDIR)$(bindir)" -- $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" - mkdir -p "$(DESTDIR)$(datadir)" - for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ - video.x openbios-sparc32 pxe-ne2k_pci.bin \ -@@ -110,10 +106,6 @@ - $(SRC_PATH)/texi2pod.pl $< qemu.pod - pod2man --section=1 --center=" " --release=" " qemu.pod > $@ - --qemu-img.1: qemu-img.texi -- $(SRC_PATH)/texi2pod.pl $< qemu-img.pod -- pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ -- - info: qemu-doc.info qemu-tech.info - - dvi: qemu-doc.dvi qemu-tech.dvi -@@ -161,7 +153,6 @@ - $(bindir)/qemu-alpha \ - $(bindir)/qemu-m68k \ - $(bindir)/qemu-sh4 \ -- $(bindir)/qemu-img \ - $(datadir)/bios.bin \ - $(datadir)/vgabios.bin \ - $(datadir)/vgabios-cirrus.bin \ -@@ -173,7 +164,7 @@ - $(datadir)/pxe-pcnet.bin \ - $(docdir)/qemu-doc.html \ - $(docdir)/qemu-tech.html \ -- $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) -+ $(mandir)/man1/qemu.1 ) - - ifneq ($(wildcard .depend),) - include .depend diff --git a/app-emulation/kvm/files/kvm-45-qemu_configure.patch b/app-emulation/kvm/files/kvm-45-qemu_configure.patch deleted file mode 100644 index ecfafc8..0000000 --- a/app-emulation/kvm/files/kvm-45-qemu_configure.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kvm-45.orig/qemu/configure kvm-45/qemu/configure ---- kvm-45.orig/qemu/configure 2007-10-02 10:36:33.000000000 +0200 -+++ kvm-45/qemu/configure 2007-10-03 02:21:52.000000000 +0200 -@@ -666,7 +666,7 @@ - prefix="/usr/local" - fi - mansuffix="/share/man" -- datasuffix="/share/qemu" -+ datasuffix="/share/kvm" - docsuffix="/share/doc/qemu" - binsuffix="/bin" - fi diff --git a/app-emulation/kvm/files/kvm-45-user-no-kernel.patch b/app-emulation/kvm/files/kvm-45-user-no-kernel.patch deleted file mode 100644 index efb77b9..0000000 --- a/app-emulation/kvm/files/kvm-45-user-no-kernel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kvm-45/user/Makefile 2007-10-02 01:36:33.000000000 -0700 -+++ kvm-45/work/kvm-45/user/Makefile 2007-10-06 22:52:44.000000000 -0700 -@@ -53,10 +53,6 @@ - - install: - install -D kvmctl.h $(DESTDIR)/$(PREFIX)/include/kvmctl.h -- install -D $(KERNELDIR)/include/linux/kvm.h \ -- $(DESTDIR)/$(PREFIX)/include/linux/kvm.h -- install -D $(KERNELDIR)/include/linux/kvm_para.h \ -- $(DESTDIR)/$(PREFIX)/include/linux/kvm_para.h - install -D libkvm.a $(DESTDIR)/$(PREFIX)/$(LIBDIR)/libkvm.a - - %.flat: %.o diff --git a/app-emulation/kvm/files/kvm-47-configure-qemu.patch b/app-emulation/kvm/files/kvm-47-configure-qemu.patch deleted file mode 100644 index 2ffbb99..0000000 --- a/app-emulation/kvm/files/kvm-47-configure-qemu.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- kvm-47/configure 2007-10-18 02:58:26.000000000 -0700 -+++ kvm-47/configure 2007-10-18 11:13:31.000000000 -0700 -@@ -6,9 +6,7 @@ - qemu_cc= - qemu_cflags= - qemu_ldflags= --enable_alsa= --disable_vnc_tls= --disable_gcc_check= -+qemu_conf= - cross_prefix= - arch=`uname -m` - target_exec= -@@ -26,8 +24,10 @@ - --qemu-cc=CC specify compiler for qemu (must be gcc-3.x) - --qemu-cflags=CFLAGS CFLAGS to add to qemu configuration - --qemu-ldflags=LDFLAGS LDFLAGS to add to qemu configuration -- --enable-alsa enable alsa support for qemu -- --disable-vnc-tls disable vnc tls support for qemu -+ -+ All additional options are given to qemu, that include: -+ --enable-alsa enable alsa support -+ --disable-vnc-tls disable vnc tls support - --disable-gcc-check don't insist on gcc-3.x - CAUTION: this will break running without kvm - EOF -@@ -60,15 +60,6 @@ - --qemu-ldflags) - qemu_ldflags="$arg" - ;; -- --enable-alsa) -- enable_alsa=1 -- ;; -- --disable-vnc-tls) -- disable_vnc_tls=1 -- ;; -- --disable-gcc-check) -- disable_gcc_check=1 -- ;; - --arch) - arch="$arg" - ;; -@@ -79,7 +70,7 @@ - usage - ;; - *) -- usage -+ qemu_conf="$qemu_conf $opt" - ;; - esac - done -@@ -111,13 +102,10 @@ - --disable-kqemu --extra-cflags="-I $PWD/../user $qemu_cflags" \ - --extra-ldflags="-L $PWD/../user $qemu_ldflags" \ - --enable-kvm --kernel-path="$libkvm_kerneldir" \ -- ${enable_alsa:+"--enable-alsa"} \ -- ${disable_vnc_tls:+"--disable-vnc-tls"} \ -- ${disable_gcc_check:+"--disable-gcc-check"} \ - --prefix="$prefix" \ - ${qemu_cc:+"--cc=$qemu_cc"} \ - ${cross_prefix:+"--cross-prefix=$cross_prefix"} \ -- ${cross_prefix:+"--cpu=$arch"} -+ ${cross_prefix:+"--cpu=$arch"} $qemu_conf - ) - - diff --git a/app-emulation/kvm/files/kvm-47-qemu-gcc3.patch b/app-emulation/kvm/files/kvm-47-qemu-gcc3.patch deleted file mode 100644 index 311fcc7..0000000 --- a/app-emulation/kvm/files/kvm-47-qemu-gcc3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kvm-47/qemu/configure 2007-10-18 02:58:26.000000000 -0700 -+++ kvm-47/qemu/configure 2007-10-18 09:16:21.000000000 -0700 -@@ -23,7 +23,7 @@ - cross_prefix="" - cc="gcc" - gcc3_search="yes" --gcc3_list="gcc-3.4 gcc34 gcc-3.3.6 gcc-3.3 gcc33 gcc-3.2 gcc32" -+gcc3_list="gcc-3.4.6 gcc-3.4 gcc34 gcc-3.3.6 gcc-3.3 gcc33 gcc-3.2 gcc32" - host_cc="gcc" - ar="ar" - make="make" - diff --git a/app-emulation/kvm/files/kvm-48-kvm.patch b/app-emulation/kvm/files/kvm-48-kvm.patch deleted file mode 100644 index 7a2006a..0000000 --- a/app-emulation/kvm/files/kvm-48-kvm.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- kvm-48/kvm 2007-10-18 02:58:26.000000000 -0700 -+++ kvm-48/kvm 2007-10-18 11:58:57.000000000 -0700 -@@ -15,9 +15,11 @@ - self.readfp(file, filename) - - config = ShellConfigParser() --config.read('config.mak') -+config.read('/etc/kvm/config.mak') - - external_module = config.get('shell', 'want_module') -+prefix = config.get('shell', 'prefix') -+kerneldir = config.get('shell', 'kerneldir').replace('build', 'misc') - privileged = os.getuid() == 0 - - optparser = optparse.OptionParser() -@@ -55,6 +57,12 @@ - default = not privileged, - ) - -+optparser.add_option('--bridge', -+ help = 'use this device to build the bridge', -+ dest = 'bridge', -+ default = None, -+ ) -+ - optparser.add_option('--mac', - help = 'use this specific mac addr', - dest = 'mac', -@@ -73,11 +81,19 @@ - dest = 'kvm', - default = True, - ) -+ -+optparser.add_option('--imagesize', -+ help = 'use this size for the image', -+ dest = 'imagesize', -+ default = '30G', -+ ) -+ - optparser.add_option('--image', - help = 'select disk image', - dest = 'image', - default = '/tmp/disk', - ) -+ - optparser.add_option('--cdrom', - help = 'select cdrom image', - dest = 'cdrom', -@@ -119,7 +135,7 @@ - action = 'store_false', - default = True, - dest = 'irqchip', -- help = 'avoid using in-kernel irqchip', -+ help = 'disable KVM kernel mode PIC/IOAPIC/LAPIC', - ) - - optparser.add_option('-n', '--dry-run', -@@ -148,7 +164,7 @@ - - def insert_module(module): - if os.spawnl(os.P_WAIT, '/sbin/insmod', 'insmod', -- 'kernel/%s.ko' % (module,)) != 0: -+ kerneldir + '/%s.ko' % (module,)) != 0: - raise Exception('failed to load kvm module') - - def probe_module(module): -@@ -181,9 +197,10 @@ - print '/dev/kvm not present' - - disk = options.image -+disksize = options.imagesize - if options.install: -- (status, output) = commands.getstatusoutput( -- 'qemu/qemu-img create -f qcow2 "%s" 30G' % disk) -+ cmd = 'qemu-img create -f qcow2 "' + disk + '" ' + disksize -+ (status, output) = commands.getstatusoutput(cmd) - if status: - raise Exception, output - -@@ -191,14 +208,11 @@ - if options.install: - bootdisk = 'd' - -+# kvm always compiles for the x86_64 target - arch = 'x86_64' -+cmd = 'kvm' - --if arch == 'x86_64': -- cmd = 'qemu-system-' + arch --else: -- cmd = 'qemu' -- --local_cmd = 'qemu/' + arch + '-softmmu/' + cmd -+local_cmd = prefix + '/bin/' + cmd - if os.access(local_cmd, os.F_OK): - cmd = local_cmd - else: -@@ -226,15 +240,31 @@ - if not options.irqchip: - qemu_args += ('-no-kvm-irqchip',) - -+def getmac(interface): -+ if os.access('/sbin/ip', os.F_OK): -+ for line in commands.getoutput('/sbin/ip link show ' + interface).splitlines(): -+ m = re.match(r'.*link/ether (..:..:..:..:..:..).*', line) -+ if m: -+ mac = m.group(1) -+ return mac -+ else: -+ for line in commands.getoutput('/sbin/ifconfig ' + interface).splitlines(): -+ m = re.match(r'.*HWaddr (..:..:..:..:..:..)', line) -+ if m: -+ mac = m.group(1) -+ return mac -+ return False -+ - if not options.notap: -+ bridge = options.bridge -+ if not bridge: -+ bridge = 'eth0' -+ - mac = options.mac - if not mac: -- for line in commands.getoutput('/sbin/ip link show eth0').splitlines(): -- m = re.match(r'.*link/ether (..:..:..:..:..:..).*', line) -- if m: -- mac = m.group(1) -+ mac = getmac(bridge) - if not mac: -- raise Exception, 'Unable to determine eth0 mac address' -+ raise Exception, 'Unable to determine ' + bridge + ' mac address' - mac_components = mac.split(':') - mac_components[0] = 'a0' - mac = ':'.join(mac_components) diff --git a/app-emulation/kvm/files/kvm-50-libkvm-no-kernel.patch b/app-emulation/kvm/files/kvm-50-libkvm-no-kernel.patch deleted file mode 100644 index 21ee636..0000000 --- a/app-emulation/kvm/files/kvm-50-libkvm-no-kernel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- kvm-50/libkvm/Makefile 2007-10-31 06:50:28.000000000 -0700 -+++ kvm-50/libkvm/Makefile 2007-11-04 01:23:46.000000000 -0700 -@@ -26,10 +26,6 @@ - - install: - install -D libkvm.h $(DESTDIR)/$(PREFIX)/include/libkvm.h -- install -D $(KERNELDIR)/include/linux/kvm.h \ -- $(DESTDIR)/$(PREFIX)/include/linux/kvm.h -- install -D $(KERNELDIR)/include/linux/kvm_para.h \ -- $(DESTDIR)/$(PREFIX)/include/linux/kvm_para.h - install -D libkvm.a $(DESTDIR)/$(PREFIX)/$(LIBDIR)/libkvm.a - - -include .*.d diff --git a/app-emulation/kvm/files/kvm-50-qemu-bios-no-sparc.patch b/app-emulation/kvm/files/kvm-50-qemu-bios-no-sparc.patch deleted file mode 100644 index 2c86677..0000000 --- a/app-emulation/kvm/files/kvm-50-qemu-bios-no-sparc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- kvm-50/qemu/Makefile 2007-10-31 06:50:28.000000000 -0700 -+++ kvm-50/qemu/Makefile 2007-11-04 01:32:19.000000000 -0700 -@@ -70,7 +70,7 @@ - $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)" - mkdir -p "$(DESTDIR)$(datadir)" - for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ -- video.x openbios-sparc32 pxe-ne2k_pci.bin \ -+ video.x pxe-ne2k_pci.bin \ - pxe-rtl8139.bin pxe-pcnet.bin; do \ - $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ - done -@@ -167,7 +167,6 @@ - $(datadir)/vgabios-cirrus.bin \ - $(datadir)/ppc_rom.bin \ - $(datadir)/video.x \ -- $(datadir)/openbios-sparc32 \ - $(datadir)/pxe-ne2k_pci.bin \ - $(datadir)/pxe-rtl8139.bin \ - $(datadir)/pxe-pcnet.bin \ diff --git a/app-emulation/kvm/files/kvm-51-qemu-ramaddr.patch b/app-emulation/kvm/files/kvm-51-qemu-ramaddr.patch deleted file mode 100644 index be14e5d..0000000 --- a/app-emulation/kvm/files/kvm-51-qemu-ramaddr.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/qemu/exec.c b/qemu/exec.c -index 788a913..c1bf8d5 100644 ---- a/qemu/exec.c -+++ b/qemu/exec.c -@@ -1986,7 +1986,7 @@ static inline void tlb_set_dirty(CPUState *env, - - static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, - int memory); --static void *subpage_init (target_phys_addr_t base, uint32_t *phys, -+static void *subpage_init (target_phys_addr_t base, ram_addr_t *phys, - int orig_memory); - #define CHECK_SUBPAGE(addr, start_addr, start_addr2, end_addr, end_addr2, \ - need_subpage) \ -@@ -2094,7 +2094,7 @@ ram_addr_t qemu_ram_alloc(unsigned long size) - { - ram_addr_t addr; - if ((phys_ram_alloc_offset + size) >= phys_ram_size) { -- fprintf(stderr, "Not enough memory (requested_size = %u, max memory = %d)\n", -+ fprintf(stderr, "Not enough memory (requested_size = %u, max memory = %lu)\n", - size, phys_ram_size); - abort(); - } -@@ -2430,7 +2430,7 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end, - return 0; - } - --static void *subpage_init (target_phys_addr_t base, uint32_t *phys, -+static void *subpage_init (target_phys_addr_t base, ram_addr_t *phys, - int orig_memory) - { - subpage_t *mmio; -diff --git a/qemu/migration.c b/qemu/migration.c -index f6e2754..a8f32d2 100644 ---- a/qemu/migration.c -+++ b/qemu/migration.c -@@ -803,7 +803,7 @@ static int migrate_incoming_fd(int fd) - - size = qemu_get_be32(f); - if (size != phys_ram_size) { -- fprintf(stderr, "migration: memory size mismatch: recv %u mine %u\n", -+ fprintf(stderr, "migration: memory size mismatch: recv %u mine %lu\n", - size, phys_ram_size); - return MIG_STAT_DST_MEM_SIZE_MISMATCH; - } -@@ -1058,7 +1058,7 @@ void do_info_migration(void) - term_printf("Transfer rate %3.1f mb/s\n", - (double)s->bps / (1024 * 1024)); - term_printf("Iteration %d\n", s->iteration); -- term_printf("Transferred %d/%d pages\n", s->updated_pages, phys_ram_size >> TARGET_PAGE_BITS); -+ term_printf("Transferred %d/%lu pages\n", s->updated_pages, phys_ram_size >> TARGET_PAGE_BITS); - if (s->iteration) - term_printf("Last iteration found %d dirty pages\n", s->last_updated_pages); - } else { -diff --git a/qemu/vl.c b/qemu/vl.c -index 70d8c81..279cf0c 100644 ---- a/qemu/vl.c -+++ b/qemu/vl.c -@@ -130,10 +130,14 @@ int inet_aton(const char *cp, struct in_addr *ia); - //#define DEBUG_UNUSED_IOPORT - //#define DEBUG_IOPORT - --#if HOST_LONG_BITS < 64 -+#if TARGET_LONG_BITS < 64 - #define PHYS_RAM_MAX_SIZE (2047 * 1024 * 1024) - #else -+#if HOST_LONG_BITS < 64 - #define PHYS_RAM_MAX_SIZE (2047 * 1024 * 1024 * 1024ULL) -+#else -+#define PHYS_RAM_MAX_SIZE (2047 * 1024 * 1024 * 1024UL) -+#endif - #endif - - #ifdef TARGET_PPC -@@ -8249,7 +8253,7 @@ int main(int argc, char **argv) - if (ram_size <= 0) - help(1); - if (ram_size > PHYS_RAM_MAX_SIZE) { -- fprintf(stderr, "qemu: at most %d MB RAM can be simulated\n", -+ fprintf(stderr, "qemu: at most " TARGET_FMT_lu " MB RAM can be simulated\n", - PHYS_RAM_MAX_SIZE / (1024 * 1024)); - exit(1); - } diff --git a/app-emulation/kvm/files/kvm-53-qemu-checkext-inc.patch b/app-emulation/kvm/files/kvm-53-qemu-checkext-inc.patch deleted file mode 100644 index 8fa4d39..0000000 --- a/app-emulation/kvm/files/kvm-53-qemu-checkext-inc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h -index 6fdfc03..f9fe2ae 100644 ---- a/qemu/qemu-kvm.h -+++ b/qemu/qemu-kvm.h -@@ -14,6 +14,7 @@ void kvm_save_registers(CPUState *env); - int kvm_cpu_exec(CPUState *env); - int kvm_update_debugger(CPUState *env); - int kvm_qemu_init_env(CPUState *env); -+int kvm_qemu_check_extension(int ext); - void kvm_apic_init(CPUState *env); - - int kvm_physical_memory_set_dirty_tracking(int enable); diff --git a/app-emulation/kvm/files/kvm-53-qemu-exec-fmt.patch b/app-emulation/kvm/files/kvm-53-qemu-exec-fmt.patch deleted file mode 100644 index 4e6e375..0000000 --- a/app-emulation/kvm/files/kvm-53-qemu-exec-fmt.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d843a842f162bf9f64666b1e3402c07716232cd2 Mon Sep 17 00:00:00 2001 -From: Carlo Marcelo Arenas Belon <carenas@thinkpad.sajinet.com.pe> -Date: Wed, 21 Nov 2007 21:45:48 -0800 -Subject: [PATCH] qemu: cvs diff -u -r1.110 -r1.111 exec.c - -Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> ---- - qemu/exec.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/qemu/exec.c b/qemu/exec.c -index 788a913..7343c75 100644 ---- a/qemu/exec.c -+++ b/qemu/exec.c -@@ -353,10 +353,10 @@ void tb_flush(CPUState *env1) - { - CPUState *env; - #if defined(DEBUG_FLUSH) -- printf("qemu: flush code_size=%d nb_tbs=%d avg_tb_size=%d\n", -- code_gen_ptr - code_gen_buffer, -- nb_tbs, -- nb_tbs > 0 ? (code_gen_ptr - code_gen_buffer) / nb_tbs : 0); -+ printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n", -+ (unsigned long)(code_gen_ptr - code_gen_buffer), -+ nb_tbs, nb_tbs > 0 ? -+ ((unsigned long)(code_gen_ptr - code_gen_buffer)) / nb_tbs : 0); - #endif - nb_tbs = 0; - -@@ -903,7 +903,7 @@ static inline void tb_alloc_page(TranslationBlock *tb, - mprotect(g2h(page_addr), qemu_host_page_size, - (prot & PAGE_BITS) & ~PAGE_WRITE); - #ifdef DEBUG_TB_INVALIDATE -- printf("protecting code page: 0x%08lx\n", -+ printf("protecting code page: 0x" TARGET_FMT_lx "\n", - page_addr); - #endif - } -@@ -2110,7 +2110,7 @@ void qemu_ram_free(ram_addr_t addr) - static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr) - { - #ifdef DEBUG_UNASSIGNED -- printf("Unassigned mem read " TARGET_FMT_lx "\n", addr); -+ printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); - #endif - #ifdef TARGET_SPARC - do_unassigned_access(addr, 0, 0, 0); -@@ -2121,7 +2121,7 @@ static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr) - static void unassigned_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) - { - #ifdef DEBUG_UNASSIGNED -- printf("Unassigned mem write " TARGET_FMT_lx " = 0x%x\n", addr, val); -+ printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); - #endif - #ifdef TARGET_SPARC - do_unassigned_access(addr, 1, 0, 0); --- -1.5.2.5 - diff --git a/app-emulation/kvm/files/kvm-53-qemu-ramalloc-fmt.patch b/app-emulation/kvm/files/kvm-53-qemu-ramalloc-fmt.patch deleted file mode 100644 index 8f3b846..0000000 --- a/app-emulation/kvm/files/kvm-53-qemu-ramalloc-fmt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kvm-53/qemu/exec.c 2007-11-21 22:28:26.000000000 -0800 -+++ kvm-53/qemu/exec.c 2007-11-21 22:36:59.000000000 -0800 -@@ -2094,7 +2094,7 @@ - { - ram_addr_t addr; - if ((phys_ram_alloc_offset + size) >= phys_ram_size) { -- fprintf(stderr, "Not enough memory (requested_size = %u, max memory = %lu)\n", -+ fprintf(stderr, "Not enough memory (requested_size = %lu, max memory = %lu)\n", - size, phys_ram_size); - abort(); - } diff --git a/app-emulation/kvm/kvm-48.ebuild b/app-emulation/kvm/kvm-48.ebuild deleted file mode 100644 index eaff84f..0000000 --- a/app-emulation/kvm/kvm-48.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: 2007/10/02 19:00:00 philantrop Exp $ - -inherit eutils linux-mod - -DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)" -HOMEPAGE="http://kvm.qumranet.com/kvmwiki" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="alsa gcc4 gnutls kvm qemu sdl" - -DEPEND="sdl? ( >=media-libs/libsdl-1.2.11 ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !gcc4? ( =sys-devel/gcc-3.4.6-r2 ) - gnutls? ( net-libs/gnutls ) - app-text/texi2html - >=sys-fs/e2fsprogs-1.39" - -RDEPEND="${DEPEND} - sys-apps/usermode-utilities - qemu? ( app-emulation/qemu-softmmu ) - !qemu? ( !app-emulation/qemu-softmmu ) - dev-lang/python" - -RESTRICT="strip" - -BUILD_TARGETS="all" - -QA_TEXTRELS="usr/bin/kvm" -QA_EXECSTACK="usr/share/kvm/openbios-sparc32" -QA_WX_LOAD="usr/share/kvm/openbios-sparc32" - -pkg_setup() { - if kernel_is lt 2 6 22 && ! use kvm; then - eerror "the module in your kernel requires an older version of" - eerror "kvm as shown in :" - eerror " http://kvm.qumranet.com/kvmwiki/Downloads" - die "kvm module not compatible, downgrade kvm or USE='kvm'" - fi - - # Don't continue if the KVM modules can't be found - if ! linux_chkconfig_present KVM && ! use kvm; then - eerror "kvm module not found on your kernel" - eerror "USE='kvm' or enable KVM and the kvm module for your CPU" - die "kvm module missing in kernel" - fi - - MODULE_NAMES="kvm(misc:${S}/kernel) - kvm-intel(misc:${S}/kernel) - kvm-amd(misc:${S}/kernel)" - - if use kvm; then - linux-mod_pkg_setup - else - ewarn "using the kernel provided module" - ewarn "some features may only be available in newer releases" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/kvm-47-configure-qemu.patch" - epatch "${FILESDIR}/kvm-45-qemu-configure.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm-doc.patch" - epatch "${FILESDIR}/kvm-43-qemu-kvm-cmdline.patch" - epatch "${FILESDIR}/kvm-48-kvm.patch" - epatch "${FILESDIR}/kvm-43-qemu-ifup.patch" - epatch "${FILESDIR}/kvm-45-user-no-kernel.patch" - - if use qemu; then - epatch "${FILESDIR}/kvm-45-qemu-no-img.patch" - fi - - if use gcc4; then - epatch "${FILESDIR}/kvm-45-qemu-gcc4.patch" - else - epatch "${FILESDIR}/kvm-47-qemu-gcc3.patch" - fi -} - -src_compile() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - conf_opts="--prefix=/usr" - - if use alsa; then - conf_opts="$conf_opts --enable-alsa" - fi - - if ! use gnutls; then - conf_opts="$conf_opts --disable-vnc-tls" - fi - - if ! use sdl; then - conf_opts="$conf_opts --disable-gfx-check --disable-sdl" - fi - - if use gcc4; then - conf_opts="$conf_opts --disable-gcc-check" - fi - - # Hand-crafted configure script. econf doesn't work. - ./configure ${conf_opts} || die "./configure failed" - - emake user qemu || die "emake failed" - - if use kvm; then - linux-mod_src_compile - fi -} - -src_install() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - if use kvm; then - linux-mod_src_install - fi - - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/kvm/utils/ - doexe "${S}/kvm" "${S}/kvm_stat" - mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1" - - insinto /etc/udev/rules.d/ - doins "${WORKDIR}/${P}/scripts/65-kvm.rules" - - insinto /etc/kvm/ - insopts -m0755 - doins "${WORKDIR}/${P}/scripts/qemu-ifup" - doins "${WORKDIR}/${P}/config.mak" -} - -pkg_postinst() { - if use kvm; then - linux-mod_pkg_postinst - fi - enewgroup kvm - - elog "If you don't have kvm compiled into the kernel, make sure you have the kernel" - elog "module loaded before running kvm. The easiest way to ensure that the kernel" - elog "module is loaded is to load it on boot:" - elog "For AMD CPUs:" - elog "echo kvm-amd >> /etc/modules.autoload.d/kernel-2.6" - elog "For Intel CPUs:" - elog "echo kvm-intel >> /etc/modules.autoload.d/kernel-2.6" - echo - elog "Make sure your user is in the 'kvm' group" - elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." - echo - elog "If qemu complains about not having a 1024hz timer, run this:" - elog "echo dev.rtc.max-user-freq=1024 >> /etc/sysctl.conf" - echo - elog "If you want network support in the guest OS, you'll need to make" - elog "sure you compile in support for 802.1d Ethernet Bridging in the" - elog "kernel, set up a bridge network interface and make sure you" - elog "compile Universal TUN/TAP device driver support as a kernel module" - elog "and make it load on boot:" - elog "echo tun >> /etc/modules.autoload.d/kernel-2.6" -} diff --git a/app-emulation/kvm/kvm-49.ebuild b/app-emulation/kvm/kvm-49.ebuild deleted file mode 100644 index eaff84f..0000000 --- a/app-emulation/kvm/kvm-49.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: 2007/10/02 19:00:00 philantrop Exp $ - -inherit eutils linux-mod - -DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)" -HOMEPAGE="http://kvm.qumranet.com/kvmwiki" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="alsa gcc4 gnutls kvm qemu sdl" - -DEPEND="sdl? ( >=media-libs/libsdl-1.2.11 ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !gcc4? ( =sys-devel/gcc-3.4.6-r2 ) - gnutls? ( net-libs/gnutls ) - app-text/texi2html - >=sys-fs/e2fsprogs-1.39" - -RDEPEND="${DEPEND} - sys-apps/usermode-utilities - qemu? ( app-emulation/qemu-softmmu ) - !qemu? ( !app-emulation/qemu-softmmu ) - dev-lang/python" - -RESTRICT="strip" - -BUILD_TARGETS="all" - -QA_TEXTRELS="usr/bin/kvm" -QA_EXECSTACK="usr/share/kvm/openbios-sparc32" -QA_WX_LOAD="usr/share/kvm/openbios-sparc32" - -pkg_setup() { - if kernel_is lt 2 6 22 && ! use kvm; then - eerror "the module in your kernel requires an older version of" - eerror "kvm as shown in :" - eerror " http://kvm.qumranet.com/kvmwiki/Downloads" - die "kvm module not compatible, downgrade kvm or USE='kvm'" - fi - - # Don't continue if the KVM modules can't be found - if ! linux_chkconfig_present KVM && ! use kvm; then - eerror "kvm module not found on your kernel" - eerror "USE='kvm' or enable KVM and the kvm module for your CPU" - die "kvm module missing in kernel" - fi - - MODULE_NAMES="kvm(misc:${S}/kernel) - kvm-intel(misc:${S}/kernel) - kvm-amd(misc:${S}/kernel)" - - if use kvm; then - linux-mod_pkg_setup - else - ewarn "using the kernel provided module" - ewarn "some features may only be available in newer releases" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/kvm-47-configure-qemu.patch" - epatch "${FILESDIR}/kvm-45-qemu-configure.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm-doc.patch" - epatch "${FILESDIR}/kvm-43-qemu-kvm-cmdline.patch" - epatch "${FILESDIR}/kvm-48-kvm.patch" - epatch "${FILESDIR}/kvm-43-qemu-ifup.patch" - epatch "${FILESDIR}/kvm-45-user-no-kernel.patch" - - if use qemu; then - epatch "${FILESDIR}/kvm-45-qemu-no-img.patch" - fi - - if use gcc4; then - epatch "${FILESDIR}/kvm-45-qemu-gcc4.patch" - else - epatch "${FILESDIR}/kvm-47-qemu-gcc3.patch" - fi -} - -src_compile() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - conf_opts="--prefix=/usr" - - if use alsa; then - conf_opts="$conf_opts --enable-alsa" - fi - - if ! use gnutls; then - conf_opts="$conf_opts --disable-vnc-tls" - fi - - if ! use sdl; then - conf_opts="$conf_opts --disable-gfx-check --disable-sdl" - fi - - if use gcc4; then - conf_opts="$conf_opts --disable-gcc-check" - fi - - # Hand-crafted configure script. econf doesn't work. - ./configure ${conf_opts} || die "./configure failed" - - emake user qemu || die "emake failed" - - if use kvm; then - linux-mod_src_compile - fi -} - -src_install() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - if use kvm; then - linux-mod_src_install - fi - - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/kvm/utils/ - doexe "${S}/kvm" "${S}/kvm_stat" - mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1" - - insinto /etc/udev/rules.d/ - doins "${WORKDIR}/${P}/scripts/65-kvm.rules" - - insinto /etc/kvm/ - insopts -m0755 - doins "${WORKDIR}/${P}/scripts/qemu-ifup" - doins "${WORKDIR}/${P}/config.mak" -} - -pkg_postinst() { - if use kvm; then - linux-mod_pkg_postinst - fi - enewgroup kvm - - elog "If you don't have kvm compiled into the kernel, make sure you have the kernel" - elog "module loaded before running kvm. The easiest way to ensure that the kernel" - elog "module is loaded is to load it on boot:" - elog "For AMD CPUs:" - elog "echo kvm-amd >> /etc/modules.autoload.d/kernel-2.6" - elog "For Intel CPUs:" - elog "echo kvm-intel >> /etc/modules.autoload.d/kernel-2.6" - echo - elog "Make sure your user is in the 'kvm' group" - elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." - echo - elog "If qemu complains about not having a 1024hz timer, run this:" - elog "echo dev.rtc.max-user-freq=1024 >> /etc/sysctl.conf" - echo - elog "If you want network support in the guest OS, you'll need to make" - elog "sure you compile in support for 802.1d Ethernet Bridging in the" - elog "kernel, set up a bridge network interface and make sure you" - elog "compile Universal TUN/TAP device driver support as a kernel module" - elog "and make it load on boot:" - elog "echo tun >> /etc/modules.autoload.d/kernel-2.6" -} diff --git a/app-emulation/kvm/kvm-53.ebuild b/app-emulation/kvm/kvm-53.ebuild deleted file mode 100644 index 58bf5e6..0000000 --- a/app-emulation/kvm/kvm-53.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: 2007/10/02 19:00:00 philantrop Exp $ - -inherit eutils linux-mod - -DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)" -HOMEPAGE="http://kvm.qumranet.com/kvmwiki" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="alsa gcc4 gnutls kvm qemu sdl" - -DEPEND="sdl? ( >=media-libs/libsdl-1.2.11 ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !gcc4? ( =sys-devel/gcc-3.4.6-r2 ) - gnutls? ( net-libs/gnutls ) - app-text/texi2html - >=sys-fs/e2fsprogs-1.39" - -RDEPEND="${DEPEND} - sys-apps/usermode-utilities - qemu? ( app-emulation/qemu-softmmu ) - !qemu? ( !app-emulation/qemu-softmmu ) - dev-lang/python" - -RESTRICT="strip" - -BUILD_TARGETS="all" - -QA_TEXTRELS="usr/bin/kvm" -QA_EXECSTACK="usr/share/kvm/openbios-sparc32" -QA_WX_LOAD="usr/share/kvm/openbios-sparc32" - -pkg_setup() { - if kernel_is lt 2 6 22 && ! use kvm; then - eerror "the module in your kernel requires an older version of" - eerror "kvm as shown in :" - eerror " http://kvm.qumranet.com/kvmwiki/Downloads" - die "kvm module not compatible, downgrade kvm or USE='kvm'" - fi - - # Don't continue if the KVM modules can't be found - if ! linux_chkconfig_present KVM && ! use kvm; then - eerror "kvm module not found on your kernel" - eerror "USE='kvm' or enable KVM and the kvm module for your CPU" - die "kvm module missing in kernel" - fi - - MODULE_NAMES="kvm(misc:${S}/kernel) - kvm-intel(misc:${S}/kernel) - kvm-amd(misc:${S}/kernel)" - - if use kvm; then - linux-mod_pkg_setup - else - ewarn "Using the kernel-provided module." - ewarn "Some features may only be available in newer releases." - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/kvm-47-configure-qemu.patch" - epatch "${FILESDIR}/kvm-45-qemu-configure.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm.patch" - epatch "${FILESDIR}/kvm-45-qemu-kvm-doc.patch" - epatch "${FILESDIR}/kvm-43-qemu-kvm-cmdline.patch" - epatch "${FILESDIR}/kvm-48-kvm.patch" - epatch "${FILESDIR}/kvm-43-qemu-ifup.patch" - epatch "${FILESDIR}/kvm-50-libkvm-no-kernel.patch" - epatch "${FILESDIR}/kvm-50-qemu-bios-no-sparc.patch" - epatch "${FILESDIR}/kvm-51-qemu-ramaddr.patch" - epatch "${FILESDIR}/kvm-53-qemu-checkext-inc.patch" - epatch "${FILESDIR}/kvm-53-qemu-exec-fmt.patch" - epatch "${FILESDIR}/kvm-53-qemu-ramalloc-fmt.patch" - - if use qemu; then - epatch "${FILESDIR}/kvm-45-qemu-no-img.patch" - fi - - if use gcc4; then - epatch "${FILESDIR}/kvm-45-qemu-gcc4.patch" - else - epatch "${FILESDIR}/kvm-47-qemu-gcc3.patch" - fi -} - -src_compile() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - conf_opts="--prefix=/usr" - - if use alsa; then - conf_opts="$conf_opts --enable-alsa" - fi - - if ! use gnutls; then - conf_opts="$conf_opts --disable-vnc-tls" - fi - - if ! use sdl; then - conf_opts="$conf_opts --disable-gfx-check --disable-sdl" - fi - - if use gcc4; then - conf_opts="$conf_opts --disable-gcc-check" - fi - - # Hand-crafted configure script. econf doesn't work. - ./configure ${conf_opts} || die "./configure failed" - - emake user qemu || die "emake failed" - - if use kvm; then - linux-mod_src_compile - fi -} - -src_install() { - # fix make install to not install modules - sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile" - - if use kvm; then - linux-mod_src_install - fi - - emake DESTDIR="${D}" install || die "make install failed" - - exeinto /etc/kvm/utils/ - doexe "${S}/kvm" "${S}/kvm_stat" - mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1" - - insinto /etc/udev/rules.d/ - doins "${WORKDIR}/${P}/scripts/65-kvm.rules" - - insinto /etc/kvm/ - insopts -m0755 - doins "${WORKDIR}/${P}/scripts/qemu-ifup" - doins "${WORKDIR}/${P}/config.mak" -} - -pkg_postinst() { - if use kvm; then - linux-mod_pkg_postinst - fi - enewgroup kvm - - elog "If you don't have kvm compiled into the kernel, make sure you have the kernel" - elog "module loaded before running kvm. The easiest way to ensure that the kernel" - elog "module is loaded is to load it on boot:" - elog "For AMD CPUs:" - elog "echo kvm-amd >> /etc/modules.autoload.d/kernel-2.6" - elog "For Intel CPUs:" - elog "echo kvm-intel >> /etc/modules.autoload.d/kernel-2.6" - echo - elog "Make sure your user is in the 'kvm' group" - elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." - echo - elog "If qemu complains about not having a 1024hz timer, run this:" - elog "echo dev.rtc.max-user-freq=1024 >> /etc/sysctl.conf" - echo - elog "If you want network support in the guest OS, you'll need to make" - elog "sure you compile in support for 802.1d Ethernet Bridging in the" - elog "kernel, set up a bridge network interface and make sure you" - elog "compile Universal TUN/TAP device driver support as a kernel module" - elog "and make it load on boot:" - elog "echo tun >> /etc/modules.autoload.d/kernel-2.6" -} diff --git a/app-emulation/kvm/metadata.xml b/app-emulation/kvm/metadata.xml deleted file mode 100644 index 77f5b83..0000000 --- a/app-emulation/kvm/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>philantrop@gentoo.org</email> -</maintainer> -<longdescription>KVM (Kernel-based Virtual Machine) is a full virtualization solution for Linux on x86 hardware containing virtualization extensions (Intel VT or AMD-V).</longdescription> -</pkgmetadata> |