diff options
author | 2012-08-06 00:03:12 +0000 | |
---|---|---|
committer | 2012-08-06 00:03:12 +0000 | |
commit | a1d84bcfb72784fa33942b3c0449e497176f366a (patch) | |
tree | 72a077e25eaa962d34b28b61b1c2305cb92fccd2 /app-emulation | |
parent | Version bump. (diff) | |
download | historical-a1d84bcfb72784fa33942b3c0449e497176f366a.tar.gz historical-a1d84bcfb72784fa33942b3c0449e497176f366a.tar.bz2 historical-a1d84bcfb72784fa33942b3c0449e497176f366a.zip |
Remove older version and older files.
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/qemu-kvm/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/Manifest | 23 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/files/65-gentoo-kvm.rules | 1 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch | 145 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-include-madvise-defines.patch | 12 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/files/qemu-kvm-guest-hang-on-usb-add.patch | 100 | ||||
-rw-r--r-- | app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild | 369 |
7 files changed, 8 insertions, 650 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog index c3ef6d96c479..e4a711d7b0c5 100644 --- a/app-emulation/qemu-kvm/ChangeLog +++ b/app-emulation/qemu-kvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/qemu-kvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.146 2012/08/05 20:59:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.147 2012/08/06 00:03:12 cardoe Exp $ + + 06 Aug 2012; Doug Goldstein <cardoe@gentoo.org> -files/65-gentoo-kvm.rules, + -files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch, + -files/qemu-kvm-0.12.3-include-madvise-defines.patch, -qemu-kvm-1.1.0.ebuild, + -files/qemu-kvm-guest-hang-on-usb-add.patch: + Remove older version and older files. 05 Aug 2012; Agostino Sarubbo <ago@gentoo.org> qemu-kvm-1.1.1-r1.ebuild: Stable for amd64, wrt bug #428476 diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest index 91b71483fa78..0cce867b1f11 100644 --- a/app-emulation/qemu-kvm/Manifest +++ b/app-emulation/qemu-kvm/Manifest @@ -1,42 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX 65-gentoo-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920 AUX qemu-0.11.0-mips64-user-fix.patch 313 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f SHA512 ca7f92b7d094ed62c15e539ac760aab50255699edfd6faf2bc017e13fb73da66f455c07999c6ee6a1f2196b7c0a2e2caa6c7a584be22d04717d1abea08781dbf WHIRLPOOL 2eb95b7dd79e30ecd4b50a4901553866180c0022760cb1e425bb23f14411ef84356db00eca593230d8fc204f5f5b724567d051fad299a8d6bdb81a346bfa7436 AUX qemu-ifup 138 SHA256 a43d8bc11049589e57ce417b6030a216fd04621581a2c7247c69292c51e53c2a SHA512 3b1040db210455e3d18c19e91ecf97c0289c9723c6c2392fe4f94c6924aa2d329f83a469661d2820229ff87a89ed29b8813b5dcd97dbcd33801e6c81069221c7 WHIRLPOOL 4a7ba5858c3f438ec9ab677afc547fab2e4b1fdefce5b77fbb47ae903c4d9718274ab653d79c8ccac979c58e65113e6cccb27f37c9c1ee759be1ecab45ea50c2 AUX qemu-kvm 61 SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29 SHA512 c60d4951e2733e5f6a869ec4dc9ec6aa0e1c804b973baed1b673d1eba08bc8ee7dfc4c0f9481475bd691d615fedc0c76a4abf16317195c44be938c0d9ef441d6 WHIRLPOOL c2465d7a4ab7c4f719f3e513fdd68872d586b7252834b85c85e7ca6b292645423640653507db9b06a9356d4829a051f091fd1a114af86867bd13f5bbbcf786f4 -AUX qemu-kvm-0.12.3-fix-crash-with-sdl.patch 4003 SHA256 aeca9f133c021726c0e3ce2a58843ee12d592669143d0b75e46b8e301b5cf102 SHA512 6ddd7b1d8565599261a2b3011858c88e3767cf0ae5f71ce7336ef765a545d797152e9d0dfe7818aff772856cd8eeb286146e7980f5fabc66c71e1b9d52e018f9 WHIRLPOOL 7ebe249cee799814d0ab1f0c79a7a2aff1b161ab61fccc9ad086c5b8895ec541e20c296be6771c013c27ce8666ee04960df9a2341995dc5b1b71337f7c67ed2d -AUX qemu-kvm-0.12.3-include-madvise-defines.patch 274 SHA256 0d33d22a853e9b1d19786c9ac53a515587a9753ff69a2f53e61c4764590e7821 SHA512 4a7b06a6e2bfbd18f859e4c930bc82617297697fe687bd0e2b0cb2933a6a3197dec4d0ac47994992e4c5d2cf4d175d375453887c2afe68215b8f84c98ad1f959 WHIRLPOOL 07252e66adafead9cffd89312d92d3167dedb92df7348b626ca01098941bfcdb07546312e32d3dc0cf7f330b1c9dd54db521780e64cc95c3b99de5a536b35b59 AUX qemu-kvm-1.0-e1000-bounds-packet-size-against-buffer-size.patch 1412 SHA256 9a06665c47b76b2501f148713c46f8ce0b14ed03da5e6cb03c0d141f5d91900a SHA512 ce0cb894819ff4a97de54a0f8935a8311f563c3ef4f7b71f15d83f333481febce947697430db92bf3fe95fbbc921312cb163bc6f214d1cf7c4275d4c4d331587 WHIRLPOOL a526113ef51e6d65ba01db9a8310a161f857b80672a588b52d468540d4ee715b378164ca6c1b7eac68b359895a7b938df67f2a68fc7f2d44ac9d804f7e0afa1d AUX qemu-kvm-1.0-fix-nonkvm-arches.patch 742 SHA256 3f2bf2def429453a8a9adbc2adf9d4f2e1d4c1f505ce0ade8f3810b74c281f02 SHA512 238e8d59f7464daf0ad3edfa664ed4fb0070d707c3d4bbc29ae2b75c1e1cd6f4c351c484d8ce9e0ee1f9726c6ead22b35e0ef7aaf9fd3ac633938f39ceb42299 WHIRLPOOL 2d22e17a529d2b4f55c0ade5765824f723ee324a849872457a7afb2d3645855e71ce32a9dcbbece5f6e09852f261bd6865684e250cb2e776f46c2b90c5273607 AUX qemu-kvm-1.0-fix-qemu-system-ppc.patch 1071 SHA256 22a9e989806477e943a09a3ada01c9a6a739d3fdcf6226275c064db1037cb02f SHA512 f911f82635f6197998257f8d6d09904ab4d16b9b7c5c0ff1cfa1250e6c3502ea11757284c674e387c617a9a097916b0bcc581edfb09628c9008090ff9882bdf8 WHIRLPOOL 662126f85ce6873623319cad4c5717d331b02f98dfaa21905340737d682cd7eed24a136987b52805d772b0d94799c898a31a862777f749b1798640e4227ffa4e AUX qemu-kvm-1.0-per-target-i8259.patch 2765 SHA256 42b5905f4e2f0bb5bcdca1e14a669941c2d70ffb1e0b6969b69fc4435772abb2 SHA512 ea323af4f2612fc84f15f69210cef4433c0b29719dc673c28a5175c0267fd77cd6e696c059e5f058965c66a3058988332ea3216b5b6e48851ad61835e22cd3fd WHIRLPOOL 47f63d08749443d2a2c6af06ccfcf158839162d33a41ce9b1d1a3885aa0b0127edec313fde8281a0ad2453a9ae9618de1ff6636afb077b8dce496cdc24815dc0 AUX qemu-kvm-1.0.1-VERSION.patch 115 SHA256 568ee593587ea4c6cdd2c57e607deda256ff848b4230733591ce9f045b5030bd SHA512 971ad15cc7b2b06384969c52eee13213c11bf5ba91f46a281519415921a3d10b765f2e2be2f3e6aebdbce1feaca55214bd82e8499ed48b586a931aec4716b1ef WHIRLPOOL 85d85953e00d32d850343887b073131e453afaf60e45e4837b34bb931d6b74ad90a83935e8daa105060d8e1b726df695dd0dc6fd68b98b2ab60fb019b768040b AUX qemu-kvm-1.0.1-freebsd-sysctl-header.patch 278 SHA256 af207d21f361d3eecdef6599eec7bad7655bd184f56df6e8bb87c83e8a0215e5 SHA512 c093f04295b8c70da7bd00316cdfb041ef15b0eb5a7ed4d6ceff2d46931328e31728378977b3a0fad1337a5bcd876831b0a0d0e1ad349bb720efb400490265f5 WHIRLPOOL a6845b705cd6a5b3a6ffebab68bd40850ef8dba4ab59a4bc240792761700603ea69e89fcdb1644071550a93cb0b4ce14a337a8fc28b4a4ea249e433b68f36a2d -AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3 SHA512 2ff8f701f7fe3a2ab7c52c3eb473b0c31a423e83f4b7c2de59ab8d6676d492665ea104cb44ff20d437d3e6f8a8cbf6efac7f3b8703ae47f2d2d03e7e450f71df WHIRLPOOL 1cbf51fdc2677b74361372bb6d743624ba5cfe025e5a25118b31896fc0312836035725a55bb2681c62046c47a03bdd782d7388abfcad4e00809259bbcd66189d DIST qemu-kvm-0.15.1.tar.gz 5915998 SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e SHA512 d0f1a10c18157bfaed159f63dc954781c7051eda118652295dbb4203c7f2b8abf1b4b137d8c69d85f7662f145dad0a6a0243fc8029d15648439431b55e07fe8a WHIRLPOOL 42346ae1825d9f25925e179147c21625d1eca6cc35ecf4a2913e39ab72e938bc0497bf06fe749a094cf15ea81e21feb8c17da04cc7e94f39cd0f81fe62deb654 DIST qemu-kvm-1.0.1.tar.gz 6214796 SHA256 57bcd26342af2303663028db9e9956a8b487babfcf2a432ac3351c88b8e2bf4f SHA512 31f0a8fc2d03a15b7a382a77b67183d792fb765b25241a6b80c14f64fbcd52064392f47bc21da48fc54bdc5b8da70542ddeb47394348304d9bfcf3421eb11b2f WHIRLPOOL febf169830f9c2631f5fcb5d97a9fdd6c138c3455e97243d086fd827776ece16cc70d8a1c787e55dd43ac0c01c2b07c01fc2ec2f74d09ca4efc3be52f7e804b0 -DIST qemu-kvm-1.1.0-bp-1.tar.xz 3428 SHA256 5cfc39b126f0b804ca469e9e45d5207db1cb949eaf784a960b68fd05858a98d2 SHA512 75665dad1b4a048a071fc036a64cbccaa399974c6faa5d0541806b1af2439cc47d26c6ec901205a5fcd2e0f9680393889f6ed926065c53107410070e53d096a9 WHIRLPOOL 7b1712f3c21df279f3939b81b59042160132cd617de54adcf66b394c78598ebeec8137d26587cf1a4d02944ea56075434778285b84b47c265972b76e258a1dfe -DIST qemu-kvm-1.1.0.tar.gz 6598841 SHA256 c32445f4610e324f0f5c34d00d055dd8b4154705968d59588efe60a8fd80ecbf SHA512 ae18901de93652e026d01de1af923b1cd6abbc623934944a7e8bcd151f731deba4ef66a32f7940b6d7ac8c8a0fbc8a6435fbf416ef423be5908b170d3f4b82d2 WHIRLPOOL dad81e28b046225384f081fba5dc61a3a00c288a5925993045936203720b0e288eaba61038713a959d65d5701c3d90405d46c361546f6edd55ac6c1adc8a31cb DIST qemu-kvm-1.1.1-bp-1.tar.xz 2908 SHA256 16b7cd2e10b3a05d20006898bcfdb26eb596f7c7d3c0e18fb216cb2b2026af40 SHA512 781eae1fdc1cb7482d3d6fd1cf81e0d565588e3987fc4cab92abc06741b1b57d999b0de1fffce7270f50033b53c5707e4ef477ca3b7ddfca3dc1a432c1e15cc7 WHIRLPOOL 3f80b4cc9902021686bea823a41af136d21dd5a6b8aa59913aeb8697c3a38acc02d92ee59b9d052b6d161830a72d709fe684beb95f756a92216fe79cce4c5d9a DIST qemu-kvm-1.1.1.tar.gz 6599376 SHA256 c6fab57ccadcad5deb34728623840a0141a0f3c8f29d0c253db577f059c796df SHA512 1106a35212cdac1fe5b043af6754595d03232f22bf74cdab86973759adb3cff2d3d7b42290883d2d99d97d163fe274de0108a05eed906ffdc3349c0631f52492 WHIRLPOOL 4d9b2b788a7f87104032635b3b6e2cd96275b92683e3003510b0951536ed6bcb959959bc7529e3f912a7a2055b5c1710b9310d591a8b443a17a231e5b86f6105 EBUILD qemu-kvm-0.15.1-r1.ebuild 9562 SHA256 4cc8feb7ebd3bf188db3e445eb0fde6b9b54fec8d921dac18d2609d301cd93b2 SHA512 cd0e0fed0d7087bef1cb5b04ab53cffe6ae1fef9fa74772ccd6ee569e5dc2ccd9a26ad308b5e189a69dcd66a22e14dd98c5ec96fdce64724e2c3547075c5ce3a WHIRLPOOL f4ae05b7018ad7f9433a38be46bce84f5571527775e7d2259b83c57fcad4fef6a1ae8de1b1ae6e8204441d41ff7f3ba9073fd4f1bfb56801951beade24188df9 EBUILD qemu-kvm-1.0.1-r1.ebuild 12217 SHA256 a5de4936ba34566a0e1f18bbe8e4e42c5ebd24c3c8178b3fc5060a956774f60f SHA512 f40f470facd48c17e8cf526428f7e69d25c119c8e5a124492be47f5096a62032b5d38ccea20603a5adecc220b74050583c86033bfe67a463197f996c32296a1c WHIRLPOOL 685f5b7883ca99783424dcb4f321f6d817523201a66a9bba7612435f8c8d29aeab444a37dcb822fefab986e41e9ae9454bb572d80333ede9d43ae0866cd4bd4f EBUILD qemu-kvm-1.0.1.ebuild 11494 SHA256 d0ddd2e3127b87ac1c35a34e88c6d2ba2266684198a64c36da8a0a1e2cb30ccf SHA512 46c20f22a55432df629a6558a013ec8d27afb877bb622b5dd46d8c545e8a65fba730346159ac0d5d5e71b6de5f3c8deb9d30b63b5dbb611f1b98a982777becb5 WHIRLPOOL d7d8f90da9614b497af75ddecf5e38768d9ee280610964fcff6c77cc095f94c59d5814c3821e068bb60764b653fedf2c6ea80b12e179a6fa6485702ee30c2baf -EBUILD qemu-kvm-1.1.0.ebuild 11807 SHA256 8c2e6029e429a2a33c27eb483e9a7eebc71f5109266a546af6b60f4613bcf62a SHA512 8cd13a43366ffec54df336907cfa8e9d6d83b630350a4bc4d37a2df265f6960ada3f85f536fd5e3da66ff82ba1ed98b1ce97e1d1cbca81987100e71e28b5e95b WHIRLPOOL 162975d6e26d49b7e8ca014c353c6d69c4dddc111e378e3c74e6f0273f56b598cc648465cbd42a572d8ed6123a2c4e44f5ed1ec4f81f59340ae62dde273a62ea EBUILD qemu-kvm-1.1.1-r1.ebuild 11611 SHA256 b5e134606e4278c61919f352172234a4b9c2def816737d440d5db7fe0964649b SHA512 fe36148787172e171142bb826eba8440a9ee8db2bef94b3e495cd4daf420c96c4e5a083057f9d6f438e1bcad63b46181d920a2f0e8036d4fcc0cc068ef8abd00 WHIRLPOOL d67d8c6b9ccb2c1ca1dab66b1487a2cddd4ba7c37cb38e2280b9a316af885ed54cf5c2410d2a856b55657aeb592b71895025a565908ba7ab713d15799801ee76 EBUILD qemu-kvm-9999.ebuild 11816 SHA256 580b60f250899dce8b33c1ae9514942663010a3fb527f0e5e1dfb2c48b9583c1 SHA512 5568fa917f7b42cba35111d79177c7cbea5067fd9f580fe91fb26ff55e7e8d8fb5f4677585f14d0b1ba1d69a9b746da998868b412fd373c83f45a66ee82b544c WHIRLPOOL 92427f26b73f6b8e45ffc81fb8d33109f98da1eaa104655e056af3c9e98740c58f420ab16611eafa551d60ad3d6ff03b470f9c7d69e8fae75b0906f830f1cadc -MISC ChangeLog 28741 SHA256 9b6cc5b19e904a2b0d5c806e55580eda84c3d92d3f7e34662be1116007d3f0ce SHA512 63b635bc2a8f3ec49e78656df5c1d4e75c95501db0534797c8e8a3192b968bc8b2f8610674bd4a79667b02975139ff45b13111aa79279ba896ad95ee5ee96bab WHIRLPOOL dae7be3e305323cd1ed0dce849d3ce385f47fede5637fea3e8666d70c3a475a3f051432a0959f6d2e743d9b46dc5f354b3ba9f289f6616b5914e1f1925357a8c +MISC ChangeLog 29041 SHA256 c78d6cabddddb6e80803bb7b1904889122aa09d5a75c17c80df022978053f7b0 SHA512 f484c1122143ce04190d8c5569966b36d6512997986c9eba8b4b588f27a0d3fe2975dd4098b578462d8ab22178ea2a8a471cf678076ff803f2d4f5e0892b93cf WHIRLPOOL c33e8262f22b3765d94b5ea292fd341fd6e2ee816f03a7f7de5f3515be9480ca80566542468516bb30b11d663991b527a9202225bdb92e6e8260c2f4c1e58ac2 MISC metadata.xml 2416 SHA256 1613b0e695f6cdd5c21b0b6e5f470adc250b261a8a40bfb3c7f246d3f590acf9 SHA512 e6906e146aded4f9e182fc8da99a578800b91287f5d5446c53d08ae764304c2ca02002098f61032f547873f808554cac2d4b29115ce0dcea36df41e9e6667ec8 WHIRLPOOL da9ff6660bb89b3b4077bfb52f18098eb7392ac0e1af05028950c9843c03be6f6a0765ec9577e6a0d8f36fd6b130828c52f31a0d020034531a944dca516009e3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCgAGBQJQHt6cAAoJEOTDgjZ80txd6msH/Aw0ASber7q2bcxmiMEKCaAW -3o8Q3rnC6EqmBB0c9RjDlOZRK4SROeWVbxPqdvZpxOF/ykTcQbEdbN/3P6kSwwS4 -nhpzOwGaGyPIy2fKIZoHIJF5VInNTU2iOS/mz/DDwKhm7ECEofP+fyX3bgSlQTti -XWwZ9fiWtKaWdLTeP55UXxB+E80In/ZrTWmqi+IwKhad+z30BAevFB50NIvs04QE -DsdUJ1+ryC3VtH+H7uZdhyNP0h5hm/UXRo7Iw2bI9r20pldjwugSuGm0Fb5DrvaD -mDfb0qejJbVvjZbVmp7eqCJK7LjeofnWLW7yCviQpuKGFe5rITuKXFltk2BCVrw= -=6qSV ------END PGP SIGNATURE----- diff --git a/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules b/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules deleted file mode 100644 index c2f7317aacca..000000000000 --- a/app-emulation/qemu-kvm/files/65-gentoo-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch b/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch deleted file mode 100644 index 909deadf42e3..000000000000 --- a/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-fix-crash-with-sdl.patch +++ /dev/null @@ -1,145 +0,0 @@ -From ff5414990645653bf43bf64adfc1ca77ffb9edcb Mon Sep 17 00:00:00 2001 -From: malc <av1474@comtv.ru> -Date: Sun, 17 Jan 2010 00:25:29 +0300 -Subject: [PATCH] Revert "sdlaudio: make it suck less" - -This reverts commit 4839abe78fd466a3cf06faa7c362154afd5404f1. - -The commit was badly broken, Gentoo has sdl as the default driver, -consequently 5 gentoo users have hit the breakage and were kind enough -to report, so thank you: - -Claes Gyllenswrd -vekin -Chris - -But above all thanks to Toralf Foerster who actually provied enough -information to pinpoint the breakage to sdlaudio. - -http://bugs.gentoo.org/show_bug.cgi?id=294269 ---- - audio/sdlaudio.c | 80 +++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 50 insertions(+), 30 deletions(-) - -diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c -index aa39c33..8e7e5cb 100644 ---- a/audio/sdlaudio.c -+++ b/audio/sdlaudio.c -@@ -41,8 +41,8 @@ - typedef struct SDLVoiceOut { - HWVoiceOut hw; - int live; -+ int rpos; - int decr; -- int pending; - } SDLVoiceOut; - - static struct { -@@ -225,10 +225,6 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) - HWVoiceOut *hw = &sdl->hw; - int samples = len >> hw->info.shift; - -- if (sdl_lock (s, "sdl_callback")) { -- return; -- } -- - if (s->exit) { - return; - } -@@ -236,34 +232,49 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) - while (samples) { - int to_mix, decr; - -- while (!sdl->pending) { -- if (sdl_unlock (s, "sdl_callback")) { -- return; -- } -- -- sdl_wait (s, "sdl_callback"); -- if (s->exit) { -- return; -- } -- -- if (sdl_lock (s, "sdl_callback")) { -- return; -- } -- sdl->pending += sdl->live; -- sdl->live = 0; -+ /* dolog ("in callback samples=%d\n", samples); */ -+ sdl_wait (s, "sdl_callback"); -+ if (s->exit) { -+ return; -+ } -+ -+ if (sdl_lock (s, "sdl_callback")) { -+ return; -+ } -+ -+ if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->samples)) { -+ dolog ("sdl->live=%d hw->samples=%d\n", -+ sdl->live, hw->samples); -+ return; -+ } -+ -+ if (!sdl->live) { -+ goto again; - } - -- to_mix = audio_MIN (samples, sdl->pending); -- decr = audio_pcm_hw_clip_out (hw, buf, to_mix, 0); -- buf += decr << hw->info.shift; -+ /* dolog ("in callback live=%d\n", live); */ -+ to_mix = audio_MIN (samples, sdl->live); -+ decr = to_mix; -+ while (to_mix) { -+ int chunk = audio_MIN (to_mix, hw->samples - hw->rpos); -+ struct st_sample *src = hw->mix_buf + hw->rpos; -+ -+ /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */ -+ hw->clip (buf, src, chunk); -+ sdl->rpos = (sdl->rpos + chunk) % hw->samples; -+ to_mix -= chunk; -+ buf += chunk << hw->info.shift; -+ } - samples -= decr; -+ sdl->live -= decr; - sdl->decr += decr; -- sdl->pending -= decr; -- } - -- if (sdl_unlock (s, "sdl_callback")) { -- return; -+ again: -+ if (sdl_unlock (s, "sdl_callback")) { -+ return; -+ } - } -+ /* dolog ("done len=%d\n", len); */ - } - - static int sdl_write_out (SWVoiceOut *sw, void *buf, int len) -@@ -281,9 +292,18 @@ static int sdl_run_out (HWVoiceOut *hw, int live) - return 0; - } - -- sdl->live = live; -- decr = sdl->decr; -- sdl->decr = 0; -+ if (sdl->decr > live) { -+ ldebug ("sdl->decr %d live %d sdl->live %d\n", -+ sdl->decr, -+ live, -+ sdl->live); -+ } -+ -+ decr = audio_MIN (sdl->decr, live); -+ sdl->decr -= decr; -+ -+ sdl->live = live - decr; -+ hw->rpos = sdl->rpos; - - if (sdl->live > 0) { - sdl_unlock_and_post (s, "sdl_run_out"); --- -1.7.0.4 - diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-include-madvise-defines.patch b/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-include-madvise-defines.patch deleted file mode 100644 index c50c7172f3c6..000000000000 --- a/app-emulation/qemu-kvm/files/qemu-kvm-0.12.3-include-madvise-defines.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- exec.c 2010-02-26 03:34:00.000000000 +0100 -+++ exec.c.new 2010-04-03 15:31:53.000000000 +0200 -@@ -22,6 +22,9 @@ - #else - #include <sys/types.h> - #include <sys/mman.h> -+#ifndef MADV_MERGEABLE -+#include <asm/mman.h> -+#endif - #endif - #include <stdlib.h> - #include <stdio.h> diff --git a/app-emulation/qemu-kvm/files/qemu-kvm-guest-hang-on-usb-add.patch b/app-emulation/qemu-kvm/files/qemu-kvm-guest-hang-on-usb-add.patch deleted file mode 100644 index 3f2abefe879c..000000000000 --- a/app-emulation/qemu-kvm/files/qemu-kvm-guest-hang-on-usb-add.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 485b75728884a052b74d5458199ad45f0acbf190 Mon Sep 17 00:00:00 2001 -From: Timothy Jones <one.timothy.jones@gmail.com> -Date: Mon, 28 Jun 2010 10:38:18 -0400 -Subject: [PATCH v2] Guest OS hangs on usb_add - -This is a small patch to sligtly "intelligentify" usb device and -config descriptor parsing and to handle bug with certain usb -device (URC MX-950) reporting device desriptor length as 0x18 -instead of 18 with added vendor_id/product_id check ---- - hw/usb.h | 5 +++++ - usb-linux.c | 37 ++++++++++++++++++++++--------------- - 2 files changed, 27 insertions(+), 15 deletions(-) - -diff --git a/hw/usb.h b/hw/usb.h -index 00d2802..5c3528f 100644 ---- a/hw/usb.h -+++ b/hw/usb.h -@@ -117,6 +117,11 @@ - #define USB_DT_INTERFACE 0x04 - #define USB_DT_ENDPOINT 0x05 - -+#define USB_DT_DEVICE_LEN 18 -+#define USB_DT_CONFIG_LEN 9 -+#define USB_DT_INTERFACE_LEN 9 -+#define USB_DT_ENDPOINT_LEN 7 -+ - #define USB_ENDPOINT_XFER_CONTROL 0 - #define USB_ENDPOINT_XFER_ISOC 1 - #define USB_ENDPOINT_XFER_BULK 2 -diff --git a/usb-linux.c b/usb-linux.c -index 88273ff..2ac6562 100644 ---- a/usb-linux.c -+++ b/usb-linux.c -@@ -288,7 +288,7 @@ static void async_cancel(USBPacket *unused, void *opaque) - - static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) - { -- int dev_descr_len, config_descr_len; -+ int dev_descr_len, config_descr_total_len; - int interface, nb_interfaces; - int ret, i; - -@@ -297,32 +297,39 @@ static int usb_host_claim_interfaces(USBHostDevice *dev, int configuration) - - DPRINTF("husb: claiming interfaces. config %d\n", configuration); - -- i = 0; - dev_descr_len = dev->descr[0]; -- if (dev_descr_len > dev->descr_len) { -+ if (dev_descr_len == 0x18 && dev->descr[ 8] == 0x47 && dev->descr[ 9] == 0x46 -+ && dev->descr[10] == 0x00 && dev->descr[11] == 0x30) -+ dev_descr_len = USB_DT_DEVICE_LEN; /* for buggy MX-950 remote reporting len in hex */ -+ -+ if (dev_descr_len > dev->descr_len || dev_descr_len < USB_DT_DEVICE_LEN || dev->descr[1] != USB_DT_DEVICE) { -+ fprintf(stderr, "husb: invalid device descriptor\n"); - goto fail; - } - -- i += dev_descr_len; -- while (i < dev->descr_len) { -+ for (i = dev_descr_len; i < dev->descr_len; ) { - DPRINTF("husb: i is %d, descr_len is %d, dl %d, dt %d\n", - i, dev->descr_len, - dev->descr[i], dev->descr[i+1]); - -- if (dev->descr[i+1] != USB_DT_CONFIG) { -- i += dev->descr[i]; -- continue; -+ if (dev->descr[i] < 2) { -+ fprintf(stderr, "husb: invalid descriptor\n"); -+ goto fail; - } -- config_descr_len = dev->descr[i]; -+ if (dev->descr[i+1] == USB_DT_CONFIG) { -+ config_descr_total_len = dev->descr[i+2] + (dev->descr[i+3] << 8); - -- printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration); -+ printf("husb: config #%d need %d\n", dev->descr[i + 5], configuration); - -- if (configuration < 0 || configuration == dev->descr[i + 5]) { -- configuration = dev->descr[i + 5]; -- break; -- } -+ if (configuration < 0 || configuration == dev->descr[i + 5]) { -+ configuration = dev->descr[i + 5]; -+ break; -+ } - -- i += config_descr_len; -+ i += config_descr_total_len; -+ } -+ else -+ i += dev->descr[i]; - } - - if (i >= dev->descr_len) { --- -1.7.1 - diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild deleted file mode 100644 index 0b8b74c9f996..000000000000 --- a/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild +++ /dev/null @@ -1,369 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.1.0.ebuild,v 1.14 2012/07/28 22:20:23 cardoe Exp $ - -EAPI="4" - -PYTHON_DEPEND="2" -inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user -BACKPORTS=1 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" - inherit git-2 - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz - ${BACKPORTS:+ - http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.xz}" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="http://www.linux-kvm.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \ -kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \ -smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs" - -COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb" -IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32" - -# Setup the default SoftMMU targets, while using the loops -# below to setup the other targets. x86_64 should be the only -# defaults on for qemu-kvm -IUSE="${IUSE} +qemu_softmmu_targets_x86_64" - -for target in ${IUSE_SOFTMMU_TARGETS}; do - if [ "x${target}" = "xx86_64" ]; then - continue - fi - IUSE="${IUSE} qemu_softmmu_targets_${target}" -done - -for target in ${IUSE_USER_TARGETS}; do - IUSE="${IUSE} qemu_user_targets_${target}" -done - -REQUIRED_USE="static? ( !alsa !pulseaudio ) - amd64? ( qemu_softmmu_targets_x86_64 ) - x86? ( qemu_softmmu_targets_x86_64 ) - virtfs? ( xattr )" - -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -RDEPEND=" - !app-emulation/kqemu - !app-emulation/qemu - !<app-emulation/qemu-1.0 - >=dev-libs/glib-2.0 - media-libs/libpng - sys-apps/pciutils - virtual/jpeg - amd64? ( >=sys-firmware/seabios-1.7.0 - sys-firmware/vgabios ) - x86? ( >=sys-firmware/seabios-1.7.0 - sys-firmware/vgabios ) - aio? ( dev-libs/libaio ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bluetooth? ( net-wireless/bluez ) - brltty? ( app-accessibility/brltty ) - caps? ( sys-libs/libcap-ng ) - curl? ( >=net-misc/curl-7.15.4 ) - fdt? ( >=sys-apps/dtc-1.2.0 ) - kernel_linux? ( >=sys-apps/util-linux-2.16.0 ) - ncurses? ( sys-libs/ncurses ) - opengl? ( virtual/opengl ) - pulseaudio? ( media-sound/pulseaudio ) - python? ( =dev-lang/python-2*[ncurses] ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] ) - !static? ( >=media-libs/libsdl-1.2.11[X] ) ) - static? ( sys-libs/zlib[static-libs(+)] ) - !static? ( sys-libs/zlib ) - smartcard? ( dev-libs/nss ) - spice? ( >=app-emulation/spice-protocol-0.8.1 - static? ( >=app-emulation/spice-0.9.0[static-libs] ) - !static? ( >=app-emulation/spice-0.9.0 ) - ) - tls? ( net-libs/gnutls ) - usbredir? ( sys-apps/usbredir ) - vde? ( net-misc/vde ) - virtfs? ( sys-libs/libcap ) - xattr? ( sys-apps/attr ) - xen? ( app-emulation/xen-tools ) - xfs? ( sys-fs/xfsprogs )" - -DEPEND="${RDEPEND} - app-text/texi2html - virtual/pkgconfig - kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )" - -STRIP_MASK="/usr/share/qemu/palcode-clipper" - -QA_PRESTRIPPED=" - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/palcode-clipper" - -QA_WX_LOAD="${QA_PRESTRIPPED} - usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requres a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CHECK_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL" - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi -} - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup - - enewgroup kvm 78 -} - -src_prepare() { - # Alter target makefiles to accept CFLAGS set via flag-o - sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ - Makefile Makefile.target || die - - # remove part to make udev happy - #sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die - - python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat" - - [[ -n ${BACKPORTS} ]] && \ - EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ - epatch - - epatch_user -} - -src_configure() { - local conf_opts audio_opts user_targets - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - use "qemu_softmmu_targets_${target}" && \ - softmmu_targets="${softmmu_targets} ${target}-softmmu" - done - - for target in ${IUSE_USER_TARGETS} ; do - use "qemu_user_targets_${target}" && \ - user_targets="${user_targets} ${target}-linux-user" - done - - if [[ -z ${softmmu_targets} ]]; then - eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm" - die "At least 1 SoftMMU target must be enabled" - else - einfo "Building the following softmmu targets: ${softmmu_targets}" - fi - - if [[ -n ${user_targets} ]]; then - einfo "Building the following user targets: ${user_targets}" - conf_opts="${conf_opts} --enable-linux-user" - else - conf_opts="${conf_opts} --disable-linux-user" - fi - - # Fix QA issues. QEMU needs executable heaps and we need to mark it as such - conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap" - - # Add support for static builds - use static && conf_opts="${conf_opts} --static --disable-pie" - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if ! use static && gcc-specs-pie; then - conf_opts="${conf_opts} --enable-pie" - fi - - # audio options - audio_opts="oss" - use alsa && audio_opts="alsa ${audio_opts}" - use pulseaudio && audio_opts="pa ${audio_opts}" - use sdl && audio_opts="sdl ${audio_opts}" - - # conditionally making UUID work on Linux only is wrong - # but the Gentoo/FreeBSD guys need to figure out what - # provides libuuid on their platform - # --enable-vnc-thread will go away in 1.2 - # $(use_enable xen xen-pci-passthrough) for 1.2 - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-bsd-user \ - --disable-libiscsi \ - --disable-strip \ - --disable-werror \ - --enable-guest-agent \ - --enable-vnc-jpeg \ - --enable-vnc-png \ - --enable-vnc-thread \ - --python=python2 \ - $(use_enable aio linux-aio) \ - $(use_enable bluetooth bluez) \ - $(use_enable brltty brlapi) \ - $(use_enable caps cap-ng) \ - $(use_enable curl) \ - $(use_enable debug debug-info) \ - $(use_enable debug debug-mon) \ - $(use_enable debug debug-tcg) \ - $(use_enable doc docs) \ - $(use_enable fdt) \ - $(use_enable kernel_linux kvm) \ - $(use_enable kernel_linux kvm-device-assignment) \ - $(use_enable kernel_linux nptl) \ - $(use_enable kernel_linux uuid) \ - $(use_enable ncurses curses) \ - $(use_enable opengl) \ - $(use_enable rbd) \ - $(use_enable sasl vnc-sasl) \ - $(use_enable sdl) \ - $(use_enable smartcard smartcard) \ - $(use_enable smartcard smartcard-nss) \ - $(use_enable spice) \ - $(use_enable tci tcg-interpreter) \ - $(use_enable tls vnc-tls) \ - $(use_enable usbredir usb-redir) \ - $(use_enable vde) \ - $(use_enable vhost-net) \ - $(use_enable virtfs) \ - $(use_enable xattr attr) \ - $(use_enable xen) \ - $(use_enable xfs xfsctl) \ - --audio-drv-list="${audio_opts}" \ - --target-list="${softmmu_targets} ${user_targets}" \ - --cc="$(tc-getCC)" \ - --host-cc="$(tc-getBUILD_CC)" \ - ${conf_opts} \ - || die "configure failed" - - # this is for qemu upstream's threaded support which is - # in development and broken - # the kvm project has its own support for threaded IO - # which is always on and works - # --enable-io-thread \ - - # FreeBSD's kernel does not support QEMU assigning/grabbing - # host USB devices yet - use kernel_FreeBSD && \ - sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak -} - -src_install() { - emake DESTDIR="${ED}" install - - if [[ -n ${softmmu_targets} ]]; then - if use kernel_linux; then - insinto /lib/udev/rules.d/ - doins "${FILESDIR}"/65-kvm.rules - fi - - if use qemu_softmmu_targets_x86_64 ; then - dobin "${FILESDIR}"/qemu-kvm - ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed" - ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit" - ewarn "your libvirt configs or other wrappers for ${PN}" - else - elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install" - elog "of /usr/bin/qemu-kvm and /usr/bin/kvm" - fi - fi - - dodoc Changelog MAINTAINERS TODO pci-ids.txt - newdoc pc-bios/README README.pc-bios - - if use doc; then - dohtml qemu-doc.html qemu-tech.html || die - fi - - use python & dobin scripts/kvm/kvm_stat - - # FIXME: Need to come up with a solution for non-x86 based systems - if use x86 || use amd64; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - - # Remove vgabios since we're using the vgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin - dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin - dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin - dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]]; then - elog "If you don't have kvm compiled into the kernel, make sure you have" - elog "the kernel module loaded before running kvm. The easiest way to" - elog "ensure that the kernel module is loaded is to load it on boot." - elog "For AMD CPUs the module is called 'kvm-amd'" - elog "For Intel CPUs the module is called 'kvm-intel'" - elog "Please review /etc/conf.d/modules for how to load these" - elog - elog "Make sure your user is in the 'kvm' group" - elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." - elog - elog "The ssl USE flag was renamed to tls, so adjust your USE flags." - elog "The nss USE flag was renamed to smartcard, so adjust your USE flags." - fi -} |