You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Daan Hoogland <da...@gmail.com> on 2015/07/13 17:30:48 UTC
Re: [2/3] git commit: updated refs/heads/master to 63688e7
LGTM but what PR did I miss here, Wido?
On Mon, Jul 13, 2015 at 4:59 PM, <wi...@apache.org> wrote:
> kvm: Write Libvirt instead of LibVirt
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24f8e66e
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24f8e66e
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24f8e66e
>
> Branch: refs/heads/master
> Commit: 24f8e66e93ed6dedb676593c78ff7d7436a63126
> Parents: 7c37ba7
> Author: Wido den Hollander <wi...@42on.com>
> Authored: Mon Jul 13 16:22:33 2015 +0200
> Committer: Wido den Hollander <wi...@42on.com>
> Committed: Mon Jul 13 16:22:33 2015 +0200
>
> ----------------------------------------------------------------------
> .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24f8e66e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> ----------------------------------------------------------------------
> diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> index ac13308..58a303f 100644
> --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
> @@ -812,7 +812,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
>
> if (_bridgeType == BridgeType.OPENVSWITCH) {
> if (conn.getLibVirVersion() < 10 * 1000 + 0) {
> - throw new ConfigurationException("LibVirt version 0.10.0 required for openvswitch support, but version " + conn.getLibVirVersion() + " detected");
> + throw new ConfigurationException("Libvirt version 0.10.0 required for openvswitch support, but version " + conn.getLibVirVersion() + " detected");
> }
> }
> } catch (final LibvirtException e) {
> @@ -842,7 +842,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
> _guestCpuModel = (String)params.get("guest.cpu.model");
>
> if (_hypervisorLibvirtVersion < 9 * 1000 + 10) {
> - s_logger.warn("LibVirt version 0.9.10 required for guest cpu mode, but version " + prettyVersion(_hypervisorLibvirtVersion) +
> + s_logger.warn("Libvirt version 0.9.10 required for guest cpu mode, but version " + prettyVersion(_hypervisorLibvirtVersion) +
> " detected, so it will be disabled");
> _guestCpuMode = "";
> _guestCpuModel = "";
>
--
Daan
Re: [2/3] git commit: updated refs/heads/master to 63688e7
Posted by Wido den Hollander <wi...@widodh.nl>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 07/13/2015 05:30 PM, Daan Hoogland wrote:
> LGTM but what PR did I miss here, Wido?
>
Uh, oops. None. I completely forgot!
Won't happen again :)
Wido
> On Mon, Jul 13, 2015 at 4:59 PM, <wi...@apache.org> wrote:
>> kvm: Write Libvirt instead of LibVirt
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
>> Commit:
>> http://git-wip-us.apache.org/repos/asf/cloudstack/commit/24f8e66e
>>
>>
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/24f8e66e
>> Diff:
>> http://git-wip-us.apache.org/repos/asf/cloudstack/diff/24f8e66e
>>
>> Branch: refs/heads/master Commit:
>> 24f8e66e93ed6dedb676593c78ff7d7436a63126 Parents: 7c37ba7 Author:
>> Wido den Hollander <wi...@42on.com> Authored: Mon Jul 13 16:22:33
>> 2015 +0200 Committer: Wido den Hollander <wi...@42on.com>
>> Committed: Mon Jul 13 16:22:33 2015 +0200
>>
>> ---------------------------------------------------------------------
- -
>>
>>
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++-
- -
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> ---------------------------------------------------------------------
- -
>>
>>
>>
>>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24f8e66e/plugins/
hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingRe
source.java
>> ---------------------------------------------------------------------
- -
>>
>>
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtC
omputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtC
omputingResource.java
>> index ac13308..58a303f 100644 ---
>> a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/Libvi
rtComputingResource.java
>>
>>
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtC
omputingResource.java
>> @@ -812,7 +812,7 @@ public class LibvirtComputingResource extends
>> ServerResourceBase implements Serv
>>
>> if (_bridgeType == BridgeType.OPENVSWITCH) { if
>> (conn.getLibVirVersion() < 10 * 1000 + 0) { -
>> throw new ConfigurationException("LibVirt version 0.10.0 required
>> for openvswitch support, but version " + conn.getLibVirVersion()
>> + " detected"); + throw new
>> ConfigurationException("Libvirt version 0.10.0 required for
>> openvswitch support, but version " + conn.getLibVirVersion() + "
>> detected"); } } } catch (final LibvirtException e) { @@ -842,7
>> +842,7 @@ public class LibvirtComputingResource extends
>> ServerResourceBase implements Serv _guestCpuModel =
>> (String)params.get("guest.cpu.model");
>>
>> if (_hypervisorLibvirtVersion < 9 * 1000 + 10) { -
>> s_logger.warn("LibVirt version 0.9.10 required for guest cpu
>> mode, but version " + prettyVersion(_hypervisorLibvirtVersion) +
>> + s_logger.warn("Libvirt version 0.9.10 required
>> for guest cpu mode, but version " +
>> prettyVersion(_hypervisorLibvirtVersion) + " detected, so it will
>> be disabled"); _guestCpuMode = ""; _guestCpuModel = "";
>>
>
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJVpAAKAAoJEAGbWC3bPspCnJgQAKSb/FQ8rfwvfJTpwC57ZgNn
Jwsx6PW6KSDz/vYVr9hVqwO7NC1jCzQlSXoTe4W+46FU/KZaDDtq9oBhtgVxZ7dZ
Id7HB/HOTlCOdZIZJIdFZbWYSAgXjf9SwM2PgLnKJ5sGm1RCIKb9oA9YyLVoE+7i
lmHeb2U/lqSvdNBunyjY8ciLuAqP2/ynutB9pOn0SlnzQ5BRkc6jFGXa+IRNW5UA
z5BGhH+fHOv3LiQxHtbNoRl2MSFMPkwhcCrlynV+3F0AFB9d1UA2D5BxJ/KWKa17
MUQvRdJ+d1a8g84KPxgKBsOHa9vIPdihWmGjzb5DogCrEMT73oEAEgih3fEkiKQR
S0HDdCP7pPopkS4BFNoRdyWA0ZtN37aXQS+Z/1fo/8VDQYhbFhemHRVHUdaUc/i6
83oLxERu3r0EKO429/HP7YGtKD4Ge515k/NnFz07SfvtWyFRSYk9010RU7dSiW7d
T0a84X8ZnJ1JkC439TNjMDvZOLWF+yjDWT/lHhH+b7rWf1RuXx/+2aQfeBFdYc44
J0LPj2MtRae1J3jhfBlbdRDZKxX7rsCHUzcAPImh8tjYeh7130qm+NrTgKCI9K3f
ySsz+I6tMapppwhOlA0ARPdfSOFiAyH7bLXeU1qwSlcyCP1HyCigL0huLpOST2Iz
QLDeWJk6daTqKnp+dql6
=VGQM
-----END PGP SIGNATURE-----