Itamar Heim has posted comments on this change.
Change subject: core: Add Intell Haswel model
......................................................................
Patch Set 1: I would prefer that you didn't submit this
(3 inline comments)
not validating nx would cause live migrations to fail!
....................................................
File backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
Line 418: select fn_db_add_config_value('SendVmTicketUID','true','3.2');
Line 419: select fn_db_add_config_value('ServerCPUList','2:Intel Xeon w/o
XD/NX:vmx,sse2:qemu64,-nx,+sse2; 3:Intel Xeon:vmx,sse2,nx:qemu64,+sse2; 4:Intel
Conroe Family:vmx,sse2,nx,cx16,ssse3:qemu64,+sse2,+cx16,+ssse3; 5:Intel Penryn
Family:vmx,sse2,nx,cx16,ssse3,sse4_1:qemu64,+sse2,+cx16,+ssse3,+sse4.1; 6:Intel
Nehalem
Family:vmx,sse2,nx,cx16,ssse3,sse4_1,sse4_2,popcnt:qemu64,+sse2,+cx16,+ssse3,+sse4.1,+sse4.2,+popcnt;
2:AMD Opteron G1 w/o NX:svm,sse2:qemu64,-nx,+sse2; 3:AMD Opteron
G1:svm,sse2,nx:qemu64,+sse2; 4:AMD Opteron
G2:svm,sse2,nx,cx16:qemu64,+sse2,+cx16; 5:AMD Opteron
G3:svm,sse2,nx,cx16,sse4a,misalignsse,popcnt,abm:qemu64,+sse2,+cx16,+sse4a,+misalignsse,+popcnt,+abm;','2.2');
Line 420: 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');
Line 421: 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');
Line 422: 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,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;','3.2');
convention is we also force the nx flag, see all other models.
Line 423: select fn_db_add_config_value('ServerRebootTimeout','300','general');
Line 424: select
fn_db_add_config_value('SetupNetworksPollingTimeout','3','general');
Line 425: -- Add shareable disk property in vdc_options to support only 3.1
version.
Line 426: select fn_db_add_config_value('ShareableDiskEnabled','false','2.2');
Line 601: select
fn_db_update_config_value('RhevhLocalFSPath','/data/images/rhev','general');
Line 602: select fn_db_update_config_value('ServerCPUList','2:Intel Xeon w/o
XD/NX:vmx,sse2:qemu64,-nx,+sse2; 3:Intel Xeon:vmx,sse2,nx:qemu64,+sse2; 4:Intel
Conroe Family:vmx,sse2,nx,cx16,ssse3:qemu64,+sse2,+cx16,+ssse3; 5:Intel Penryn
Family:vmx,sse2,nx,cx16,ssse3,sse4_1:qemu64,+sse2,+cx16,+ssse3,+sse4.1; 6:Intel
Nehalem
Family:vmx,sse2,nx,cx16,ssse3,sse4_1,sse4_2,popcnt:qemu64,+sse2,+cx16,+ssse3,+sse4.1,+sse4.2,+popcnt;
2:AMD Opteron G1 w/o NX:svm,sse2:qemu64,-nx,+sse2; 3:AMD Opteron
G1:svm,sse2,nx:qemu64,+sse2; 4:AMD Opteron
G2:svm,sse2,nx,cx16:qemu64,+sse2,+cx16; 5:AMD Opteron
G3:svm,sse2,nx,cx16,sse4a,misalignsse,popcnt,abm:qemu64,+sse2,+cx16,+sse4a,+misalignsse,+popcnt,+abm;','2.2');
Line 603: 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');
Line 604: 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');
Line 605: 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,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;','3.2');
i assume you'd get a merge conflict between this patch and the opteron g5 patch?
Line 606: select
fn_db_update_config_value('SignLockFile','/var/lock/ovirt-engine/.openssl.exclusivelock','general');
Line 607: select
fn_db_update_config_value('SpiceDriverNameInGuest','{"windows": "RHEV-Spice",
"linux" : "xorg-x11-drv-qxl" }','general');
Line 608: select
fn_db_update_config_value('SupportedClusterLevels','2.2,3.0,3.1,3.2','general');
Line 609: select
fn_db_update_config_value('SupportedStorageFormats','0,2,3','3.1');
....................................................
Commit Message
Line 3: AuthorDate: 2012-11-21 17:09:30 +0200
Line 4: Commit: Roy Golan <[email protected]>
Line 5: CommitDate: 2012-11-21 17:09:33 +0200
Line 6:
Line 7: core: Add Intell Haswel model
while at it:
s/Haswel/Haswell/...
Line 8:
Line 9: Adding Intel Haswell model to the engine's config
Line 10:
Line 11: Change-Id: I269a041227453fb3af11ce82e0db9694b4be9b01
--
To view, visit http://gerrit.ovirt.org/9392
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I269a041227453fb3af11ce82e0db9694b4be9b01
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <[email protected]>
Gerrit-Reviewer: Itamar Heim <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Sharad Mishra <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
