Arik Hadas has uploaded a new change for review.

Change subject: core: fix cpu info for AMD Opterom Processor G5
......................................................................

core: fix cpu info for AMD Opterom Processor G5

Fix for detecting AMD Opteron Processor G5 as AMD Opteron Processor G4

Change-Id: Ica30c91f572229e9cbd0277dd84852c8f99bd50e
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/24965/1

diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index 5d18204..e69f8e3 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -450,8 +450,8 @@
 select fn_db_add_config_value('SendVmTicketUID','true','3.3');
 select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.0');
 select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.1');
-select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:smx,nx,model_Opteron_G5:Opteron_G5;','3.2');
-select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:smx,nx,model_Opteron_G5:Opteron_G5;','3.3');
+select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5;','3.2');
+select fn_db_add_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5;','3.3');
 select fn_db_add_config_value('ServerRebootTimeout','300','general');
 select fn_db_add_config_value('SetupNetworksPollingTimeout','3','general');
 -- Add shareable disk property in vdc_options to support only 3.1 version.
@@ -748,7 +748,8 @@
 select 
fn_db_update_config_value('RhevhLocalFSPath','/data/images/rhev','general');
 select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3;','3.0');
 select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4;','3.1');
-select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:smx,nx,model_Opteron_G5:Opteron_G5;','3.2');
+select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5;','3.2');
+select fn_db_update_config_value('ServerCPUList','3:Intel Conroe 
Family:vmx,nx,model_Conroe:Conroe; 4:Intel Penryn 
Family:vmx,nx,model_Penryn:Penryn; 5:Intel Nehalem 
Family:vmx,nx,model_Nehalem:Nehalem; 6:Intel Westmere 
Family:aes,vmx,nx,model_Westmere:Westmere; 7:Intel SandyBridge 
Family:vmx,nx,model_SandyBridge:SandyBridge; 8:Intel 
Haswell:vmx,nx,model_Haswell:Haswell; 2:AMD Opteron 
G1:svm,nx,model_Opteron_G1:Opteron_G1; 3:AMD Opteron 
G2:svm,nx,model_Opteron_G2:Opteron_G2; 4:AMD Opteron 
G3:svm,nx,model_Opteron_G3:Opteron_G3; 5:AMD Opteron 
G4:svm,nx,model_Opteron_G4:Opteron_G4; 6:AMD Opteron 
G5:svm,nx,model_Opteron_G5:Opteron_G5;','3.3');
 select fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": 
"RHEV-Spice", "linux" : "xorg-x11-drv-qxl" }','general');
 select 
fn_db_update_config_value('SupportedClusterLevels','3.0,3.1,3.2,3.3','general');
 select 
fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1,3.2,3.3');


-- 
To view, visit http://gerrit.ovirt.org/24965
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica30c91f572229e9cbd0277dd84852c8f99bd50e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to