Roy Golan has uploaded a new change for review. Change subject: core: pass MaxNumberOfSockets to create verb ......................................................................
core: pass MaxNumberOfSockets to create verb in order to generate a correct topology xml-node for libvirt VDSM needs also the MaxNumberOfSockets Change-Id: I68368fdd40f0e43df18465c15faf2626789ee1c7 Bug-Url: https://bugzilla.redhat.com/1121295 Signed-off-by: Roy Golan <rgo...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java 2 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/31054/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java index b9d571f..89573eb 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java @@ -189,6 +189,7 @@ public static final String num_of_cpus = "smp"; public static final String cores_per_socket = "smpCoresPerSocket"; public static final String max_number_of_cpus = "maxVCpus"; + public static final String max_number_of_sockets = "maxNumberOfSockets"; public static final String cpuPinning = "cpuPinning"; public static final String vm_name = "vmName"; public static final String vm_guid = "vmId"; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java index a311b98..56d7b34 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilderBase.java @@ -66,15 +66,23 @@ createInfo.put(VdsProperties.mem_size_mb, vm.getVmMemSizeMb()); createInfo.put(VdsProperties.mem_guaranteed_size_mb, vm.getMinAllocatedMem()); createInfo.put(VdsProperties.smartcardEnabled, Boolean.toString(vm.isSmartcardEnabled())); - createInfo.put(VdsProperties.num_of_cpus, - String.valueOf(vm.getNumOfCpus())); + createInfo.put(VdsProperties.num_of_cpus, String.valueOf(vm.getNumOfCpus())); if (Config.<Boolean> getValue(ConfigValues.SendSMPOnRunVm)) { - createInfo.put(VdsProperties.cores_per_socket, - (Integer.toString(vm.getCpuPerSocket()))); - if (FeatureSupported.supportedInConfig(ConfigValues.HotPlugCpuSupported, - vm.getVdsGroupCompatibilityVersion(), vm.getClusterArch())) { - createInfo.put(VdsProperties.max_number_of_cpus, - String.valueOf(Config.<Integer> getValue(ConfigValues.MaxNumOfVmCpus, vm.getVdsGroupCompatibilityVersion().getValue()))); + createInfo.put(VdsProperties.cores_per_socket, (Integer.toString(vm.getCpuPerSocket()))); + createInfo.put( + VdsProperties.max_number_of_sockets, + Config.<Integer> getValue( + ConfigValues.MaxNumOfVmSockets, + vm.getVdsGroupCompatibilityVersion().getValue()).toString()); + if (FeatureSupported.supportedInConfig( + ConfigValues.HotPlugCpuSupported, + vm.getVdsGroupCompatibilityVersion(), + vm.getClusterArch())) { + createInfo.put( + VdsProperties.max_number_of_cpus, + Config.<Integer> getValue( + ConfigValues.MaxNumOfVmCpus, + vm.getVdsGroupCompatibilityVersion().getValue()).toString()); } } final String compatibilityVersion = vm.getVdsGroupCompatibilityVersion().toString(); -- To view, visit http://gerrit.ovirt.org/31054 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68368fdd40f0e43df18465c15faf2626789ee1c7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Roy Golan <rgo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
