Fixes, improvements

Makefile

@@ -170,8 +170,6 @@ endif
 	cp qubes-rpc/qubes.GetRandomizedTime $(DESTDIR)/etc/qubes-rpc/
 	cp qubes-rpc/qubes.NotifyTools $(DESTDIR)/etc/qubes-rpc/
 	cp qubes-rpc/qubes.NotifyUpdates $(DESTDIR)/etc/qubes-rpc/
-	cp qubes-rpc/qubes-notify-updates $(DESTDIR)/usr/libexec/qubes/
-	cp qubes-rpc/qubes-notify-tools $(DESTDIR)/usr/libexec/qubes/
 	install qubes-rpc/qubesd-query-fast $(DESTDIR)/usr/libexec/qubes/
 	for method in $(ADMIN_API_METHODS_SIMPLE); do \
 		ln -s ../../usr/libexec/qubes/qubesd-query-fast \

doc/manpages/qubesd-query.rst

@@ -24,6 +24,12 @@ Options
    Send empty payload. Do not attempt to read anything from standard input, but
    send the request immediately.
 
+.. option:: --fail
+
+   Exit with non-0 exit code when qubesd response is not-OK. By default the tool
+   will exit with 0 when request is successfully delivered to qubesd, regardless
+   of response.
+
 Description
 -----------
 

linux/systemd/qubes-core.service

@@ -17,5 +17,5 @@ ExecStop=-/usr/bin/killall qubesdb-daemon
 
 [Install]
 WantedBy=multi-user.target
-Also=qubes-block-cleaner.service qubes-meminfo-writer.service qubes-qmemman.service
+Also=qubes-meminfo-writer-dom0.service qubes-qmemman.service
 Alias=qubes_core.service

linux/systemd/qubes-vm@.service

@@ -6,7 +6,7 @@ Before=systemd-user-sessions.service
 [Service]
 Type=oneshot
 Environment=DISPLAY=:0
-ExecStart=/usr/bin/qvm-start --no-guid --skip-if-running %i
+ExecStart=/usr/bin/qvm-start --skip-if-running %i
 Group=qubes
 RemainAfterExit=yes
 

qubes-rpc/Makefile

@@ -1,4 +1,4 @@
-CFLAGS=-O3
+CFLAGS=-O2 -g -Wall -Werror -Wextra
 
 all: qubesd-query-fast
 

qubes-rpc/qubes.FeaturesRequest

@@ -1,13 +1,4 @@
-#!/usr/bin/env python2
+#!/bin/sh
 
-import os
-import qubes
-
-PREFIX = '/features-request/'
-
-app = qubes.Qubes()
-vm = app.domains[os.environ['QREXEC_REMOTE_DOMAIN']]
-vm.fire_event('features-request',
-    untrusted_features={key[len(PREFIX):]: vm.qdb.read(key)
-        for key in vm.qdb.list(PREFIX)})
-app.save()
+exec /usr/bin/qubesd-query -c /var/run/qubesd.misc.sock -e --fail \
+         "$QREXEC_REMOTE_DOMAIN" qubes.FeaturesRequest dom0 "" >/dev/null 2>&1

qubes-rpc/qubes.NotifyTools

@@ -1 +1,4 @@
-/usr/libexec/qubes/qubes-notify-tools
+#!/bin/sh
+
+exec /usr/bin/qubesd-query -c /var/run/qubesd.misc.sock -e --fail \
+         "$QREXEC_REMOTE_DOMAIN" qubes.NotifyTools dom0 "" >/dev/null 2>&1

qubes-rpc/qubes.NotifyUpdates

@@ -1 +1,4 @@
-/usr/libexec/qubes/qubes-notify-updates
+#!/bin/sh
+
+exec /usr/bin/qubesd-query -c /var/run/qubesd.misc.sock --fail \
+         "$QREXEC_REMOTE_DOMAIN" qubes.NotifyUpdates dom0 "" >/dev/null 2>&1

qubes-rpc/qubesd-query-fast.c

@@ -8,7 +8,7 @@
 #define QUBESD_SOCKET "/var/run/qubesd.sock"
 
 void write_wrapper(int fd, char *data, size_t len) {
-    int written = 0;
+    size_t written = 0;
     int ret;
     while (written < len) {
         ret = write(fd, data+written, len-written);
@@ -36,7 +36,7 @@ int main(int argc, char **argv) {
         service_name++;
 
     if (!source_domain || !target_domain || !service_name || argc > 2) {
-        fprintf(stderr, "Usage: %s [service-argument]\n");
+        fprintf(stderr, "Usage: %s [service-argument]\n", argv[0]);
         fprintf(stderr, "\n");
         fprintf(stderr, "Expected environment variables:\n");
         fprintf(stderr, " - QREXEC_REMOTE_DOMAIN - source domain for the call\n");

qubes/api/internal.py

@@ -22,9 +22,11 @@
 
 import asyncio
 import json
+import subprocess
 
 import qubes.api
 import qubes.api.admin
+import qubes.vm.adminvm
 import qubes.vm.dispvm
 
 
@@ -51,7 +53,7 @@ def getsysteminfo(self):
                 'type': domain.__class__.__name__,
                 'dispvm_allowed': getattr(domain, 'dispvm_allowed', False),
                 'default_dispvm': (str(domain.default_dispvm) if
-                    domain.default_dispvm else None),
+                    getattr(domain, 'default_dispvm', None) else None),
                 'icon': str(domain.label.icon),
             } for domain in self.app.domains
         }}
@@ -107,3 +109,75 @@ def vm_volume_import_end(self, untrusted_payload):
 
         if not success:
             raise qubes.exc.QubesException('Data import failed')
+
+    @qubes.api.method('internal.SuspendPre', no_payload=True)
+    @asyncio.coroutine
+    def suspend_pre(self):
+        '''
+        Method called before host system goes to sleep.
+
+        :return:
+        '''
+
+        # first notify all VMs
+        processes = []
+        for vm in self.app.domains:
+            if isinstance(vm, qubes.vm.adminvm.AdminVM):
+                continue
+            if vm.is_running():
+                proc = yield from vm.run_service(
+                    'qubes.SuspendPreAll', user='root',
+                    stdin=subprocess.DEVNULL,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL)
+                processes.append(proc)
+
+        # FIXME: some timeout?
+        if processes:
+            yield from asyncio.wait([p.wait() for p in processes])
+
+        coros = []
+        # then suspend/pause VMs
+        for vm in self.app.domains:
+            if isinstance(vm, qubes.vm.adminvm.AdminVM):
+                continue
+            if vm.is_running():
+                coros.append(vm.suspend())
+        if coros:
+            yield from asyncio.wait(coros)
+
+    @qubes.api.method('internal.SuspendPost', no_payload=True)
+    @asyncio.coroutine
+    def suspend_post(self):
+        '''
+        Method called after host system wake up from sleep.
+
+        :return:
+        '''
+
+        coros = []
+        # first resume/unpause VMs
+        for vm in self.app.domains:
+            if isinstance(vm, qubes.vm.adminvm.AdminVM):
+                continue
+            if vm.get_power_state() in ["Paused", "Suspended"]:
+                coros.append(vm.resume())
+        if coros:
+            yield from asyncio.wait(coros)
+
+        # then notify all VMs
+        processes = []
+        for vm in self.app.domains:
+            if isinstance(vm, qubes.vm.adminvm.AdminVM):
+                continue
+            if vm.is_running():
+                proc = yield from vm.run_service(
+                    'qubes.SuspendPostAll', user='root',
+                    stdin=subprocess.DEVNULL,
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL)
+                processes.append(proc)
+
+        # FIXME: some timeout?
+        if processes:
+            yield from asyncio.wait([p.wait() for p in processes])