Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a58259a171
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
						
						
						Conflicts:
	version_dom0
	version_vm 
						
					 | 
					
						2012-03-09 10:19:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							ceed4507eb
							
						
					 | 
					
						
						
							
							dom0/qvm-network: implement dynamic switching in property setter (#478)
						
						
						
						
						
						
						
						Also add to it missing parts: firewall reload and netid attr set (+perms for it) 
						
					 | 
					
						2012-03-09 01:52:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							d91bbdb3dd
							
						
					 | 
					
						
						
							
							dom0/qvm-block: add support for md devices (#476)
						
						
						
						
						
					 | 
					
						2012-03-09 00:04:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c174d0c184
							
						
					 | 
					
						
						
							
							dom0/qvm-block: ignore unsupported devices istead of throw exception (#476)
						
						
						
						
						
					 | 
					
						2012-03-09 00:00:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d5f54c976
							
						
					 | 
					
						
						
							
							dom0/qvm-firewall: make firewall IP-based, not IF-based
						
						
						
						
						
						
						
						Some VMs (especially HVM) can have more than one vif, so to not dupplicate
rules, make it IP based. 
						
					 | 
					
						2012-03-08 14:50:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							cae2672171
							
						
					 | 
					
						
						
							
							dom0/qvm-firewall: make firewall IP-based, not IF-based
						
						
						
						
						
						
						
						Some VMs (especially HVM) can have more than one vif, so to not dupplicate
rules, make it IP based. 
						
					 | 
					
						2012-03-08 14:40:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c794d95e2
							
						
					 | 
					
						
						
							
							dom0/core: pause also stubdom when pausing HVM
						
						
						
						
						
					 | 
					
						2012-03-08 12:19:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							07f560042c
							
						
					 | 
					
						
						
							
							dom0/core: use QubesVm.pause/unpause instead of xl directly
						
						
						
						
						
					 | 
					
						2012-03-08 12:04:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc283e22c8
							
						
					 | 
					
						
						
							
							dom0/core: use QubesVm.pause/unpause instead of xl directly
						
						
						
						
						
					 | 
					
						2012-03-08 12:03:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc573d0467
							
						
					 | 
					
						
						
							
							dom0/core: follow new __init__ API in QubesHVm
						
						
						
						
						
					 | 
					
						2012-03-08 11:57:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							567229c104
							
						
					 | 
					
						
						
							
							dom0/core: follow new __init__ api in subclasses
						
						
						
						
						
					 | 
					
						2012-03-08 11:57:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							63e19e1afa
							
						
					 | 
					
						
						
							
							dom0/core: follow new __init__ api in subclasses
						
						
						
						
						
					 | 
					
						2012-03-08 11:56:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							de9f952a2e
							
						
					 | 
					
						
						
							
							dom0/core: more generic way to specify xen config template
						
						
						
						
						
					 | 
					
						2012-03-08 11:54:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							8433931822
							
						
					 | 
					
						
						
							
							dom0/core: major rework of QubesVm.__init__ and serialization
						
						
						
						
						
						
						
						No more manually set attributes, each in different way. Now there is one dict
with attrs, defaults, used also for object serialization to XML. 
						
					 | 
					
						2012-03-08 11:27:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							07d7620f23
							
						
					 | 
					
						
						
							
							dom0/core: major rework of QubesVm.__init__ and serialization
						
						
						
						
						
						
						
						No more manually set attributes, each in different way. Now there is one dict
with attrs, defaults, used also for object serialization to XML. 
						
					 | 
					
						2012-03-08 11:22:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							9360a18b0c
							
						
					 | 
					
						
						
							
							dom0/QubesVm: add include_in_backups property
						
						
						
						
						
					 | 
					
						2012-03-07 19:16:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6c222d957
							
						
					 | 
					
						
						
							
							dom0/QubesVm: add include_in_backups property
						
						
						
						
						
					 | 
					
						2012-03-07 19:15:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d07bc718b
							
						
					 | 
					
						
						
							
							dom0/dispvm: clone QubesVmLabel object for DispVM
						
						
						
						
						
					 | 
					
						2012-03-07 19:04:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3d0afc360
							
						
					 | 
					
						
						
							
							dom0/dispvm: clone QubesVmLabel object for DispVM
						
						
						
						
						
					 | 
					
						2012-03-07 18:50:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2c62b9424
							
						
					 | 
					
						
						
							
							dom0/dispvm: icons for DispVM
						
						
						
						
						
						
						
						Beautiful icons thanks to Agnieszka Kostrzewa! 
						
					 | 
					
						2012-03-07 17:13:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b29a09986
							
						
					 | 
					
						
						
							
							dom0/dispvm: icons for DispVM
						
						
						
						
						
						
						
						Beautiful icons thanks to Agnieszka Kostrzewa! 
						
					 | 
					
						2012-03-07 17:04:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a717b3755e
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py 
						
					 | 
					
						2012-03-06 02:21:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b1c48666f
							
						
					 | 
					
						
						
							
							dom0/qvm-core: network parameters for use in Xen config template
						
						
						
						
						
					 | 
					
						2012-03-06 02:20:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5c69af852
							
						
					 | 
					
						
						
							
							dom0/core: netvm_vm -> netvm - HVM-specific
						
						
						
						
						
					 | 
					
						2012-03-04 22:00:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							63b51e41ce
							
						
					 | 
					
						
						
							
							dom0/core: change QubesVm.netvm_vm to QubesVm.netvm
						
						
						
						
						
						
						
						To simplify setters and getters. 
						
					 | 
					
						2012-03-04 22:00:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							7db35b7ce6
							
						
					 | 
					
						
						
							
							dom0/core: change QubesVm.netvm_vm to QubesVm.netvm
						
						
						
						
						
						
						
						To simplify setters and getters. 
						
					 | 
					
						2012-03-04 21:59:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c40bb7fd69
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
					 | 
					
						2012-03-02 16:31:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7b5260bd7
							
						
					 | 
					
						
						
							
							dom0/core: preserve MAC setting on clone
						
						
						
						
						
					 | 
					
						2012-03-02 16:29:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4b639cbb3
							
						
					 | 
					
						
						
							
							dom0/core: clone support for HVM
						
						
						
						
						
					 | 
					
						2012-03-02 16:28:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							abb9e64e3f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
						
						
						Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-prefs 
						
					 | 
					
						2012-03-02 16:21:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c9075d09b
							
						
					 | 
					
						
						
							
							dom0/qvm-network: allow to set persistent MAC for VM
						
						
						
						
						
					 | 
					
						2012-03-02 16:07:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f87303b69
							
						
					 | 
					
						
						
							
							dom0/core: rework of VM clone mechanism
						
						
						
						
						
					 | 
					
						2012-03-02 16:06:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							5191c64b06
							
						
					 | 
					
						
						
							
							dom0/core: more robust XML attrs generation
						
						
						
						
						
						
						
						Still not ideal... 
						
					 | 
					
						2012-03-02 16:00:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d554fd182
							
						
					 | 
					
						
						
							
							dom0/core: set default memory for HVM to 512MB
						
						
						
						
						
					 | 
					
						2012-03-02 14:28:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c2311226e
							
						
					 | 
					
						
						
							
							dom0/network: use static MAC for VMs
						
						
						
						
						
					 | 
					
						2012-03-02 13:51:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4b23f6670
							
						
					 | 
					
						
						
							
							dom0/network: use static MAC for VMs
						
						
						
						
						
					 | 
					
						2012-03-02 13:49:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							cec197ac8b
							
						
					 | 
					
						
						
							
							dom0/core: set *_img to None for HVM instead of removing attr
						
						
						
						
						
						
						
						There are many places that assume existence of this attributes. 
						
					 | 
					
						2012-03-02 12:04:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1bd26ebe0
							
						
					 | 
					
						
						
							
							dom0/core: get stubdom xid also for paused domains
						
						
						
						
						
						
						
						Especially during HVM startup. 
						
					 | 
					
						2012-03-02 02:38:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							287e9f72fe
							
						
					 | 
					
						
						
							
							dom0/core: provide vif name also for paused VMs
						
						
						
						
						
					 | 
					
						2012-03-02 02:28:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a387393b43
							
						
					 | 
					
						
						
							
							dom0/core: provide vif name also for paused HVMs
						
						
						
						
						
					 | 
					
						2012-03-02 02:27:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							f31422cbb3
							
						
					 | 
					
						
						
							
							dom0/core: provide vif name also for paused VMs
						
						
						
						
						
					 | 
					
						2012-03-02 02:26:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							f06d309a69
							
						
					 | 
					
						
						
							
							dom0/qvm-core: create icon symlink for HVM
						
						
						
						
						
					 | 
					
						2012-03-02 01:56:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							25b57bab88
							
						
					 | 
					
						
						
							
							dom0/appmenus: Create "Start" appmenu for HVM domains
						
						
						
						
						
					 | 
					
						2012-03-02 01:56:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							4749792e70
							
						
					 | 
					
						
						
							
							dom0/qvm-core: force HVM to be updateable
						
						
						
						
						
					 | 
					
						2012-03-02 01:56:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							afecabdc59
							
						
					 | 
					
						
						
							
							dom0/qvm-firewall: provide custom vif name by QubesHVM
						
						
						
						
						
					 | 
					
						2012-03-02 01:56:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							997fec6fd6
							
						
					 | 
					
						
						
							
							dom0/qvm-firewall: provide vif name by QubesVM
						
						
						
						
						
					 | 
					
						2012-03-02 01:22:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c13c1c920f
							
						
					 | 
					
						
						
							
							dom0/qvm-firewall: provide vif name by QubesVM
						
						
						
						
						
					 | 
					
						2012-03-02 01:16:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							370c4952ce
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
					 | 
					
						2012-03-01 23:40:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcf6957e85
							
						
					 | 
					
						
						
							
							dom0/core: xvdi is to high for qemu
						
						
						
						
						
					 | 
					
						2012-03-01 11:23:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							45c1c01410
							
						
					 | 
					
						
						
							
							dom0/core: use xvdi as cdrom frontend
						
						
						
						
						
						
						
						When used both xvd* and hd* only xvd* isn't detected. 
						
					 | 
					
						2012-03-01 11:00:33 +01:00 | 
					
					
						
						
							
							
							
						
					 |