From 80e2afa97be66b3b6286bb2fc8fc7c9e49f46f8c Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 26 Feb 2012 00:58:05 +0100 Subject: [PATCH 1/3] dom0/qvm-core: add missing get_xid --- dom0/qvm-core/qubes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index f1753bd7..339462ca 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -1163,6 +1163,7 @@ class QubesVm(object): def start_qrexec_daemon(self, verbose = False): if verbose: print >> sys.stderr, "--> Starting the qrexec daemon..." + xid = self.get_xid() retcode = subprocess.call ([qrexec_daemon_path, str(xid)]) if (retcode != 0) : self.force_shutdown() From 628458108d30e3dcd71a8a0d6346e9fecff98877 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 27 Feb 2012 03:30:35 +0100 Subject: [PATCH 2/3] dom0/qvm-core: fix kernelopts parsing in case of QubesHVM --- dom0/qvm-core/qubes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 339462ca..7b0910b2 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -2526,8 +2526,9 @@ class QubesVmCollection(dict): if "uses_default_kernelopts" in kwargs: 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") + if "kernelopts" not in kwargs: kwargs["uses_default_kernelopts"] = True return kwargs From fda02f66b29b7c6957924e371b60aa3876e21fd0 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 27 Feb 2012 14:58:46 +0100 Subject: [PATCH 3/3] vchan: fix compile error --- vchan/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vchan/init.c b/vchan/init.c index d0127939..a8192bf9 100644 --- a/vchan/init.c +++ b/vchan/init.c @@ -32,10 +32,11 @@ #include #include #include -#include #include "libvchan.h" #ifndef CONFIG_STUBDOM #include "../u2mfn/u2mfnlib.h" +#else +#include #endif static int ring_init(struct libvchan *ctrl)