Commit Graph

1367 Commits

Author SHA1 Message Date
Marek Marczykowski
59e9db28b9 Merge branch 'hvm' of ssh://gitpro.qubes-os.org/var/lib/qubes/git/joanna/core into hvm
Conflicts:
	version_dom0
2012-03-08 18:06:30 +01:00
Marek Marczykowski
2b94ff10d3 Merge branch 'master' into hvm
Conflicts:
	dom0/qvm-core/qubes.py
	version_dom0
	version_vm
2012-03-08 15:03:49 +01:00
Marek Marczykowski
eed0b16174 vm/network: use metric to allow multiple routes to same VM
This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one.
2012-03-08 15:00:24 +01:00
Marek Marczykowski
4d0839d05b vm/network: really place anti-spoof rules in 'raw' table
This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table
2012-03-08 15:00:20 +01:00
Marek Marczykowski
05db5c9f92 vm/network: use metric to allow multiple routes to same VM
This is required when VM has multiple interfaces (eg HVM: PV and stubdom).
Prefer the later one.
2012-03-08 14:57:10 +01:00
Marek Marczykowski
a06c8c3786 vm/network: really place anti-spoof rules in 'raw' table
This fixes commit:
4d68998 vm/network: place anti-spoof rules in 'raw' table
2012-03-08 14:56:39 +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
Joanna Rutkowska
2af085fc0c version 1.7.15 2012-03-08 12:44:41 +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
Joanna Rutkowska
77a1eed064 version 2.0.6 2012-03-07 11:05:14 +01:00
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