CA-95722:Prevent migration of VM's onto hosts that are in maintenance mode.
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Fix indent
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Merge pull request #1365 from akshayramani/CA-95722.a

CA-95722:Prevent migration of VM's onto hosts that are in maintenance mo...
Use more modern upstream libraries.

* Remove Fhs.vardir - this is now /var/lib/xcp
* Use Xenstore library from ocaml-xenstore
* Use Xenctrl library from ocaml-xen-lowlevel-libs
* Syslog -> Syslog_transitional to avoid conflict with upstream package
* Fix ocamldoc to work with Ocaml 4.00.1
* Use upstream rpclib instead of xen-api-libs fork
* Remove some unused code
* Remove some instances of xiu checks

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Respond to comments on PR#1376

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #1376 from jonludlam/ea-1254-unified

Use more modern upstream libraries.
CA-108916: add call to V6rpc.get_current_edition API

We add this API so that when v6d returns a failure on apply_edition, xapi is
able to find out the correct edition to set itself to. This fixes a "bug"
(design decision, really) where 1) v6d holds a valid license, 2) xapi
apply_edition with bad license-server url, 3) v6d release license, and fails to
check out new license, 4) xapi remains at the current licensed edition, but v6d
doesn't hold the license for that edition.

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Add nestedhvm support for xenguest

Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>
Merge pull request #1386 from zli/xenserver/nestedhvm

Add nestedhvm support for xenguest
Merge pull request #1378 from mcclurmc/ca108916-get-current-edition

CA-108916: add call to V6rpc.get_current_edition API
CA-112572: networkd: protect IP watcher thread with an exception handler

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Merge pull request #1390 from robhoes/ca112572

CA-112572: networkd: protect IP watcher thread with an exception handler