Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							32255a7916 
							
						 
					 
					
						
						
							
							Reverted Storage ←→ Pool dependency  
						
						... 
						
						
						
						- Storage() operates on a pool and in future on multiple pools 
						
					 
					
						2016-04-25 07:17:16 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							9d646aabd3 
							
						 
					 
					
						
						
							
							Add volume_config to AppVM and TemplateVM  
						
						
						
					 
					
						2016-04-25 07:17:13 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							428dd5bc1b 
							
						 
					 
					
						
						
							
							QubesVM.dir_path is set independent of storage  
						
						
						
					 
					
						2016-04-25 07:16:37 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							cc7dd625d9 
							
						 
					 
					
						
						
							
							Loop over QubesVM.block_devices in libvirt xml  
						
						
						
					 
					
						2016-04-25 07:16:36 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							ebb79e9c4f 
							
						 
					 
					
						
						
							
							Fix TC_01_Properties/test_030_rename_conflict_app  
						
						
						
					 
					
						2016-04-20 14:02:04 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							f74646fb1b 
							
						 
					 
					
						
						
							
							Assert that a TemplateVM can't have a template  
						
						
						
					 
					
						2016-04-20 13:59:32 +02:00 
						 
				 
			
				
					
						
							
							
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							6aac0a5732 
							
						 
					 
					
						
						
							
							On startup-failure only force_shutdown if running  
						
						... 
						
						
						
						This avoids losing the exception if an exception is raised in
self.force_shutdown(), because the vm is not running or paused 
						
					 
					
						2016-04-20 13:59:17 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2a9752716c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'marmarek/core3-devel-mm' into core3-devel  
						
						
						
					 
					
						2016-04-20 13:55:46 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8fdb264b 
							
						 
					 
					
						
						
							
							qubes/vm/qubesvm: move is_guid_running to GUI extension  
						
						
						
					 
					
						2016-04-20 13:54:56 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2a46abbefd 
							
						 
					 
					
						
						
							
							qubes.vm: implement TemplateVM.appvms property  
						
						
						
					 
					
						2016-04-20 02:28:11 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8c6fe7ed90 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into core3-devel-mm  
						
						
						
					 
					
						2016-04-11 13:03:12 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							424d3054f3 
							
						 
					 
					
						
						
							
							backup: use vm.features to store backup-specific metadata  
						
						... 
						
						
						
						Do not keep them in system qubes.xml. 
						
					 
					
						2016-04-07 13:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							e8f21929ad 
							
						 
					 
					
						
						
							
							backup: by default include all the VMs with vm.include_in_backups  
						
						... 
						
						
						
						If there is a need for more robust default, it should be handled at that
property. 
						
					 
					
						2016-04-07 13:21:00 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							45d6ab3862 
							
						 
					 
					
						
						
							
							qubes/vm: store libvirt config in libvirt.xml, fix rename handling  
						
						
						
					 
					
						2016-04-07 13:03:46 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							7f5feac98b 
							
						 
					 
					
						
						
							
							qubes/vm: fixes for features handling  
						
						... 
						
						
						
						Properly handle 'None' value, there is no difference between empty
string (<x></x>) and no content at all (<x/>). 
						
					 
					
						2016-04-07 13:03:30 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							7cbe2dbd38 
							
						 
					 
					
						
						
							
							qubes/vm: add passio_stderr argument to vm.run_service  
						
						... 
						
						
						
						This allows getting error messages from service call, to provide more
meaningful error messages. 
						
					 
					
						2016-04-07 12:58:05 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							e319639146 
							
						 
					 
					
						
						
							
							qubes/vm: add StandaloneVM class  
						
						
						
					 
					
						2016-04-07 12:57:52 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							15e032cddb 
							
						 
					 
					
						
						
							
							qubes/vm: fix handling "None" kernel  
						
						... 
						
						
						
						The "None" value still makes sense for HVM domains. 
						
					 
					
						2016-03-21 11:44:59 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							29d0baa944 
							
						 
					 
					
						
						
							
							qubes/vm/mix/net: By default MAC is constant  
						
						... 
						
						
						
						MAC address was one place, where qid was leaked to the VM. Different MAC
addresses are not needed, since we do routing, not switching. 
						
					 
					
						2016-03-21 11:44:59 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							04cc2099f7 
							
						 
					 
					
						
						
							
							HVM part 2  
						
						
						
					 
					
						2016-03-21 11:44:54 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							8da7416f30 
							
						 
					 
					
						
						
							
							vm: Remove reference to old libvirt config template  
						
						... 
						
						
						
						This file isn't installed anymore 
						
					 
					
						2016-03-21 11:44:54 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5eaf03c4a2 
							
						 
					 
					
						
						
							
							HVM part 1  
						
						
						
					 
					
						2016-03-21 11:44:46 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d766b8e110 
							
						 
					 
					
						
						
							
							qubes: Fix "unify event names"  
						
						
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9567f7b40b 
							
						 
					 
					
						
						
							
							vm: rename 'yum-proxy-setup' feature to 'updates-proxy-setup'  
						
						... 
						
						
						
						The 'yum-proxy-setup' is deprecated since R3.0, so finally remove old
name.
But add it to R3.x compatibility layer. 
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0f03b257ce 
							
						 
					 
					
						
						
							
							qubes/vm: Fix features coercion  
						
						
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							3b1238f7cf 
							
						 
					 
					
						
						
							
							vm: stub for new firewall API  
						
						... 
						
						
						
						- introduce 'firewall-changed' event
 - add reload_firewall_for_vm stub function
Should that function be private, called only from appropriate event
handlers?
QubesOS/qubes-issues#1815  
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							c99a47d192 
							
						 
					 
					
						
						
							
							vm: fix handling firewall_conf path  
						
						... 
						
						
						
						It may be (and by default is) path relative to VM directory.
This code will be gone in the final version, after merging firewall
configuration into qubes.xml. But for now have something testable. 
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							c9cad71d03 
							
						 
					 
					
						
						
							
							vm/mix/net: create vm.connected_vms dynamically  
						
						... 
						
						
						
						It is much less error-prone way. Previous approach didn't worked because
VMs weren't added here at 'domain-init'/'domain-loaded' event. And even
after adding such handlers it wasn't working because of
QubesOS/qubes-issues#1816 .
It may be a little slower, but since it isn't used so often
(starting/stopping VM and reloading firewall), shouldn't be a problem. 
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3213e7c7 
							
						 
					 
					
						
						
							
							Redo "core: do not reset firewal when setting netvm=none"  
						
						... 
						
						
						
						Apparently it got lost in merge.
QubesOS/qubes-issues#862  
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							736773dbec 
							
						 
					 
					
						
						
							
							vm: remove obsolete firewall handling code  
						
						... 
						
						
						
						There is no vm.write_iptables_xenstore_entry().
QubesOS/qubes-issues#1815  
						
					 
					
						2016-03-21 11:43:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							12f778b539 
							
						 
					 
					
						
						
							
							qubes/vm: do not recursively use repr in BaseVM.__repr__  
						
						... 
						
						
						
						This will easily end up in infinite recursion. For example
'sys-net'.template points at 'fedora-23', which itself has
'fedora-23'.netvm set to 'sys-net'. 
						
					 
					
						2016-03-21 11:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							0f9ca47d90 
							
						 
					 
					
						
						
							
							qubes/ext/guid: Move gui-related code to extension  
						
						
						
					 
					
						2016-03-21 11:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							75dd882b83 
							
						 
					 
					
						
						
							
							qubes: Unify event names  
						
						... 
						
						
						
						Events will be named <object>-[pre-]-<verb>, where verb is in infinitive
form. 
						
					 
					
						2016-03-21 11:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d09bd5ab6a 
							
						 
					 
					
						
						
							
							qubes: Convert QubesVM and Extension discovery to pkg_resources  
						
						... 
						
						
						
						QubesOS/qubes-issues#1238  
					
						2016-03-21 11:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							93686eae06 
							
						 
					 
					
						
						
							
							qubes/vm: change services to features  
						
						
						
					 
					
						2016-03-21 11:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bf78e662f6 
							
						 
					 
					
						
						
							
							Import qubesdb from the new module  
						
						... 
						
						
						
						fixes  QubesOS/qubes-issues#1252  
					
						2016-03-03 01:18:17 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							5375dce90d 
							
						 
					 
					
						
						
							
							Prefer human readable output in qvm-prefs and qubes-prefs tools  
						
						
						
					 
					
						2016-03-03 01:18:17 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							e3c94f3949 
							
						 
					 
					
						
						
							
							core: fix handling numeric label value set  
						
						... 
						
						
						
						Not sure if it should be supported this way, but surely it shouldn't
throw AttributeError. 
						
					 
					
						2016-03-03 01:18:17 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9633573408 
							
						 
					 
					
						
						
							
							core: adjust units comment for host.memory_total, and fix related places  
						
						... 
						
						
						
						QubesOS/qubes-issues#1737  
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							88a63cbe3a 
							
						 
					 
					
						
						
							
							qubes/vm/qubesvm: do not clone VM-specific properties  
						
						... 
						
						
						
						This is reworked
    core: do not clone VM-unique identifiers in clone_properties
by Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> 
						
					 
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							2cbbe0bdb6 
							
						 
					 
					
						
						
							
							core: abandon 'kernels' in VM directory  
						
						... 
						
						
						
						Since we have PV Grub now (which is much more convenient), it is useless
now. 
						
					 
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9428c70d31 
							
						 
					 
					
						
						
							
							core: fix vm.create_on_disk  
						
						... 
						
						
						
						QubesOS/qubes-issues# 
						
					 
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							62759fb1f6 
							
						 
					 
					
						
						
							
							core: move maxmem default initialization to property itself  
						
						... 
						
						
						
						Also fix (for now?) units - memory_total is int bytes while maxmem in
megabytes.
QubesOS/qubes-issues#1737  
						
					 
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							2f3762ee68 
							
						 
					 
					
						
						
							
							core: minor fixes in handling properties  
						
						... 
						
						
						
						Conflicts:
	qubes/vm/qubesvm.py 
						
					 
					
						2016-03-03 01:18:16 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							ab469e4473 
							
						 
					 
					
						
						
							
							vm: fix calling monitor layout notifier  
						
						
						
					 
					
						2016-03-03 01:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							4095f3c5eb 
							
						 
					 
					
						
						
							
							vm: disable uses_custom_config for now  
						
						
						
					 
					
						2016-03-03 01:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							926596cba7 
							
						 
					 
					
						
						
							
							Initialize vm.storage after loading all the properties  
						
						... 
						
						
						
						It needs at least vm.name to be set. 
						
					 
					
						2016-03-03 01:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							3af71ab65d 
							
						 
					 
					
						
						
							
							storage: fix handling netvm and adminvm  
						
						... 
						
						
						
						@woju what was consensus on 'servicevms' dir? Since "being network
provider" is no longer separate type and can be changed during VM
lifetime, maybe we should abandon that idea? Or maybe just set it as VM
property (some storage pool config argument) - that way mgmt stack could
put all the sys-* VMs into separate directory, regardless of the type. 
						
					 
					
						2016-03-03 01:18:06 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c47e29ed50 
							
						 
					 
					
						
						
							
							Fix most errors from pylint  
						
						
						
					 
					
						2016-03-03 01:14:54 +01:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							9eafa57539 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'marmarek/master' into core3-devel  
						
						... 
						
						
						
						The following list is bollocks. There were many, many more.
Conflicts:
    core-modules/003QubesTemplateVm.py
    core-modules/005QubesNetVm.py
    core/qubes.py
    core/storage/__init__.py
    core/storage/xen.py
    doc/qvm-tools/qvm-pci.rst
    doc/qvm-tools/qvm-prefs.rst
    qubes/tools/qmemmand.py
    qvm-tools/qvm-create
    qvm-tools/qvm-prefs
    qvm-tools/qvm-start
    tests/__init__.py
    vm-config/xen-vm-template-hvm.xml
This commit took 2 days (26-27.01.2016) and put our friendship to test.
    --Wojtek and Marek 
						
					 
					
						2016-03-03 01:13:51 +01:00