Commit Graph

3377 Commits

Author SHA1 Message Date
Vincent Penquerc'h
cdbfa0b7eb xenstore-watch: initialize token passed to xen
Xen will read it till the terminating NUL.

Plus return 0 on exit and define main as returning int.
2014-01-06 17:47:16 +01:00
Vincent Penquerc'h
2924a3436f qubes-restore: minor const/void fixups 2014-01-06 17:47:16 +01:00
Vincent Penquerc'h
cb39059ede qubes-restore: trivial error message \n fixups 2014-01-06 17:47:16 +01:00
Vincent Penquerc'h
702cd90c4d qubes-restore: fix buffer reading loop
It would work twice, but no more.

Also guard explicitely against buffer overflow, since once that
code actually works, sizeof(buf)-buflen will be interpreted as
large positive, and allow overwriting the stack.
2014-01-06 17:47:15 +01:00
Vincent Penquerc'h
67c198552b qubes-restore: guard against falling off the start of the buffer 2014-01-06 17:47:15 +01:00
Vincent Penquerc'h
f34728c0bb qubes-restore: make error message more truthful 2014-01-06 17:47:15 +01:00
Vincent Penquerc'h
f3850b7a71 qubes-restore: ensure we don't read outside the buffer
Marek says the 20 offset was there for a previous Xen
save file format, and is no longer needed.
2014-01-06 17:42:51 +01:00
Vincent Penquerc'h
ed24d8bc75 qubes-restore: fix race condition in allocating VM IDs 2014-01-06 17:42:51 +01:00
Vincent Penquerc'h
2cf4ad18eb qubes-restore: some syscall error checking 2014-01-06 17:42:51 +01:00
Vincent Penquerc'h
8c7a5e5933 qubes-restore: fix buffer overflow in command line building 2014-01-06 17:42:50 +01:00
Vincent Penquerc'h
95c76e071e qubes-restore: properly format time
2 microseconds are not 2 deciseconds
2014-01-06 17:42:50 +01:00
Vincent Penquerc'h
bf6486e973 qubes-restore: properly NUL terminate buffer and check for errors
It looks like a succesful read would have worked, assuming that the
other side always sends a \n last, as strtoul would find one before
the NUL. However, an error would write before the buffer.
2014-01-06 17:42:50 +01:00
Marek Marczykowski-Górecki
bba989e0a6 Move meminfo-writer to linux-utils repo
It is common for both dom0 and VM, and also quite linux-specific
(other OSes will need other implementation). So move to linux-specific
repo (not dom0-specific).
2014-01-05 05:36:50 +01:00
Marek Marczykowski-Górecki
994e963ab8 backup: fix handling errors in source VM 2013-12-29 03:20:27 +01:00
Marek Marczykowski-Górecki
a972a87061 Merge remote-tracking branch 'joanna/master' 2013-12-19 13:47:53 +01:00
Marek Marczykowski-Górecki
5f38ff916a hvm: one more fix for start() return value 2013-12-19 13:46:30 +01:00
Joanna Rutkowska
2347874690 Merge branch 'master' of git://git.qubes-os.org/marmarek/core-admin 2013-12-18 11:57:41 +01:00
Marek Marczykowski-Górecki
f18717d192 qvm-tools: update log names reported by qvm-start in debug mode 2013-12-17 23:59:16 +01:00
Marek Marczykowski-Górecki
cdd031cea5 hvm: fix return value of vm.start() 2013-12-17 23:59:05 +01:00
Marek Marczykowski-Górecki
a070ab70df version 2.1.37 2013-12-17 15:03:11 +01:00
Marek Marczykowski-Górecki
177c40d18f qvm-tools: do not crash qvm-run/qvm-start --tray when no notification service available 2013-12-15 22:53:06 +01:00
Olivier MEDOC
2576e5000e hvm: copy template private.img during hvm creation if hvm is template based 2013-12-14 03:58:01 +01:00
Marek Marczykowski-Górecki
4505d643f9 qvm-tools: one more fix for qvm-check tool 2013-12-13 22:52:18 +01:00
Marek Marczykowski-Górecki
73c38d8d1c hvm: propagate qrexec/guiagent setting from template
Do it only in one way - i.e. support the situation where template
doesn't have tools installed, but child VM does.
2013-12-13 22:47:20 +01:00
Joanna Rutkowska
78184239c4 version 2.1.37 2013-12-12 19:58:40 +01:00
Marek Marczykowski-Górecki
ac9823e6f1 qvm-tools: indentation fix in qvm-check 2013-12-11 21:28:04 +01:00
Zrubi
c8f4dc70e8 qubes-hcl-report update 2013-12-11 21:27:10 +01:00
Joanna Rutkowska
7733ff9ffb version 2.1.36 2013-12-10 19:30:44 +01:00
Olivier MEDOC
3fcfbbac22 backups: fix trailing slashes for anonymized vm dirnames 2013-12-10 17:02:45 +01:00
Joanna Rutkowska
85bb2c47f1 version 2.1.35 2013-12-09 23:46:58 +01:00
Marek Marczykowski-Górecki
e4d6be3a4b hvm: start guid for HVM without guiagent installed
This is fix for commit "ebf0a27 hvm: start fullscreen guid only if no
guiagent installed or in debug mode"
2013-12-09 19:10:25 +01:00
Joanna Rutkowska
c249ca761d version 2.1.34 2013-12-06 11:15:28 +01:00
Marek Marczykowski-Górecki
84f8a8a8f1 backups: fix restore dom0 home from old backup format 2013-12-06 06:55:23 +01:00
Marek Marczykowski-Górecki
ebf0a275a1 hvm: start fullscreen guid only if no guiagent installed or in debug mode 2013-12-06 06:35:30 +01:00
Joanna Rutkowska
179d4c6e31 version 2.1.33 2013-12-04 13:51:52 +01:00
Marek Marczykowski-Górecki
3891913d1b hvm: fetch and recreate appmenus when VM reports tools presence (#56 pro) 2013-12-04 03:02:39 +01:00
Marek Marczykowski-Górecki
76aa93e94b hvm: start stubdom guid regardless of guiagent_installed (#60 pro)
Alway start stubdom guid, then if guiagent_installed set - start the
target one and when connects, kill stubdom one. This allow the user to
see startup messages so prevent the impression of hang VM.

Note 1: this doesn't work when VM disables SVGA output (just after
windows boot splash screen).
Note 2: gui-daemon sometimes hangs after receiving SIGTERM (libvchan_wait
during libvchan_close). This looks to be stubdom gui agent problem.
2013-12-03 06:18:23 +01:00
Joanna Rutkowska
6ae4fb99d9 version 2.1.32 2013-12-02 15:17:19 +01:00
Marek Marczykowski-Górecki
99b001502a backups: compression support 2013-12-02 14:05:41 +01:00
Marek Marczykowski-Górecki
1939cf7ce8 backups: report exception on backup write error
This is only partial solution - this happens in separate thread so main
thread may not notice this problem (and simply will wait on work queue).
2013-12-02 14:04:20 +01:00
Marek Marczykowski-Górecki
bc92c20d67 core: do not truncate qubes.xml during save()
Save the next one in temporary file, then move over to destination file.
This way when writing the file to disk fails (e.g. out of disk space),
user still have old file version intact.
2013-12-02 03:50:55 +01:00
Marek Marczykowski-Górecki
93b7924bc6 backups: hide unwanted "next volume requests" from tar 2013-12-02 03:49:44 +01:00
Marek Marczykowski-Górecki
4ce3acd64d hvm: always use qrexec for clipboard operations
This is temporary solution until Windows GUI agent will handle
MSG_CLIPBOARD_* commands.

Also fix code style - wrap long lines
2013-12-02 03:47:49 +01:00
Marek Marczykowski-Górecki
e9f08aefd7 backups: disable debugging code 2013-12-01 02:35:42 +01:00
Marek Marczykowski-Górecki
27f6f0e64e Merge branch 'new-backups'
Conflicts:
	core-modules/000QubesVm.py
2013-11-29 04:00:58 +01:00
Marek Marczykowski-Górecki
79cbf3d06f Merge remote-tracking branch 'joanna/master' 2013-11-29 03:58:25 +01:00
Marek Marczykowski-Górecki
b73970c62d core: rename QubesDom0NetVm to QubesAdminVm
This is somehow related to #757, but only first (easier) step. Actual
change of QubesAdminVm base class requires somehow more changes, for
example qvm-ls needs to know how to display this type of VM (none of
template, appvm, netvm).

Make this first step change now, because starting with R2Beta3 dom0 will
be stored in qubes.xml (for new backups purposes) so this rename would
be complicated later.
2013-11-29 03:42:56 +01:00
Marek Marczykowski-Górecki
3d70402778 backups: add support for restoring old backup format
Actually the code is quite similar, so just add few "if" instead of
copying the whole functions.
2013-11-29 03:25:41 +01:00
Marek Marczykowski-Górecki
8cee6e22f4 dispvm:
Remove temp file if already existed. It could be created with different
owner, so unavailable for this process.
2013-11-27 03:22:24 +01:00
Marek Marczykowski-Górecki
eaebf04b34 backups: remove some old unneeded code 2013-11-27 03:21:17 +01:00