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

Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-02-27 15:00:54 +01:00
commit 54b08ee0f9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom0/qvm-core/qubes.py
View File

@ -1192,6 +1192,7 @@ class QubesVm(object):
def start_qrexec_daemon(self, verbose = False): def start_qrexec_daemon(self, verbose = False):
if verbose: if verbose:
print >> sys.stderr, "--> Starting the qrexec daemon..." print >> sys.stderr, "--> Starting the qrexec daemon..."
xid = self.get_xid()
retcode = subprocess.call ([qrexec_daemon_path, str(xid)]) retcode = subprocess.call ([qrexec_daemon_path, str(xid)])
if (retcode != 0) : if (retcode != 0) :
self.force_shutdown() self.force_shutdown()
@ -2556,8 +2557,9 @@ class QubesVmCollection(dict):
if "uses_default_kernelopts" in kwargs: if "uses_default_kernelopts" in kwargs:
kwargs["uses_default_kernelopts"] = False if kwargs["uses_default_kernelopts"] == "False" else True kwargs["uses_default_kernelopts"] = False if kwargs["uses_default_kernelopts"] == "False" else True
if "kernelopts" not in kwargs or kwargs["kernelopts"] == "None": if "kernelopts" in kwargs and kwargs["kernelopts"] == "None":
kwargs.pop("kernelopts") kwargs.pop("kernelopts")
if "kernelopts" not in kwargs:
kwargs["uses_default_kernelopts"] = True kwargs["uses_default_kernelopts"] = True
return kwargs return kwargs

3
vchan/init.c
View File

@ -32,10 +32,11 @@
#include <xenctrl.h> #include <xenctrl.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <mm.h>
#include "libvchan.h" #include "libvchan.h"
#ifndef CONFIG_STUBDOM #ifndef CONFIG_STUBDOM
#include "../u2mfn/u2mfnlib.h" #include "../u2mfn/u2mfnlib.h"
#else
#include <mm.h>
#endif #endif
static int ring_init(struct libvchan *ctrl) static int ring_init(struct libvchan *ctrl)