Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							68ad60c1b3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into core3-devel  
						
						... 
						
						
						
						Conflicts:
	core/qubes.py
	doc/Makefile
	doc/manpages/qvm-prefs.rst
	doc/qvm-tools/qvm-add-appvm.rst
	doc/qvm-tools/qvm-backup-restore.rst
	doc/qvm-tools/qvm-backup.rst
	doc/qvm-tools/qvm-block.rst
	doc/qvm-tools/qvm-clone.rst
	doc/qvm-tools/qvm-firewall.rst
	doc/qvm-tools/qvm-ls.rst
	doc/qvm-tools/qvm-pci.rst
	doc/qvm-tools/qvm-run.rst
	doc/qvm-tools/qvm-shutdown.rst
	doc/qvm-tools/qvm-start.rst
	doc/qvm-tools/qvm-template-commit.rst
	qvm-tools/qvm-ls
	qvm-tools/qvm-prefs
	qvm-tools/qvm-remove
	tests/__init__.py
	vm-config/xen-vm-template.xml 
						
					 
					
						2016-11-30 03:07:39 +01:00 
						 
				 
			
				
					
						
							
							
								Jean-Philippe Ouellet 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6ddf141376 
							
						 
					 
					
						
						
							
							Implement qvm-ls --list-fields  
						
						
						
					 
					
						2016-11-27 01:12:53 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							44d3d8ac94 
							
						 
					 
					
						
						
							
							Merge branch 'docs-fixups'  
						
						... 
						
						
						
						* docs-fixups:
  docs: fix qvm-firewall description 
						
					 
					
						2016-10-03 11:44:34 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7ae55d46b2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qubesos/pr/50'  
						
						... 
						
						
						
						Edit in merge commit: remove trailing whitespaces. 
						
					 
					
						2016-09-01 05:16:55 +02:00 
						 
				 
			
				
					
						
							
							
								Nicklaus McClendon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b6416dcc4b 
							
						 
					 
					
						
						
							
							Updated manpages to match current tool options  
						
						
						
					 
					
						2016-08-19 01:51:41 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							88cb62fcf6 
							
						 
					 
					
						
						
							
							core: add pci_e820_host property  
						
						... 
						
						
						
						Enable e820_host option for VMs with PCI devices (to allow VM kernel to
deal with address space conflicts). But add a property to allow
disabling it.
Fixes  QubesOS/qubes-issues#2019  
						
					 
					
						2016-06-04 16:52:02 +02:00 
						 
				 
			
				
					
						
							
							
								Axon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5b2df611e6 
							
						 
					 
					
						
						
							
							Clarify descriptions of qvm-backup-restore options  
						
						
						
					 
					
						2016-04-01 19:07:16 +00:00 
						 
				 
			
				
					
						
							
							
								Axon 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6901fde56a 
							
						 
					 
					
						
						
							
							Fix typos  
						
						... 
						
						
						
						Most of these typos were corrected in the qubes-doc repo as part of a
larger typo fixing sweet, but those changes were reverted when the pages
were regerenated from source. 
						
					 
					
						2016-04-01 19:06:26 +00:00 
						 
				 
			
				
					
						
							
							
								Danny Fullerton 
							
						 
					 
					
						
						
						
						
							
						
						
							e863b0ea50 
							
						 
					 
					
						
						
							
							Add missing options to qvm-backup-restore doc.  
						
						
						
					 
					
						2016-03-28 20:33:34 -04:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							a78ec67071 
							
						 
					 
					
						
						
							
							doc: Change qvm-service name from "cron" to "crond"  
						
						
						
					 
					
						2015-12-29 14:19:56 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c337494ba6 
							
						 
					 
					
						
						
							
							Add qvm-pci --add-class option for adding all devices of given class  
						
						... 
						
						
						
						This should reduce code duplication in most of initial setup like places
- currently firstboot and live image setup. 
						
					 
					
						2015-11-25 01:34:15 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f01b1e50ad 
							
						 
					 
					
						
						
							
							docs: fix qvm-firewall description  
						
						
						
					 
					
						2015-09-25 22:23:29 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							da0e5dd4ba 
							
						 
					 
					
						
						
							
							core: inherit kernelopts from the template by default  
						
						... 
						
						
						
						Fixes  qubesos/qubes-issues#1091  
					
						2015-08-05 01:43:43 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7e79cd20a8 
							
						 
					 
					
						
						
							
							doc: wrap long lines in qvm-prefs.rst, content unchanged  
						
						
						
					 
					
						2015-08-05 01:34:59 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e50ca5131f 
							
						 
					 
					
						
						
							
							doc: move manpages to common directory  
						
						
						
					 
					
						2015-06-29 17:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							be3e888bbe 
							
						 
					 
					
						
						
							
							Fixed typos  
						
						
						
					 
					
						2015-06-29 17:39:26 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2835238a87 
							
						 
					 
					
						
						
							
							doc: manpage formatting  
						
						
						
					 
					
						2015-06-29 17:39:23 +02:00 
						 
				 
			
				
					
						
							
							
								Wojtek Porczyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1cacc0ac 
							
						 
					 
					
						
						
							
							doc: swallow manpages into sphinx  
						
						
						
					 
					
						2015-06-29 17:39:23 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9cbf9a8a59 
							
						 
					 
					
						
						
							
							Add support for 'pci_strictreset' option  
						
						... 
						
						
						
						This allows to assign PCI device to the VM, even if it doesn't support
proper reset. The default behaviour (when the value is True) is to not
allow such attachment (VM will not start if such device is assigned).
Require libvirt patch for this option. 
						
					 
					
						2015-05-28 00:11:17 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							8aaef404de 
							
						 
					 
					
						
						
							
							qvm-prefs: add an option to get a single VM property  
						
						... 
						
						
						
						Could be useful for scripts 
						
					 
					
						2015-05-15 03:22:06 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							d8533bd061 
							
						 
					 
					
						
						
							
							core: do not reset firewal when setting netvm=none  
						
						... 
						
						
						
						It is no longer needed as qubesos/qubes-issues#862  is implemented. 
						
					 
					
						2015-04-04 21:48:03 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							7516737fae 
							
						 
					 
					
						
						
							
							core: Add "dispvm_netvm" property - NetVM for DispVMs started from a VM  
						
						... 
						
						
						
						This allows to specify tight network isolation for a VM, and finally
close one remaining way for leaking traffic around TorVM. Now when VM is
connected to for example TorVM, its DispVMs will be also connected
there.
The new property can be set to:
 - default (uses_default_dispvm_netvm=True) - use the same NetVM/ProxyVM as the
 calling VM itself - including none it that's the case
 - None - DispVMs will be network-isolated
 - some NetVM/ProxyVM - will be used, even if calling VM is network-isolated
Closes  qubesos/qubes-issues#862  
						
					 
					
						2015-04-04 21:47:31 +02:00 
						 
				 
			
				
					
						
							
							
								qjoo 
							
						 
					 
					
						
						
						
						
							
						
						
							d69b03e5e0 
							
						 
					 
					
						
						
							
							qubes-firewall is not supported in netvms  
						
						
						
					 
					
						2015-03-30 22:31:20 +02:00 
						 
				 
			
				
					
						
							
							
								qjoo 
							
						 
					 
					
						
						
						
						
							
						
						
							9659c33a09 
							
						 
					 
					
						
						
							
							qvm-service: +disable-dns-server/disable-default-route  
						
						... 
						
						
						
						The logic for set-default-route/set-dns-server has been inverted. 
						
					 
					
						2015-03-30 22:31:20 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							db95153619 
							
						 
					 
					
						
						
							
							doc: typo fix  
						
						
						
					 
					
						2015-01-30 01:40:41 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							2f7b3adeec 
							
						 
					 
					
						
						
							
							doc: qvm-create-default-dvm ( #940 )  
						
						
						
					 
					
						2015-01-30 01:39:59 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							c2675c00e7 
							
						 
					 
					
						
						
							
							doc: sync qvm-service documentation  
						
						
						
					 
					
						2015-01-30 01:39:59 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							59a5ae9415 
							
						 
					 
					
						
						
							
							doc: add qvm-services: set-default-route, set-dns-server  
						
						
						
					 
					
						2015-01-30 01:39:59 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							d23f79d693 
							
						 
					 
					
						
						
							
							doc: update qvm-create man page  
						
						
						
					 
					
						2014-08-12 00:17:45 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							76a82a7d47 
							
						 
					 
					
						
						
							
							doc: update qvm-ls man page  
						
						
						
					 
					
						2014-08-02 23:22:34 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							067876afb6 
							
						 
					 
					
						
						
							
							doc: typo fix  
						
						
						
					 
					
						2014-05-10 20:37:41 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							cce5210239 
							
						 
					 
					
						
						
							
							doc: update description of network-manager service setting ( #774 )  
						
						... 
						
						
						
						As #774  is resolved, it is no longer true that NetworkManger in
non-NetVM will cause network problems. 
						
					 
					
						2014-04-11 01:31:20 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							a3d02db170 
							
						 
					 
					
						
						
							
							doc: update qvm-prefs doc  
						
						
						
					 
					
						2013-11-21 17:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0c4ea10bda 
							
						 
					 
					
						
						
							
							Move standalone qvm-sync-appmenus to core-dom0-linux  
						
						... 
						
						
						
						It makes no sense to leave standalone tool here while real code is moved
to core-dom0-linux. Also move its manpage. 
						
					 
					
						2013-03-16 18:35:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d9358a91aa 
							
						 
					 
					
						
						
							
							Move manpages here from separate repo  
						
						
						
					 
					
						2013-03-12 17:02:26 +01:00