Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dispvm-speedup' into dispvm-speedup3

Browse Source 
Conflicts:
	dispvm/qubes-prepare-saved-domain.sh
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-02 03:35:15 +01:00
commit 7265cb9d0f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core-modules/000QubesVm.py
View File

@ -1707,13 +1707,13 @@ class QubesVm(object):
if qmemman_present: if qmemman_present:
qmemman_client.close() qmemman_client.close()
if self._start_guid_first and start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'): if self._start_guid_first and start_guid and os.path.exists('/var/run/shm.id'):
self.start_guid(verbose=verbose, notify_function=notify_function, before_qrexec=True) self.start_guid(verbose=verbose, notify_function=notify_function, before_qrexec=True)
if not preparing_dvm: if not preparing_dvm:
self.start_qrexec_daemon(verbose=verbose,notify_function=notify_function) self.start_qrexec_daemon(verbose=verbose,notify_function=notify_function)
if start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'): if start_guid and os.path.exists('/var/run/shm.id'):
self.start_guid(verbose=verbose, notify_function=notify_function) self.start_guid(verbose=verbose, notify_function=notify_function)
return xid return xid

4
dispvm/qubes-prepare-saved-domain.sh
View File

@ -25,10 +25,11 @@ if ! [ -d $VMDIR ] ; then
echo "$VMDIR does not exist ?" >&2 echo "$VMDIR does not exist ?" >&2
exit 1 exit 1
fi fi
if ! qvm-start $1 --no-guid --dvm ; then if ! qvm-start $1 --dvm ; then
exit 1 exit 1
fi fi
ID=`virsh -c xen:/// domid $1`
echo "Waiting for DVM $1 ..." >&2 echo "Waiting for DVM $1 ..." >&2
if [ -n "$ENCODED_SCRIPT" ] ; then if [ -n "$ENCODED_SCRIPT" ] ; then
qubesdb-write -d $1 /qubes-save-script "$ENCODED_SCRIPT" qubesdb-write -d $1 /qubes-save-script "$ENCODED_SCRIPT"
@ -38,6 +39,7 @@ qubesdb-write -d $1 /qubes-save-request 1
qubesdb-watch -d $1 /qubes-used-mem qubesdb-watch -d $1 /qubes-used-mem
qubesdb-read -d $1 /qubes-gateway | \ qubesdb-read -d $1 /qubes-gateway | \
cut -d . -f 3 | tr -d "\n" > $VMDIR/netvm-id.txt cut -d . -f 3 | tr -d "\n" > $VMDIR/netvm-id.txt
kill `cat /var/run/qubes/guid-running.$ID`
# FIXME: get connection URI from core scripts # FIXME: get connection URI from core scripts
virsh -c xen:/// detach-disk $1 xvdb virsh -c xen:/// detach-disk $1 xvdb
MEM=$(qubesdb-read -d $1 /qubes-used-mem) MEM=$(qubesdb-read -d $1 /qubes-used-mem)