Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							11575e7fbe 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm  
						
						... 
						
						
						
						Conflicts:
	version_dom0
	version_vm 
						
					 
					
						2012-03-06 22:25:32 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							1cba083205 
							
						 
					 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm  
						
						
						
					 
					
						2012-03-06 22:25:07 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c17893e0d2 
							
						 
					 
					
						
						
							
							version 1.7.14  
						
						
						
					 
					
						2012-03-06 16:07:39 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							694fdd361a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.qubes-os.org/var/lib/qubes/git/joanna/core  
						
						
						
					 
					
						2012-03-06 16:01:12 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							5358795b20 
							
						 
					 
					
						
						
							
							Merge branch 'master' into hvm  
						
						
						
					 
					
						2012-03-06 14:47:20 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a63e130ffb 
							
						 
					 
					
						
						
							
							dom0/qvm-remove: with --just-db do not remove any files  
						
						
						
					 
					
						2012-03-06 14:46:36 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							55c21b2f9e 
							
						 
					 
					
						
						
							
							dom0/hvm-config: add parameters for DHCP server in stubdom  
						
						... 
						
						
						
						This cannot be done via xenstore, because stubdom is started just after
creating (unlike real VM, which is created paused), so there is no time for
creating xenstore entries. 
						
					 
					
						2012-03-06 04:24:56 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							478b90e720 
							
						 
					 
					
						
						
							
							dom0/qvm-sync-clock: ignore VMs not supporting remote exec ( #467 )  
						
						... 
						
						
						
						Eg HVM 
						
					 
					
						2012-03-05 17:59:23 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							db043c84bc 
							
						 
					 
					
						
						
							
							dom0/sysconfig: load and setup cpufreq-xen if present  
						
						... 
						
						
						
						Required for suspend on Core i5 with pvops kernel. 
						
					 
					
						2012-03-05 12:44:08 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							91ec015486 
							
						 
					 
					
						
						
							
							dom0/sysconfig: enable xenconsoled logging  
						
						
						
					 
					
						2012-03-05 12:31:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d8dc6330df 
							
						 
					 
					
						
						
							
							Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm  
						
						
						
					 
					
						2012-03-04 22:34:22 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6469ff34f5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into hvm  
						
						
						
					 
					
						2012-03-03 02:19:02 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							4d6899827d 
							
						 
					 
					
						
						
							
							vm/network: place anti-spoof rules in 'raw' table  
						
						
						
					 
					
						2012-03-03 01:30:04 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							720bc5c67e 
							
						 
					 
					
						
						
							
							vm/network: replace route in more elegant way  
						
						
						
					 
					
						2012-03-03 01:26:06 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							ee0bdfbcdf 
							
						 
					 
					
						
						
							
							version 2.0.5-dom0  
						
						
						
					 
					
						2012-03-02 16:48:18 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							e574eb8bec 
							
						 
					 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm  
						
						
						
					 
					
						2012-03-02 16:46:39 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3b9d0033 
							
						 
					 
					
						
						
							
							dom0/qvm-prefs: add missing exit(1) on invalid arguments  
						
						
						
					 
					
						2012-03-02 16:17:18 +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 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							4100651d42 
							
						 
					 
					
						
						
							
							version 2.0.4-dom0  
						
						
						
					 
					
						2012-03-02 14:58:29 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							36e0c7518f 
							
						 
					 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm  
						
						
						
					 
					
						2012-03-02 14:48:41 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a54115f73c 
							
						 
					 
					
						
						
							
							dom0/hvm: use stdvga - supports higher resolutions  
						
						
						
					 
					
						2012-03-02 11:44:58 +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 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							7db275ab9c 
							
						 
					 
					
						
						
							
							version 2.0.3  
						
						
						
					 
					
						2012-03-02 02:33:05 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							801590a373 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/marmarek/core into hvm  
						
						
						
					 
					
						2012-03-02 02:29:29 +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 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1fb2360c 
							
						 
					 
					
						
						
							
							Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm  
						
						
						
					 
					
						2012-03-02 02:25:24 +01:00 
						 
				 
			
				
					
						
							
							
								Joanna Rutkowska 
							
						 
					 
					
						
						
						
						
							
						
						
							10ad03b4a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.qubes-os.org/joanna/core into hvm  
						
						... 
						
						
						
						Conflicts:
	version_dom0
	version_vm 
						
					 
					
						2012-03-02 02:24: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