Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: freddy77/xen-api
...
head fork: freddy77/xen-api
Commits on Jul 04, 2013
@jeromemaloberti jeromemaloberti CA-106403: A timed out connection on writedb must be closed too.
Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
7dc844d
@jeromemaloberti jeromemaloberti CA-106403: The DB should be locked before being flushed on redo_log.
Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
c1cd4ed
Commits on Jul 09, 2013
@jeromemaloberti jeromemaloberti CA-106403: Fix pool-sync-database in case of failure with redo_logs.
Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
0338d36
Commits on Aug 08, 2013
@andyhhp andyhhp CA-111029: Switch to the C xenguest. f05324d
Commits on Aug 21, 2013
@robhoes robhoes CA-82314: networkd: introduce Linklocal6 IPv6 address mode
This commit redefines the IPv6 address mode "None6" to mean "no IPv6 address at
all, not even a link local one", and introduces the new mode Linklocal6, which
means "only IPv6 address, except a link local one".

Previously, it was not possible to get networkd to remove the link-local IPv6
address from an interface.

When a link local IPv6 address is requested, it is derived from the interface's
MAC address as commonly done.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
6fea0a7
@robhoes robhoes CA-82314: nm: Allow (only) bridge interfaces to have a link-local IPv…
…6 address

Due to a recent change in xcp-network, the None6 IPv6 address mode removes all
IPv6 addresses, including the link local one.  To avoid problems with bonding,
we only want bridge interfaces to have any IP addresses, while the physical
interfaces may not even have a link-local address.

This commit ensures that bridge interfaces are configured accordingly.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
f2c4850
Commits on Aug 22, 2013
@akshayramani akshayramani CP-4148:Ensure that the default behaviour for emulated monitor is null
Signed-off-by: Akshay Ramani <akshay.ramani@citrix.com>
1327063
@mcclurmc mcclurmc Merge pull request #1447 from robhoes/ca82314
CA-82314: remove link-local IPv6 addresses from physical interfaces
2969450
@oc243 oc243 Allow xe vm-snapshot be run with multiple vms.
xe help vm-snapshot documents that this is how the command should
behave. Looking back through the `blame' of this line doesn't seem to
indicate any reason to disallow this.
a47864f
@oc243 oc243 Replace hard-coded mail-alarm sender with a user-setable value.
Without this patch, email from the pool are sent from
noreply@${FSQN}. Some organisations setup their email so as to only
allow emails from  whitelist of addresses, so are unable to get mail
alerts.

This patch lets the administrator run:
xe pool-param-set other-config:mail-sender=${SENDER}
to choose an whitelisted address.
22015af
@oc243 oc243 Add missing () to call to getfqdn in mail-alarm d0a1bf8
Commits on Aug 23, 2013
@akshayramani akshayramani Revert "CA-108916: add call to V6rpc.get_current_edition API"
This reverts commit 04f4d92.
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>
a319091
@siddharthv siddharthv Fix bash_completion for "xe host-cpu-info". 6f8143f
@thomassa thomassa Merge pull request #1422 from siddharthv/bash_completion
CA-110748: Fix bash_completion for "xe host-cpu-info".
3b1ef22
Commits on Aug 27, 2013
@robhoes robhoes CA-113612: Uncomment hvm_check_pvdriver in Domain.shutdown_wait_for_ack
The last two changes in this function (e8a7d82
and 939cd11) seem to have accidentally
commented-out an essential check.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
c1586a7
@robhoes robhoes Merge pull request #1462 from robhoes/ca113612
CA-113612: Uncomment hvm_check_pvdriver in Domain.shutdown_wait_for_ack
0832b96
@siddharthv siddharthv Correct /sys path for iovirt plugin.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
2de7baa
Commits on Aug 29, 2013
@siddharthv siddharthv CA-99034: Fix unit for DS:memory_internal_free.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
9a51d81
@jonludlam jonludlam CA-112284: Be more careful with errors from start_paused
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
623ae4b
@johnelse johnelse Merge pull request #1469 from jonludlam/CA-112284
CA-112284: Be more careful with errors from start_paused
23ecc46
Commits on Sep 02, 2013
@djs55 djs55 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>
7cd2595
@euanh euanh Merge pull request #1471 from djs55/python2.7
Fix XenAPI.py on python2.7
349509e
@johnelse johnelse CA-114777: Revert "Fix XenAPI.py on python2.7"
Unfortunately python2.4 doesn't work with this fix.

This reverts commit 7cd2595.

Signed-off-by: John Else <john.else@citrix.com>
c967c44
@johnelse johnelse Merge pull request #1473 from johnelse/ca-114777
Revert "Fix XenAPI.py on python2.7"
8809181
@johnelse johnelse 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 37eee6e.

Signed-off-by: John Else <john.else@citrix.com>
dce68c5
@johnelse johnelse Merge pull request #1472 from johnelse/ca-110947
Revert "Remove a modprobe warning in new systems."
bcef6d8
Commits on Sep 03, 2013
@thomassa thomassa Merge pull request #1458 from akshayramani/CA-113278
Revert "CA-108916: add call to V6rpc.get_current_edition API"
69cb32b
Commits on Sep 04, 2013
@thomassa thomassa Merge commit '69cb32b81cbe94ab22cf917dab489f832e469f10' f272082
@johnelse johnelse Merge pull request #1465 from siddharthv/CA-99034
Fix unit for DS:memory_internal_free.
13ca7d2
@johnelse johnelse Merge pull request #1450 from akshayramani/CP-4148
CP-4148:Ensure that the default behaviour for emulated monitor is null
9cb369a
@simonjbeaumont simonjbeaumont Enable -bin-annot compiler flag
This enables binary annotation for use with tools such as ocamlspotter.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
ce3a6df
Commits on Sep 06, 2013
@johnelse johnelse 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>
b634e38
@simonjbeaumont simonjbeaumont CA-113392: Fix PBD password-secret lifecycle
When creating an SR, if there are any secrets in the device-config then they
are duplicated and a unique one is used for each PBD creation.

However, XenCenter's "Repair SR" feature creates new PBDs directly, copying the
device-config field from existing ones. This bypasses the secret-duplication
which is in the SR-create code path.

This patch pushes the secret-duplication logic down to the PBD creation which
solves the XenCenter issue pending a revised design of the secret datamodel.
Also the master is no-longer special cased for the same reason. This has the
added benefit of making secret creation/destruction entirely symmetrical: the
secrets created with PBDs are destroyed when the PBD is destroyed and the
secrets created manually must be destroyed manually.

XenCenter should now be updated to tidy up after itself: if it chooses to
create secrets around passwords used in SR creation, then they should be
destroyed in a finally block after the SR creation is complete. This is safe
since all PBDs will have duplicated the secret.

Note this patch applies (as the previous semantics did) to any key in device
config ending in '_secret'. The ones used by the SM backends are
'password_secret' and 'chappassword_secret'.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
b253474
Commits on Sep 09, 2013
@simonjbeaumont simonjbeaumont 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>
2f4db27
@jonludlam jonludlam Merge pull request #1488 from simonjbeaumont/ignore-autogen
Ignore xenops-cli autogen code from ocamllex/yacc
9f812b6
@johnelse johnelse Fix typo
Signed-off-by: John Else <john.else@citrix.com>
295ac8e
Commits on Sep 10, 2013
@thomassa thomassa Merge pull request #1490 from johnelse/augusta-typo
Fix typo
3846535
@jeromemaloberti jeromemaloberti Merge pull request #1486 from johnelse/ca-109854
Don't include memory overhead when creating a VM.
b717ac4
@jeromemaloberti jeromemaloberti CA-111637: Change PBD.plug to be a localhost operation.
During the return in a pool of a slave host that rebooted,
the PBD.plug will fail if the slave is not set as alive.
It is anyway an operation that is performed on the master.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
92be379
@jeromemaloberti jeromemaloberti CA-111637: Remove set_live in pool.hello in HA.
In HA the host live value can be different from the liveset determined
by xha, allowing a user to start a VM on host that just came back in
a pool, but before its recovery process finished.
This commit fix this problem by forbidding the live value to be changed
outside of HA recovery process, the HA liveset becomes the only liveness
state of a host in HA.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
cdfa083
@jeromemaloberti jeromemaloberti CA-111637: Use the HA live_set when computing a restart plan for VMs.
Previously, after a host failure in HA, the function
Xapi_ha_vm_failover.compute_restart_plan which choose which hosts
should restart the failed VMs would pickup host that are live and
enabled. In some cases, a host may be live but not in the HA
live_set, for example if it returned in the pool before the HA
recovery process finished.
This situation is bad since the live host would have new VMs
started on it, while later it may be marked as dead, once the
HA recovery process finished.
This commit add the live_set parameter to compute_restart_plan
and all functions that need it by transitivity.
Some functions are called during the HA recovery, where the
live_set is available, or at startup, in this case the live_set
is created from all live and enabled hosts.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
ac177a4
@jeromemaloberti jeromemaloberti CA-111637: Reorder Hosts and VMs recovery after a host crash in HA.
When some hosts are considered dead in HA, restart_auto_run_vms were
processing them in this way:
 - for each dead host
   - List all resident VMs
   - Host.set_live=false
   - call Xapi_hooks.host_post_declare_dead which can be very long
   - set all resident VM to `Halted (including Control Domain)
This process was conflicting with db_sync if a host had the bad taste
of coming back to life while restart_auto_run_vms was stuck in
host_post_declare_dead.
This commit reorder the actions to put the shortest first:
 - for each dead host
   - set all resident VMs excluding Control Domain to `Halted
   - Host.set_live=false
 - for each dead host
   - call Xapi_hooks.host_post_declare_dead

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
8d5aef0
@johnelse johnelse Merge pull request #1387 from jeromemaloberti/CA-111637
Fix data races in HA when slaves return in the pool.
1ff253f
Commits on Sep 11, 2013
@johnelse johnelse CA-115293: Revert "CA-109854: Don't include memory overhead when crea…
…ting a VM."

Not including the overhead means we don't include it in the squeezed
reservation - therefore if

(maxmem < host free mem)

and

((maxmem + overhead) > host free mem)

we end up relying on xenguest to complain that we're out of memory.

This reverts commit b634e38.

Signed-off-by: John Else <john.else@citrix.com>
69da221
@jonludlam jonludlam Merge pull request #1491 from johnelse/ca-115293
Revert "CA-109854: Don't include memory overhead when creating a VM"
782346f
Commits on Sep 13, 2013
@jonludlam jonludlam CA-110973: Use more efficient db backup when on the pool master
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
cc821fd
@simonjbeaumont simonjbeaumont CP-5970: Move xenops' cancellable watch paths
Having these paths created were interferring with devices since they were being
recreated once the device had beeen destroyed in the case of VBDs. Now we'll
keep track of the cancellable watch paths in a separate subtree of XenStore and
also tie them to their Xenops task IDs to aid debugging. Also, the semantics of
how to cancel the task have been added (removing the key).

Old path: /local/domain/0/backend/vbd/<domid>/<devid>/tools/xenops/cancel

New path: /xenops/task/<task-id>/remove-to-cancel

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
3fa26a1
Commits on Sep 16, 2013
@robhoes robhoes Merge pull request #1489 from jonludlam/CA-110973
Use more efficient db backup when on the pool master
440c122
Commits on Sep 17, 2013
@jonludlam jonludlam Merge pull request #1487 from simonjbeaumont/ca-113392
CA-113392: Fix PBD password-secret lifecycle
f8ac941
@euanh euanh CA-113235: Don't call init.d scripts directly
Some daemons are launched invoking /etc/init.d scripts directly. This
could be a problem in environment with upstart which wants to know the
status of these services. For this reason it's better to use the {service}
command to notify upstart.

Signed-off-by: Euan Harris <euan.harris@citrix.com>
8c1950e
Commits on Sep 18, 2013
@siddharthv siddharthv XOP-435: Allow clearing of DNS entries.
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>
c6e5bd3
@jonludlam jonludlam Merge pull request #1497 from euanh/CA-113235
CA-113235: Don't call init.d scripts directly
16a8207
@jonludlam jonludlam Merge pull request #1495 from simonjbeaumont/cp-5970
CP-5970: Move xenops' cancellable watch paths
5db3838
@robhoes robhoes Merge pull request #1468 from siddharthv/clear-dns
XOP-435: Allow clearing of DNS entries.
1278c5c
@BobBall BobBall CP-6271: Set default mode for XSM checks to use UUIDs
After this change the code at xapi_vm_migrate.ml:362 will
check if the VDI exists (by UUID) in the destination SR.
If it does, a mirror will not be performed as the VDI already exists.

The original behaviour can be used by setting the value to false in xapi.conf

Signed-off-by: Bob Ball <bob.ball@citrix.com>
c62197a
@jonludlam jonludlam Remove networkd from xen-api in favour of xcp-networkd
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
a940917
@jonludlam jonludlam Remove networkd from the spec file
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
49cc4e4
@jonludlam jonludlam Use xcp-idl for network client
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
54b9d95
@jonludlam jonludlam Use xcp-idl for rrd interface, and remove rrdd
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
f32dc8b
@djs55 djs55 storage interface: plumb through SR.stat
Now a XenAPI SR.update will call SR.stat.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
b999e3f
@djs55 djs55 Plumb VDI.resize through the SMAPIv2
Signed-off-by: David Scott <dave.scott@eu.citrix.com>
42aa817
@jonludlam jonludlam Update storage_interface to latest and fix up fallout.
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
5cbea43
@jonludlam jonludlam Use xcp-idl for storage interface rather than our own copy
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
654dbf3
@djs55 djs55 Switch to using xcp ocamlfind packages from xcp-idl
Conflicts:

	ocaml/OMakefile
	ocaml/network/OMakefile
	ocaml/network/network_interface.ml
	ocaml/rrdd/interface/OMakefile
	ocaml/sm-cli/OMakefile
	ocaml/test/OMakefile
	ocaml/xapi/OMakefile
	ocaml/xenops/memory_interface.ml
	ocaml/xenops/xenops_client.ml
	ocaml/xenops/xenops_interface.ml

Conflicts:
	ocaml/network/OMakefile
	ocaml/rrdd/OMakefile
	ocaml/rrdd/interface/OMakefile
	ocaml/test/OMakefile
	ocaml/xapi/OMakefile
	ocaml/xenops/OMakefile
	ocaml/xenops/memory_client.ml
	ocaml/xenops/memory_interface.ml
	ocaml/xenops/squeeze_xen.ml
	ocaml/xenops/squeezed.ml
	ocaml/xenops/xenops_client.ml
	ocaml/xenops/xenops_interface.ml
	ocaml/xenops/xenops_server.ml
	ocaml/xenops/xenops_server_xen.ml

Merged-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
2037d97
@jonludlam jonludlam Fix the RPM build
Remove xenstore_watch library, remove redundant scripts, remove
redundant rpm packages, remove domain_sethandle

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
441aa51
@jonludlam jonludlam Remove RPMS from XS build integration that are now built elsewhere
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
c2d0861
@jonludlam jonludlam xenopsd has become xenopsd-xc
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
5318b2b
@jonludlam jonludlam Fix handing connections to xenopsd for new xenopsd
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
fe3a69c
@jonludlam jonludlam Fix port locking on vswitch backend
Bit of a hack - common.py is reading info about the VIFs from
the disk, not xenstore. However, the network backend is only put
into xenstore and isn't on the disk. This patch puts it on the
disk too, but it's not really an optimal solution.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
ae463fc
@jonludlam jonludlam Remove the udev scripts
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
dffec49
@jonludlam jonludlam Remove udev RPM from install targets
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
3cf74ea
@jonludlam jonludlam Remove noarch build
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
2b3c026
Commits on Sep 19, 2013
@siddharthv siddharthv CA-114289:Improve logging by hiding arguments with sensitive informat…
…ion.

Maintain a list of commands and arguments that need to be protected.
1ff696b
@siddharthv siddharthv CA-115340: Add plugin protection to message forwarding layer. 6e3f50d
@thomassa thomassa Merge commit '1278c5c9f38f80fc3f8af1633c7df526eb28b873' 2e44768
@jonludlam jonludlam Merge pull request #1499 from jonludlam/ea-1254-staging
EA-1254 merge
d9115f2
Commits on Sep 20, 2013
@robhoes robhoes Merge pull request #1463 from siddharthv/CA-112644
CA-112644: Correct /sys path for iovirt plugin.
c05ef88
Commits on Sep 24, 2013
@jonludlam jonludlam CA-115915: Network backend is not a VIF thing.
Note that this requires a xenopsd with with appropriate
changes in. (use CA-ticket to find the commit)

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
13d4001
@jonludlam jonludlam Merge pull request #1500 from jonludlam/CA-115915
CA-115915: Network backend is not a VIF thing.
f94d0d3
@jonludlam jonludlam Fix build - last changeset removed last use of a variable
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
f0cf459
@jonludlam jonludlam Merge pull request #1501 from jonludlam/build-fix
Fix build - last changeset removed last use of a variable
e06960d
@jonludlam jonludlam Use log module from xcp-idl rather than xen-api-libs-transitional
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
ab4a34f
@jonludlam jonludlam Merge pull request #1502 from jonludlam/xcp-idl-syslog
Use log module from xcp-idl rather than xen-api-libs-transitional
a7c64d7
@jonludlam jonludlam Remove log from META files
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
be82b4c
@jonludlam jonludlam Merge pull request #1503 from jonludlam/no-log-in-libs
Remove log from META files
e4648d1
Commits on Sep 25, 2013
@akshayramani akshayramani Replace all occurrences of 'or' with '||' to work with OCaml 4.01.0 640f08a
@jonludlam jonludlam Merge pull request #1504 from akshayramani/CP-5715
CP-5715: Replace all occurrences of 'or' with '||' to work with OCaml 4.01.0
85eea14
Commits on Sep 26, 2013
@thomassa thomassa Merge pull request #1457 from siddharthv/cleartext-password
CA-114289/CA-115340: Improve logging by hiding arguments with sensitive data.
d794b8f
Commits on Sep 27, 2013
@simonjbeaumont simonjbeaumont Merge pull request #1456 from oc243/mail-alert-change-sender
Replace hard-coded mail-alarm sender with a user-setable value.
355647f
@simonjbeaumont simonjbeaumont Merge pull request #1455 from oc243/master
Allow xe vm-snapshot be run with multiple vms.
d27d556
Commits on Sep 30, 2013
@robhoes robhoes SCTX-1532: Ensure that ethtool params get set on bond slaves
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
a435732
@johnelse johnelse Merge pull request #1474 from simonjbeaumont/bin-annot
Enable -bin-annot compiler flag
fb4e065
Commits on Oct 01, 2013
@thomassa thomassa CA-86347: Retry when migrate fails due to VM reboot 670062a
Commits on Oct 02, 2013
@thomassa thomassa Fix a typo in a comment.
Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
23920ba
@jonludlam jonludlam Merge pull request #1509 from thomassa/CA-86347v06cleaned
CA-86347: Retry when migrate fails due to VM reboot
49a1c1d
@robhoes robhoes Merge pull request #1507 from robhoes/ethtool-bond
SCTX-1532: Ensure that ethtool params get set on bond slaves
cab3ef8
Commits on Oct 07, 2013
@Mattsface Mattsface New manpages 10/07/2013 d438af2
Commits on Oct 09, 2013
@thomassa thomassa CA-112882: Allow pool-join without v6d licensing daemon.
When xapi starts, if it cannot contact the licensing daemon it now
falls back to an edition-string of "free/libre" rather than "free".

A host is now allowed to join a pool if the edition-strings of all
hosts in the pool match the edition-string of the host that wants to
join.  Only if there is some mismatch do we consult v6d to work out
which different edition-strings are compatible.

Thus a pool of hosts with no licensing daemons can now be created.

This change also introduces a new error type for license-edition
mismatch between host and pool.

Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
dd4e087
Commits on Oct 14, 2013
@thomassa thomassa Merge pull request #1510 from thomassa/xcp-pool
CA-112882: Allow pool-join without v6d licensing daemon.
f9b9a0c
Commits on Oct 15, 2013
@simonjbeaumont simonjbeaumont Merge pull request #1511 from Xenapi-Admin-Project/master
New manpages 10/07/2013
9c97c20
@BobBall BobBall CA-114333: Allow Linux HVM guests to use >4 devices.
Windows PV drivers don't check the guest device name, but the Linux kernel does
With devices > 4, Linux expects them to be in xvdN format, so this patch ensures
that all devices are treated as Linux devices

Signed-off-by: Bob Ball <bob.ball@citrix.com>

Conflicts:

	ocaml/xenops/device_number.ml
16a71a1
Commits on Oct 21, 2013
@thomassa thomassa Merge commit '9c97c20ff839de6e704994ba4ac695b1f1936ed9' 5c5bed2
Commits on Oct 23, 2013
@freddy77 CA-116369: Fix compatibility problem with Python 2.6
In Python 2.6 socket.error class inherit from IOError. For this reason
checking for socket.error exception after IOError cause the catch path to
never get taken. Fix this problem checking for socket.error before IOError.

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
0ed8a8f
Mike McClurg Initial commit of .merlin file
Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
4360847
@thomassa thomassa Merge pull request #1523 from mcclurmc/merlin
Initial commit of .merlin file
33b26a7
Commits on Oct 29, 2013
@ravikondamuru ravikondamuru CA-99828 Add a new bond option: lacp-fallback-ab
lacp-fallback-ab allows lacp bond to fallback to active-backup
when there is no lacp partner.

Signed-off-by: Ravi Kondamuru <Ravi.Kondamuru@citrix.com>
7fa32db
Commits on Oct 30, 2013
@jonludlam jonludlam Merge pull request #1522 from mcclurmc/ca116369-perfmon
CA-116369: Fix compatibility problem with Python 2.6
fc961fa
@jonludlam jonludlam Merge git://hg/carbon/trunk/xen-api 1f9d19b
@thomassa thomassa Merge pull request #1355 from jeromemaloberti/CA-106403
CA-106403: A timed out connection on writedb must be closed too.
acdfa4a
Commits on Oct 31, 2013
@rhb21 rhb21 Update datamodel.ml
Clarifying the event class documentation. from is better than next and correcting the return from "from" to include the token which was absent.
280e457
@jonludlam jonludlam Merge pull request #1529 from rhb21/patch-1
Update datamodel.ml
778136b
@jonludlam jonludlam Merge pull request #1525 from ravikondamuru/CA-99828
CA-99828 Add a new bond option: lacp-fallback-ab
92c95d7
@jonludlam jonludlam Merge pull request #1498 from BobBall/cp-6271
CP-6271: Set default mode for XSM checks to use UUIDs
503d54d
@jonludlam jonludlam Merge pull request #1452 from BobBall/device_numbering
CA-114333: Allow Linux HVM guests to use >4 devices.
aa2b0ca