CA-101571: Allow the vcpu params weight and cap value to be set independently
Signed-off-by: Ravi Pandey <ravi.pandey@citrix.com>
CA-122467: Fix for setting the right value of memory_actual after vm is started

There is a race condition between vm_start and monitor thread.
The monitor thread runs every 5s and updates the memory changes of the
VMs if any. It does that only if the VM's resident_on value is set to
localhost.
Currently, the memory changes are being seen by monitor thread while
VM is starting but since the start operation has'nt yet set the
resident_on, the monitor thread doesn't do anything.
However, the in-memory cache of monitor thread already has the vm_memory
changes for that VM. This needs to be removed, so that monitor thread
updates it next time when the resident_on value of the VM is set by
start operation.
Signed-off-by: Ravi Pandey <ravi.pandey@citrix.com>
CA-125060: add bash completion for '{base,into}-vdi-uuid' params of 'xe vdi-copy'

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

CA-125060: add bash completion for '{base,into}-vdi-uuid' params of 'xe ...
CP-6172: Don't specify VBD backend-kind by default

Rather than defaulting this value (meaning we have to keep parity with
xenopsd), leave the default to be determined by xenopsd itself by not
specifying a backend-kind.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Merge pull request #1603 from simonjbeaumont/cp-6172-xapi-part

CP-6172: Don't specify VBD backend-kind by default
Merge pull request #1604 from robhoes/master

SCTX-1649: Set SO_KEEPALIVE on server sockets
CA-126652: sr-introduce CLI doesn't record sm-config param

This is not consistent with either sr-create CLI or sr-introduce API, which both take and record the sm-config param happily.

Signed-off-by: Zheng Li <zheng.li@eu.citrix.com>
CA-122270: Support for specific xenserver.conf file

Patch this file instead of main one if present.
This file was added to avoid overriding main rsyslog.conf file.

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Merge pull request #1618 from zli/xenserver/master/CA-126652

CA-126652
Merge pull request #1636 from robhoes/master

Switch GRO by default (again)
Merge pull request #1579 from ravippandey/CA-122467

CA-122467: Fix for setting the right value of memory_actual after vm is ...
Add explicit Prototyped API lifecycle transition

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Update HTML API docs to take into account new lifecycle info

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
Update HTML API doc branding

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
CP-6958 - Fix vncterm path for 64bit.
CP-6958 - Fix 64-bit build, original commit by Jon Ludlum
Merge pull request #1617 from freddy77/xenserver_conf

CA-122270: Support for specific xenserver.conf file
VGPU: Fixed conflicts

Signed-off-by: Vincent Bernardoff <vincent.bernardoff@citrix.com>
Add 'vgpu' option to vga platform key