diff options
4 files changed, 77 insertions, 4 deletions
diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index d82990b8f6d7..b2e692cee6b1 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/libvirt # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.195 2012/07/08 04:12:16 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.196 2012/07/08 04:23:26 cardoe Exp $ + + 07 Jul 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild, + +files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.pat + ch: + Add a patch to whitelist rbd migration since its now good in 0.9.13 07 Jul 2012; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.13.ebuild, metadata.xml: diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index f8979999ef32..97e95864a317 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,3 +1,4 @@ +AUX libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch 2399 SHA256 70530b03f5b41292feed0a67f5ee7c2574b0564873c77c2804ea6ad71c222358 SHA512 c5f6f40669d4a78c0957fcf4c3566faf32d8caab212456a9979c500d427620c23f59dda98a9d426ae6a0b30656ea3ef4b4696ee15747d82e8b1170849f39cee4 WHIRLPOOL a0b8e244e84127844361142f0adc0fee9f9e87378b4bf7108622ae6bd0b882a7631bacfc961160690120c0de3ac2353ea9aac981049b62ba6cb745f04ce40071 AUX libvirtd.confd-r2 1749 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c SHA512 c4c3150d35d3542b323991b32e2a09237a357d93753e641ae088b9697649fe58e878ed572c79c98e77e3d23f07e0e710ca812e8d4294e653bf6d5f183b666633 WHIRLPOOL a49eb7141052c18a5b1b35c48f9016d46946f8dcb9ed8a42e35a25c61ca6b919cfb4021374e685777fc01815bf45f6f90c6206d12ccdb4ca773a3e9e0e29d400 AUX libvirtd.confd-r3 1757 SHA256 60f341dcf33ca8d55b6394ba6cf8e22f5133393e47f827b88cef1243c255f15c SHA512 f65484ab52a5c4d0f7f1e6e7be9c379617d773b18e81ac875d628a0d9a2b5ae68d256dc1e29ca756d5216d52728bdc80da1afdd89977e6670da3a6dbd3aecc78 WHIRLPOOL 34e98b2cd72466a1152e41ea7b34533337e4aec3cf347cd75e766143b576462110bdb2ee691268ceaea0cfe6aba2a5b6bcdedc662ae6a66cc14e0099523c8e20 AUX libvirtd.init-r5 3572 SHA256 6c04449123ebb5d5736e53a81325f66a0db52cc19c7a6c80ba5f599a3687569f SHA512 bd11dfbd4ccf884b3b6f501bb3b2799f0d001b60eb9ec16167ac757066cf34ef5f22409fc97354596fb7d2a6701e023faf4a43f767df34a1070365731780b2b2 WHIRLPOOL 670e0918536745a6dd6de00bd9bef7b4d540be386d855fdd064ceb471a4f1e17d3dbac963f63f3c8f51985df7e60562775d01a14c86ebd3a8f96cc943cea7fd0 @@ -14,8 +15,8 @@ EBUILD libvirt-0.9.11.3.ebuild 8690 SHA256 27f8be21525191a791e783d80a7f59ee212f9 EBUILD libvirt-0.9.11.4.ebuild 8719 SHA256 b71026df5ca4ee90e5abbc4d6f94ab99d9b044bdc0f478233830b72233f3501c SHA512 d9cabfcc4465ea342daf8b8a49b378de7c5cced1c35c5c3f0afc6aa2df9498d5d7e148da90be0c46a71a1dbf07d13f0cda803542e4b95be857485efe8b4cdfa7 WHIRLPOOL 76d3d82aee5b8ec02d9ae25aa7892240e811eda30a37783c575e8f7b8b1be9e2c52ebfaf71eef4e4d5917e72cb30925c62c8079d27506ddbae17596f355586b3 EBUILD libvirt-0.9.12-r1.ebuild 10353 SHA256 2083781e89483e8dca012ddc71f526380f704cac3acf19dafa2f17d22d35c544 SHA512 45c6de7858d5ec022515f35efd6532fa79db6da1085557457a6c649cec71ed499bf1b692b1af6fd65cb04d12b80ba5e3255331544b49152e82bec8761d80b736 WHIRLPOOL 8f6ceed8eb27dcb905d298caf44a0f78398c36e21576ef6db69a6c499f90330928d4b21e1d065b2a11b9ef782dc694c4995d403f5624fa4e85984481721a9372 EBUILD libvirt-0.9.12.ebuild 10224 SHA256 bdc672b8cb37d4cc51a19588d399852f1717089610240a11e71fcd4930e3835f SHA512 35d63ce710b905ab38882f045aa4b33db838d0c643042d476f0279910435549683952eeb3b84f638e0d2c605c48ca08225aa38a8f019090558ddb14df95f19d4 WHIRLPOOL e3a52096c334ef1209b7f6a32ec397f3261031b52431d83f6b84c2ac698bf1ccc08fe4cd582e4e02683943250271867d26bb619fa16a500e306569fa963d7965 -EBUILD libvirt-0.9.13.ebuild 10494 SHA256 09826263562e883f669324fcb8b92f5a8c1e3a7de55281af12ec5197f9d243e0 SHA512 051c209e813f1ab03e853d5525bb5f36b1ae502d5393cd03454e0338adec72d224ebe068069f5af5ae0c7ef723479b2128002fa93c8b56d0c4e3f03226238b3c WHIRLPOOL b70ced4fc454cd1ea11615c0c55ba8c950cd0ca45885f8b2677a10aa325298a4eac79d5db793efe0b4a04a8aed9e57982c36a38bd1ae77cc48171c1ca1811b7a +EBUILD libvirt-0.9.13.ebuild 10580 SHA256 847189e0aaae7d2972b4aa9c982c24eb540a2ffa2623eabb417607047e1493a5 SHA512 3df8844105e615f5b892a14f5b5810845f029b12ed21653414937eceee0e1190d02b51b2622442e3b25645cb7afd612b1d2e4acc5a93fdfab032fd7b33b33f4b WHIRLPOOL 86f8e6c38ccde58e4945c95caaa5afd049f87facadf16f8c0b29f44cf5a95e27edbe8607c706db2dfeb4fd596f9169ac1ee4564c47da1d2d28900886f0f78c2e EBUILD libvirt-0.9.8.ebuild 8137 SHA256 2892e8b77eab033b317847974b67212bede163a77449b2be5097abd9ae9dfd44 SHA512 de4716161495c5b142598daf6994b4ffc8faf169976f222aa809c3b953f97f4a8e8bb66fcf510a9c11c45b4037e4df48efc48e8dd60089aab2fec276abd66251 WHIRLPOOL 557497a58cb87c3b2a5031a428197c2cdfafc7161369a5716c58c88cac24320b781540334fbe938288626486bfac68c11607e6143c9cfe530bed7487337364e0 EBUILD libvirt-9999.ebuild 10349 SHA256 62ae9e1daff84437904c87954dd7c5d2dc34a8119e9dffd770fa1515bc757f99 SHA512 06c1e295c455c800e89c6a58a097925cb0912a8e83b0dbdf81351289d3585e23921eb5466ee10511fa13478e7cb1eeb0286521b6d1b7288c48509fa1e0b35228 WHIRLPOOL d94e0f4b7ddd7b1bbbd39f17852e8a9af45cce3b53639e4732bdb3fc193655025cd842d3b613327f26a6da76af5046648744ebaf7ac8f610a4d424c342639e43 -MISC ChangeLog 38719 SHA256 49ba2b7d99e9183af9d7dcc14c274eb760dc0f2bf8e070af4b3d1cc5da033d7e SHA512 a4dcc0110117125bdd7150c8a5111737a9b2aa19f8f0245ef01dc923927c818e5168d9873a8213c7baa8d7ec38836b1e48f8ced8038ed239824fda5f084f7dd3 WHIRLPOOL e53bea8f7ee5c429b64411b5c1a86305ddd2d77faf1e0e5e241b064e49dd70dccd2162b7898e09fbb6ee9faa5bd8e82638a0738b3b09524c253750675e63d029 +MISC ChangeLog 38949 SHA256 c13f2c6769a0e995bb9912594f3793454cb00343287541091ecdf5f8f40bb3cd SHA512 c2f8ceee42670549e7d4443226da121488d9d0dfc61420f096576d299c67d65145c84fe6e8b8cf85c5cae19f221a43e4226e337273a9f1704a70b909eaa20622 WHIRLPOOL 041ccd3c7923ca88b8f6b9dcdcc5dd55eae9a0b8db03973f6a972fbe78043fc4c5d2c19acc22bb4a1ce80cd07794b6dd1c7daec82e3b70cecafc6854b2759dea MISC metadata.xml 3420 SHA256 0916b94209d91c7a809069e61f788a9f6115ce9081758a90330f29a3249c9be5 SHA512 8acd907b424ef3500112d5834fba026146636948675381a3a07c1837968f2ebb146b0afa2a9d56225d9af008ade51d46022ba1c03d5e02de0e6e7f3678be4091 WHIRLPOOL c0e4dea1775586184c261a406556eed83f3f26782bfb770e055df8531b0643c62e0f8a6ac3f1243c8cdd1e931f17020d72704178a33e8b5eb4f23f24cf4f7354 diff --git a/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch b/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch new file mode 100644 index 000000000000..982d49fa2b61 --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-0.9.13-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch @@ -0,0 +1,65 @@ +From 78290b1641e95304c862062ee0aca95395c5926c Mon Sep 17 00:00:00 2001 +From: Josh Durgin <josh.durgin@inktank.com> +Date: Mon, 2 Jul 2012 11:55:26 -0700 +Subject: [PATCH 01/24] qemu: add rbd to whitelist of migration-safe formats + +QEMU (and librbd) flush the cache on the source before the +destination starts, and the destination does not read any +changeable data before that, so live migration with rbd caching +is safe. + +This makes 'virsh migrate' work with rbd and caching without the +--unsafe flag. + +Reported-by: Vladimir Bashkirtsev <vladimir@bashkirtsev.com> +Signed-off-by: Josh Durgin <josh.durgin@inktank.com> +--- + .mailmap | 3 ++- + AUTHORS | 2 +- + src/qemu/qemu_migration.c | 3 +++ + 3 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/.mailmap b/.mailmap +index 65e2c10..a6744ac 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -28,7 +28,8 @@ + <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com> + <neil@aldur.co.uk> <neil@brightbox.co.uk> + <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com> +-<josh.durgin@dreamhost.com> <joshd@hq.newdream.net> ++<josh.durgin@inktank.com> <joshd@hq.newdream.net> ++<josh.durgin@inktank.com> <josh.durgin@dreamhost.com> + + # Name consolidation: + # Preferred author spelling <preferred email> +diff --git a/AUTHORS b/AUTHORS +index 375db24..0e179a9 100644 +--- a/AUTHORS ++++ b/AUTHORS +@@ -144,7 +144,7 @@ Patches have also been contributed by: + Hu Tao <hutao@cn.fujitsu.com> + Laurent Léonard <laurent@open-minds.org> + MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp> +- Josh Durgin <josh.durgin@dreamhost.com> ++ Josh Durgin <josh.durgin@inktank.com> + Roopa Prabhu <roprabhu@cisco.com> + Paweł Krześniak <pawel.krzesniak@gmail.com> + Kay Schubert <kayegypt@web.de> +diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c +index 48369d6..f51c99a 100644 +--- a/src/qemu/qemu_migration.c ++++ b/src/qemu/qemu_migration.c +@@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def) + continue; + else if (cfs < 0) + return false; ++ } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && ++ disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { ++ continue; + } + + qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", +-- +1.7.8.6 + diff --git a/app-emulation/libvirt/libvirt-0.9.13.ebuild b/app-emulation/libvirt/libvirt-0.9.13.ebuild index b7b9e9b824a5..5c73c392d7ad 100644 --- a/app-emulation/libvirt/libvirt-0.9.13.ebuild +++ b/app-emulation/libvirt/libvirt-0.9.13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.3 2012/07/08 04:12:16 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.13.ebuild,v 1.4 2012/07/08 04:23:26 cardoe Exp $ EAPI=4 @@ -160,6 +160,8 @@ src_prepare() { EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ epatch + epatch "${FILESDIR}/${P}-qemu-add-rbd-to-whitelist-of-migration-safe-formats.patch" + if [[ ${PV} = *9999* ]]; then # git checkouts require bootstrapping to create the configure script. |