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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							dd88e7d72a
							
						
					 | 
					
						
						
							
							dom0: fix qvm-grow-private (#459)
						
						
						
						
						
					 | 
					
						2012-02-29 23:12:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef6b1ded3e
							
						
					 | 
					
						
						
							
							dom0/qvm-backup-restore: fix restore of dom0-home (#451)
						
						
						
						
						
					 | 
					
						2012-02-29 21:26:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c44032d37a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
					 | 
					
						2012-02-29 03:58:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5ee72c55f
							
						
					 | 
					
						
						
							
							dom0/qvm-backup-restore: show original template name
						
						
						
						
						
					 | 
					
						2012-02-29 03:34:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							e10fa6babd
							
						
					 | 
					
						
						
							
							dom0/qvm-backup-restore: fixes - custom templates, error handling
						
						
						
						
						
					 | 
					
						2012-02-29 03:33:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d739c1909
							
						
					 | 
					
						
						
							
							dom0/qvm-backup-restore: fix restore of StandaloneVM/TemplateVM
						
						
						
						
						
					 | 
					
						2012-02-29 03:17:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7caf5cedc
							
						
					 | 
					
						
						
							
							dom0/qvm-backup: force correct default exclude_list
						
						
						
						
						
						
						
						Treat "None" also as empty list. 
						
					 | 
					
						2012-02-29 03:16:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c013de4747
							
						
					 | 
					
						
						
							
							dom0/qubes-firewall: make protocol selection smart
						
						
						
						
						
					 | 
					
						2012-02-27 15:46:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3356296a5
							
						
					 | 
					
						
						
							
							Merge branch 'master' into hvm
						
						
						
						
						
					 | 
					
						2012-02-27 15:14:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0e9feef92
							
						
					 | 
					
						
						
							
							dom0/qubes-firewall: typo fix
						
						
						
						
						
					 | 
					
						2012-02-27 15:07:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joanna Rutkowska
							
						 
					 | 
					
						
						
						
						
							
						
						
							54b08ee0f9
							
						
					 | 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
						
						
						
						
						
					 | 
					
						2012-02-27 15:00:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joanna Rutkowska
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e0fe6a3d9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm
						
						
						
						
						
					 | 
					
						2012-02-27 13:30:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Joanna Rutkowska
							
						 
					 | 
					
						
						
						
						
							
						
						
							859c99da5c
							
						
					 | 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core
						
						
						
						
						
					 | 
					
						2012-02-27 13:17:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							628458108d
							
						
					 | 
					
						
						
							
							dom0/qvm-core: fix kernelopts parsing in case of QubesHVM
						
						
						
						
						
					 | 
					
						2012-02-27 03:30:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ca08d48b8
							
						
					 | 
					
						
						
							
							dom0/qubes-firewall: allow to specify protocol, do not assume always tcp
						
						
						
						
						
					 | 
					
						2012-02-27 02:02:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							80e2afa97b
							
						
					 | 
					
						
						
							
							dom0/qvm-core: add missing get_xid
						
						
						
						
						
					 | 
					
						2012-02-26 00:58:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							40762c5497
							
						
					 | 
					
						
						
							
							dom0/qvm-core: update icon cache after label change
						
						
						
						
						
					 | 
					
						2012-02-26 00:07:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							40d8ac66a3
							
						
					 | 
					
						
						
							
							dom0/core: introduce QubesHVm class
						
						
						
						
						
					 | 
					
						2012-02-24 04:24:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							85c5074dbe
							
						
					 | 
					
						
						
							
							dom0/core: check if object has attr before using it
						
						
						
						
						
					 | 
					
						2012-02-24 04:22:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b3a895317
							
						
					 | 
					
						
						
							
							dom0/core: more robust XML attrs generation
						
						
						
						
						
						
						
						Still not ideal... 
						
					 | 
					
						2012-02-24 04:19:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							db4a96dfea
							
						
					 | 
					
						
						
							
							dom0/core: move qrexec start to separate function
						
						
						
						
						
					 | 
					
						2012-02-24 04:18:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							104030b15c
							
						
					 | 
					
						
						
							
							dom0/core: more generic way to specify xen config template
						
						
						
						
						
					 | 
					
						2012-02-24 04:17:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c4e1e0b09
							
						
					 | 
					
						
						
							
							dom0/qvm-core: fix icon symlink after label change
						
						
						
						
						
					 | 
					
						2012-02-22 15:14:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							277cdd9173
							
						
					 | 
					
						
						
							
							dom0/backup: Allow to exclude dom0 home from backup
						
						
						
						
						
					 | 
					
						2012-02-17 10:05:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a0a88650d
							
						
					 | 
					
						
						
							
							dom0/qubesutils: typo
						
						
						
						
						
					 | 
					
						2012-02-17 10:01:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							c39fc7f6f1
							
						
					 | 
					
						
						
							
							dom0/qvm-block: fix connecting devices to dom0
						
						
						
						
						
					 | 
					
						2012-02-16 10:25:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							05e89d82fb
							
						
					 | 
					
						
						
							
							dom0/qvm-block: automatically choose frontend device (#419)
						
						
						
						
						
					 | 
					
						2012-02-14 20:57:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							1683a0b815
							
						
					 | 
					
						
						
							
							dom0/qvm-block: detect 'connecting' devices as 'connected'
						
						
						
						
						
						
						
						This is needed to not allow connecting the same backend to more than one VMs at
the same time. 
						
					 | 
					
						2012-02-14 20:55:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Marczykowski
							
						 
					 | 
					
						
						
						
						
							
						
						
							abcdbad209
							
						
					 | 
					
						
						
							
							dom0/qubesutils: move online resize code to QubesVm.resize_private_img() (#421)
						
						
						
						
						
						
						
						This assume that private.img contains ext2/3/4. For now it is true. 
						
					 | 
					
						2012-02-10 20:47:21 +01:00 | 
					
					
						
						
							
							
							
						
					 |