CP-4148:Ensure that the default behaviour for emulated monitor is null
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
Revert "CA-108916: add call to V6rpc.get_current_edition API"

This reverts commit 04f4d921c9d657f928fb4768abc390095b1418cc.
CA-113278: This commit was causing many testcases to fail. Reverting the commit for now till we figure out a better way to fix the original problem.

Signed-off-by: Akshay <akshay.ramani@citrix.com>
Fix bash_completion for "xe host-cpu-info".
Merge pull request #1422 from siddharthv/bash_completion

CA-110748: Fix bash_completion for "xe host-cpu-info".
CA-113612: Uncomment hvm_check_pvdriver in Domain.shutdown_wait_for_ack

The last two changes in this function (e8a7d8229c426a573bf461a0667993ed7644b28e
and 939cd11ecfa56daafc2daa1c3c81b1a2b97b0ffa) seem to have accidentally
commented-out an essential check.

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

CA-113612: Uncomment hvm_check_pvdriver in Domain.shutdown_wait_for_ack
CA-99034: Fix unit for DS:memory_internal_free.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
CA-112284: Be more careful with errors from start_paused

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #1469 from jonludlam/CA-112284

CA-112284: Be more careful with errors from start_paused
Fix XenAPI.py on python2.7

This fix was made by Mike Mcclurg here:

https://bugs.launchpad.net/xcp/+bug/917913

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Merge pull request #1471 from djs55/python2.7

Fix XenAPI.py on python2.7
CA-114777: Revert "Fix XenAPI.py on python2.7"

Unfortunately python2.4 doesn't work with this fix.

This reverts commit 7cd259574198123e9152db4a483bae54eed15c95.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1473 from johnelse/ca-114777

Revert "Fix XenAPI.py on python2.7"
CA-110947: Revert "Remove a modprobe warning in new systems."

This breaks switching to the bridge networking backend - this change
means /etc/modprobe.d/blacklist-bridge is not deleted when switching
to bridge, so after the host reboots it can't load the ethernet
bridging kernel module and networking is totally broken.

This reverts commit 37eee6eff0ce3fb4a0185e6f4aa03094c0668844.

Signed-off-by: John Else <john.else@citrix.com>
Merge pull request #1472 from johnelse/ca-110947

Revert "Remove a modprobe warning in new systems."
Merge pull request #1458 from akshayramani/CA-113278

Revert "CA-108916: add call to V6rpc.get_current_edition API"
Merge pull request #1465 from siddharthv/CA-99034

Fix unit for DS:memory_internal_free.
Merge pull request #1450 from akshayramani/CP-4148

CP-4148:Ensure that the default behaviour for emulated monitor is null
CA-109854: Don't include memory overhead when creating a VM.

Xen will add the memory overhead on top of the value xenopsd requests.
This change prevents maxmem continuously increasing over repeated
migrations.

Signed-off-by: John Else <john.else@citrix.com>
Ignore xenops-cli autogen code from ocamllex/yacc

Remove autogenerated files from git, have make rule clean them up and add them
to .gitignore.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>