Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

CA-85761: distinguish between unguessable uuids and references and those which are merely unique #756

Closed
wants to merge 4 commits into from

4 participants

@djs55
Owner

Everywhere where we make a uuid or reference, decide whether it needs to be unguessable or not. The only things which must be unguessable are session ids (and possibly secrets).

With this change the number of /dev/urandom reads recorded by strace during a migration drops from 680 to 10.

Tested by:
1. quicktest
2. xapi restart with no pool secret -- to verify regeneration was ok
3. adding a "SECURE:" prefix to "Uuid.secure" and checking that sessions were "secure" while VM references were not

@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@880a717: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 242/341 targets are up to date
*** omake: failed (0.79 sec, 30/30 scans, 14/24 rules, 121/420 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.63770 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.63770 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@2a9f119: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 243/341 targets are up to date
*** omake: failed (0.81 sec, 30/30 scans, 15/25 rules, 124/426 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.98880 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.98880 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@79545c2: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
249 files updated, 0 files merged, 0 files removed, 0 files unresolved
======> 1342118516 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build =
======> 1342118516 Build: Regenerating dependency graph
======> 1342118520 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 12 18:41 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1342118525 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 73b557d
======> 1342118533 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@341dcc5: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342188487 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@a656e99: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342539688 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@0a73c20xapi-project/xen-api@9dff6ec: Merge and build failed.

Failed when executing:
git merge 0a73c20e22af5b7c7d8715f5499d925950adff42
Error log:
======> 1342546867 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_guest_agent.ml
Auto-merging ocaml/xapi/monitor_master.ml
Auto-merging ocaml/xapi/helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/dbsync_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/dbsync_master.ml
Auto-merging ocaml/xapi/create_misc.ml
Automatic merge failed; fix conflicts and then commit the result.

@djs55
Owner

This needs to be merged at the same time as
xapi-project/xen-api-libs#108

@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@9dff6ec: Merge and build failed.

Failed when executing:
make api-build
Error log:
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: warning: stdout is not a tty, disabling the progress bar
(use --progress to override).
*** omake: 242/350 targets are up to date
*** omake: failed (1.50 sec, 29/29 scans, 14/16 rules, 125/434 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.92984 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.92984 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@aa8a298: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 250/350 targets are up to date
*** omake: failed (0.84 sec, 29/29 scans, 14/24 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.45472 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.45472 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@92907f8: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 251/350 targets are up to date
*** omake: failed (0.81 sec, 30/30 scans, 14/24 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.41815 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.41815 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@4d86e2d: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 245/350 targets are up to date
*** omake: failed (0.88 sec, 28/28 scans, 14/20 rules, 124/432 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.74413 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.74413 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@4bfc9cd: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 252/353 targets are up to date
*** omake: failed (0.88 sec, 29/29 scans, 15/23 rules, 128/442 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.97165 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.97165 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@4436181: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 251/353 targets are up to date
*** omake: failed (0.79 sec, 29/29 scans, 14/22 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.60445 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.60445 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@8e0794a: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 248/353 targets are up to date
*** omake: failed (0.82 sec, 28/28 scans, 14/20 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.49365 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.49365 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@1e7055c: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 247/353 targets are up to date
*** omake: failed (0.93 sec, 27/27 scans, 14/20 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.21421 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.21421 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@0d15255: Merge and build failed.

Failed when executing:
git merge 3a67f0337539e4c687be8a85ce5d0bfae129b2d9
Error log:
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 25 11:48 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343216942 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 1e7055c
======> 1343216950 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vbd.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/monitor_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/monitor_master.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@3a67f03xapi-project/xen-api@3b22ab6: Merge and build failed.

Failed when executing:
git merge 3a67f0337539e4c687be8a85ce5d0bfae129b2d9
Error log:
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 26 10:08 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343297318 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 0d15255
======> 1343297327 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vbd.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/monitor_master.ml
CONFLICT (content): Merge conflict in ocaml/xapi/monitor_master.ml
Automatic merge failed; fix conflicts and then commit the result.

djs55 added some commits
@djs55 djs55 [xapi] add missing .mli file
Signed-off-by: David Scott <dave.scott@eu.citrix.com>
a0406a3
@djs55 djs55 CA-85761: switch most UUID generation over to fast PRNG, rather than …
…/dev/urandom

We only need /dev/{u,}random when the results have to be unguessable.
In the vast majority of cases we only require the UUIDs to be Unique.

When we need an unguessable UUID we use Uuid.secure() and when we need
only a unique UUID we use Uuid.insecure()

In particular, we still need unguessable UUIDs for anything to do with
* session generation
* secrets

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
842accd
@djs55
Owner

Rebased following a reindent?

@djs55 djs55 CA-85761: switch most Ref generation over to fast PRNG, rather than /…
…dev/urandom

Just like with UUIDs, the vast majority of the time we only need
Refs to be Unique, not unguessable.

Whenever we want an unguessable ref, we call Ref.secure() and whenever
we only need a unique ref, we call Ref.insecure()

In particular, we still need unguessable UUIDs for anything to do with
* session generation
* secrets

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
eedc738
@xen-git
Owner

djs55/xen-api@eedc738xapi-project/xen-api@3b22ab6: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 252/353 targets are up to date
*** omake: failed (0.92 sec, 29/29 scans, 15/23 rules, 128/442 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.28877 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.28877 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@djs55 djs55 CA-85761: adjust the new unit test suite to use the new Ref/Uuid APIs
Signed-off-by: David Scott <dave.scott@eu.citrix.com>
9939238
@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@3b22ab6: Merge and build failed.

Failed when executing:
make api-build
Error log:
--- Checking for ocamlopt.opt... (found /usr/bin/ocamlopt.opt)
--- Checking whether ocamlc understands the "z" warnings... (yes)
- build ocaml/idl/ocaml_backend ref.o
+ ocamlfind ocamlopt -package stdext,log,xml-light2,stunnel,sexpr,http-svr,rpc-light -g -dtypes -thread -warn-error +a-4-6-9-27-28-29 -ccopt -fPIC -I ../../../ocaml/idl -I +ocamldoc -I .. -I ../.. -I ../../database -I ../../autogen -I ../../xapi -I ../../client_records -I ../../util -c ref.ml
File "ref.ml", line 23, characters 18-29:
Error: Unbound value Uuid.secure
*** omake: 259/353 targets are up to date
*** omake: failed (0.89 sec, 32/32 scans, 14/27 rules, 125/436 digests)
*** omake: targets were not rebuilt because of errors:
ocaml/idl/ocaml_backend/ref.cmx
depends on: ocaml/idl/ocaml_backend/ref.ml
ocaml/idl/ocaml_backend/ref.o
depends on: ocaml/idl/ocaml_backend/ref.ml
make[4]: *** [all] Error 2
error: Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.40595 (_build)

RPM build errors:
    Bad exit status from /obj/RPM_BUILD_DIRECTORY/tmp/rpm-tmp.40595 (_build)
make[3]: *** [/output/api/cli-regress.tar.gz] Error 1
@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@d4f184c: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343731472 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 31 10:44 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343731477 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: d4f184c
======> 1343731617 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@1a684ed: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343771315 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Jul 31 21:48 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343771320 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: d4f184c
======> 1343771359 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@3a063dc: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343820512 Build: Regenerating /usr/local/builds/build-xen-git.hg/obj/depends.frag.mk with COMPONENTS_build = xen ioemu blktap install-image-base kernel-rhel4x kernel-rhel6-i686 kernel-rhel6-x86_64 kernel-rhel61-i686 kernel-rhel61-x86_64 kernel-dom0 kernel-dom0-pvops kernel-csp kernel-debian-source kernel-debian-etch-amd64 kernel-debian-etch-i386 kernel-generic-source kernel-generic-rpm-i686 kernel-debian-lenny kernel-netback kernel-iscsitarget branding gcc-dom0 uclibc-kbd dom0 ddk dvsc dlvm xsconsole uclibc-toolchain uclibc-xen driverdomain-network driverdomain-iscsitarget pvdrivers-win template-debian-etch template-debian-etch-amd64 xgt-package install-image docs eulas rhel45-guest-installer rhel46-guest-installer rhel47-guest-installer rhel48-guest-installer rhel50-guest-installer rhel51-guest-installer rhel52-guest-installer rhel53-guest-installer rhel54-guest-installer rhel55-guest-installer rhel56-guest-installer rhel57-guest-installer rhel60-guest-installer rhel61-guest-installer rhel62-guest-installer ubuntu-guest-installer linux-guest-loader binary-iso guest-packages-rhel4x guest-packages-rhel6x guest-packages-PyPAM guest-packages-SDL guest-packages-biosdevname guest-packages-cyrus-sasl guest-packages-dbus guest-packages-directfb guest-packages-dm-multipath guest-packages-e2fsprogs guest-packages-elasticsyslog guest-packages-ethtool guest-packages-fbi guest-packages-firmware guest-packages-gdisk guest-packages-hdparm guest-packages-hwdata guest-packages-iproute2 guest-packages-ipset guest-packages-iptables guest-packages-irqbalance guest-packages-kexec guest-packages-libpcap guest-packages-linux-firmware guest-packages-lvm guest-packages-mbootpack guest-packages-mcelog guest-packages-mercurial guest-packages-mkinitrd guest-packages-net-snmp guest-packages-open-iscsi guest-packages-openssl guest-packages-oprofile guest-packages-pam guest-packages-simplejson guest-packages-smartmontools guest-packages-splashy guest-packages-sysfsutils guest-packages-sysklogd guest-packages-tcpdump guest-packages-udhcp guest-packages-vastsky guest-packages-vhostmd guest-packages-vncsnapshot guest-packages-xenserver-lsb guest-packages-dom0 guest-packages-dom0-kernel guest-packages-csp-kernel guest-packages-dbusproxy guest-packages-vcputune guest-packages-pyserial guest-utilities-rpm guest-utilities-deb dom0-dists chroot-dom0 chroot-centos5 chroot-rhel45 chroot-rhel46 chroot-rhel47 chroot-rhel48 chroot-rhel5 chroot-rhel51 chroot-rhel52 chroot-rhel53 chroot-rhel54 chroot-rhel55 chroot-rhel56 chroot-rhel57 chroot-rhel6 chroot-rhel61 chroot-sles100 chroot-sles101 chroot-sles102 chroot-sles103 chroot-sles110 chroot-etch chroot-lenny ocaml api-libs api-utils api v6 api-bindings syslinux tools-iso win-tools-iso vncterm dotnet-packages-ref xenadmin-ref sm sm-closed sources license product xe-phase-1 xe-phase-2 xe-phase-3 kernel-phase-1 gui-phase-1 docs-phase-1 support-phase-1 all-phase sdktest binary-packages poolmon-deb poolmon-rpm vmmon-deb xha bugagg stunnelng likewise storagelink ocaml-libs openpegasus openvswitch transfer transfervm xs-cim xs-hp-esp integration-suite xencenter-ovf oem-phase-1 xenbootserver-template test-hotfix-1 test-hotfix-2 test-hotfix-3 test-hotfix-3b test-hotfix-4 test-hotfix-4b test-hotfix-5 test-gitbuild cloud-supp vpx-conversion vpx-conversion-rpm conversion-ref vpx-dlvm vpx-dlvm-rpm vpx-wlb vpx-wlb-rpm vpx-license-server vpx-license-server-rpm python-libs remote-ops filesystem-summarise stunnel isl_buildenv xs-netscaler auto-cert-kit guest-templates supp-pack-build tboot dev-pack wsproxy
ln -sf /usr/groups/xen/carbon/trunk-ring3/latest/manifest /usr/local/builds/build-xen-git.hg/obj/manifest.input
-rw-r--r-- 1 root root 0 Aug 1 11:28 /usr/local/builds/build-xen-git.hg/obj/.dirstamp
======> 1343820516 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 1a684ed
======> 1343820527 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@e69de64: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
======> 1343840361 clone-xen-api.git: acquired /usr/local/builds/build-xen-git.hg/obj/repos/xen-api.git.lock
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: 5d0aa9f
======> 1343840409 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@d0d5ccd: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
xen-api: cloning git
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into '/usr/local/builds/build-xen-git.hg/obj/repos/xen-api'...
Refreshing cookie to: e69de64
======> 1344004405 api: xen-api placed into myrepos
Auto-merging ocaml/xenops/xenops_server.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/database/redo_log.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@70c578f: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: d0d5ccd
======> 1344265515 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@991e3dd: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
Cloning: git://hg.uk.xensource.com/carbon/trunk-ring3/xen-api.git to /usr/local/builds/build-xen-git.hg/obj/repos/xen-api
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: 70c578f
======> 1344360151 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@ed4928c: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: 70c578f
======> 1344363030 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@1cf65dd: Merge and build failed.

Failed when executing:
git merge 9939238
Error log:
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: ed4928c
======> 1344389377 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@5f02c76: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761
" 9939238
Error log:
Cloning into /usr/local/builds/build-xen-git.hg/obj/repos/xen-api...
Refreshing cookie to: 1cf65dd
======> 1344435800 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@4ae49a0: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Refreshing cookie to: 5f02c76
======> 1344551536 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f003243: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Refreshing cookie to: 28b2b95
======> 1344959731 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@e1f6087: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Refreshing cookie to: 7f0c866
======> 1344963179 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@ab8ec23: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Refreshing cookie to: e1f6087
======> 1345046248 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@912fa9b: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Refreshing cookie to: ab8ec23
======> 1345109572 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@25a5944: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
======> 1345126747 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@ffaf1b2: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
======> 1345136959 api: xen-api placed into myrepos
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@robhoes
Owner

We are going to do this post-tampa.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@02d9a6b: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@7f1ac9e: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@69059a4: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@293b5d9: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@7975c11: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@4a2ae0b: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/database/redo_log.ml
Auto-merging ocaml/idl/ocaml_backend/taskHelper.ml
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@70bd1b2: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@51ce390: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@6712983: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f8ade9e: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@075a4d2: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f03a307: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@c7853bc: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@d01fd9b: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@0a40866: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
CONFLICT (content): Merge conflict in ocaml/idl/ocaml_backend/taskHelper.ml
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@1ff57c3: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@4046907: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/dbsync_slave.ml
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f749db6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@b596092: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@e7c4abd: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@9ee3df5: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/helpers.ml
Auto-merging ocaml/xapi/import.ml
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@7c62863: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@3024628: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/storage_migrate.ml
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@e741bb5: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@1fdd46f: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f463ff6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f84cbb2: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_bond.ml
Auto-merging ocaml/xapi/xapi_ha.ml
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@63d41a8: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@4ca1a4c: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@d3754ae: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@05ed6e8: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@42a7d48: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f2c23f6: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@dbd1565: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@2c0fbe1: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@8cddb3a: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@f0f8d51: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host.ml
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@0817d46: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@4baae9e: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_host_crashdump.ml
Auto-merging ocaml/xapi/xapi_message.ml
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@094c895: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@ae24881: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@xen-git
Owner

djs55/xen-api@9939238xapi-project/xen-api@1bfdaaf: Merge and build failed.

Failed when executing:
git merge -m "Merge pull request #756 from djs55/CA-85761" 9939238
Error log:
Auto-merging ocaml/xapi/xapi_network.ml
Auto-merging ocaml/xapi/xapi_pif.ml
Auto-merging ocaml/xapi/xapi_pool_patch.ml
Auto-merging ocaml/xapi/xapi_sr.ml
Auto-merging ocaml/xapi/xapi_vdi.ml
Auto-merging ocaml/xapi/xapi_vif_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vif_helpers.ml
Auto-merging ocaml/xapi/xapi_vm.ml
Auto-merging ocaml/xapi/xapi_vm_appliance.ml
Auto-merging ocaml/xapi/xapi_vm_helpers.ml
CONFLICT (content): Merge conflict in ocaml/xapi/xapi_vm_helpers.ml
Auto-merging ocaml/xapi/xapi_vmpp.ml
Auto-merging ocaml/xapi/xapi_xenops.ml
Auto-merging ocaml/xenops-cli/xn.ml
Auto-merging ocaml/xenops/domain.ml
Auto-merging ocaml/xenops/stubdom.ml
Auto-merging ocaml/xenops/xenguestHelper.ml
Auto-merging ocaml/xenops/xenops.ml
Auto-merging ocaml/xenops/xenops_server.ml
Automatic merge failed; fix conflicts and then commit the result.

@jonludlam
Owner

I'm going to close this until the branch can be rebased.

@jonludlam jonludlam closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 26, 2012
  1. @djs55

    [xapi] add missing .mli file

    djs55 authored
    Signed-off-by: David Scott <dave.scott@eu.citrix.com>
  2. @djs55

    CA-85761: switch most UUID generation over to fast PRNG, rather than …

    djs55 authored
    …/dev/urandom
    
    We only need /dev/{u,}random when the results have to be unguessable.
    In the vast majority of cases we only require the UUIDs to be Unique.
    
    When we need an unguessable UUID we use Uuid.secure() and when we need
    only a unique UUID we use Uuid.insecure()
    
    In particular, we still need unguessable UUIDs for anything to do with
    * session generation
    * secrets
    
    Signed-off-by: David Scott <dave.scott@eu.citrix.com>
  3. @djs55

    CA-85761: switch most Ref generation over to fast PRNG, rather than /…

    djs55 authored
    …dev/urandom
    
    Just like with UUIDs, the vast majority of the time we only need
    Refs to be Unique, not unguessable.
    
    Whenever we want an unguessable ref, we call Ref.secure() and whenever
    we only need a unique ref, we call Ref.insecure()
    
    In particular, we still need unguessable UUIDs for anything to do with
    * session generation
    * secrets
    
    Signed-off-by: David Scott <dave.scott@eu.citrix.com>
  4. @djs55

    CA-85761: adjust the new unit test suite to use the new Ref/Uuid APIs

    djs55 authored
    Signed-off-by: David Scott <dave.scott@eu.citrix.com>
This page is out of date. Refresh to see the latest.
Showing with 225 additions and 180 deletions.
  1. +1 −1  ocaml/database/block_device_io.ml
  2. +1 −1  ocaml/database/redo_log.ml
  3. +1 −1  ocaml/gpg/gpg.ml
  4. +5 −3 ocaml/idl/ocaml_backend/ref.ml
  5. +4 −1 ocaml/idl/ocaml_backend/ref.mli
  6. +2 −2 ocaml/idl/ocaml_backend/taskHelper.ml
  7. +1 −1  ocaml/ptoken/genptoken.ml
  8. +2 −2 ocaml/test/suite.ml
  9. +2 −2 ocaml/util/util_inventory.ml
  10. +10 −10 ocaml/xapi/create_misc.ml
  11. +2 −2 ocaml/xapi/dbsync.ml
  12. +4 −4 ocaml/xapi/dbsync_master.ml
  13. +3 −3 ocaml/xapi/dbsync_slave.ml
  14. +2 −2 ocaml/xapi/debug_populate.ml
  15. +1 −1  ocaml/xapi/helpers.ml
  16. +12 −12 ocaml/xapi/import.ml
  17. +10 −10 ocaml/xapi/monitor_master.ml
  18. +3 −3 ocaml/xapi/quicktest_storage.ml
  19. +2 −2 ocaml/xapi/storage_access.ml
  20. +2 −2 ocaml/xapi/storage_migrate.ml
  21. +1 −1  ocaml/xapi/system_status.ml
  22. +2 −2 ocaml/xapi/xapi_blob.ml
  23. +4 −4 ocaml/xapi/xapi_bond.ml
  24. +2 −2 ocaml/xapi/xapi_crashdump.ml
  25. +2 −2 ocaml/xapi/xapi_dr_task.ml
  26. +2 −2 ocaml/xapi/xapi_gpu_group.ml
  27. +1 −1  ocaml/xapi/xapi_guest_agent.ml
  28. +1 −1  ocaml/xapi/xapi_ha.ml
  29. +3 −3 ocaml/xapi/xapi_host.ml
  30. +1 −1  ocaml/xapi/xapi_host_crashdump.ml
  31. +1 −1  ocaml/xapi/xapi_local_session.ml
  32. +2 −2 ocaml/xapi/xapi_message.ml
  33. +2 −2 ocaml/xapi/xapi_network.ml
  34. +2 −2 ocaml/xapi/xapi_pbd.ml
  35. +2 −2 ocaml/xapi/xapi_pci.ml
  36. +2 −2 ocaml/xapi/xapi_pgpu.ml
  37. +8 −8 ocaml/xapi/xapi_pif.ml
  38. +4 −4 ocaml/xapi/xapi_pool_patch.ml
  39. +2 −2 ocaml/xapi/xapi_role.ml
  40. +2 −2 ocaml/xapi/xapi_secret.ml
  41. +2 −2 ocaml/xapi/xapi_session.ml
  42. +1 −1  ocaml/xapi/xapi_sm.ml
  43. +4 −4 ocaml/xapi/xapi_sr.ml
  44. +2 −2 ocaml/xapi/xapi_subject.ml
  45. +1 −1  ocaml/xapi/xapi_test_common.ml
  46. +5 −5 ocaml/xapi/xapi_tunnel.ml
  47. +2 −2 ocaml/xapi/xapi_user.ml
  48. +3 −3 ocaml/xapi/xapi_vbd.ml
  49. +4 −4 ocaml/xapi/xapi_vbd_helpers.ml
  50. +2 −2 ocaml/xapi/xapi_vdi.ml
  51. +2 −2 ocaml/xapi/xapi_vgpu.ml
  52. +3 −3 ocaml/xapi/xapi_vif_helpers.ml
  53. +3 −3 ocaml/xapi/xapi_vlan.ml
  54. +1 −1  ocaml/xapi/xapi_vm.ml
  55. +2 −2 ocaml/xapi/xapi_vm_appliance.ml
  56. +7 −7 ocaml/xapi/xapi_vm_clone.ml
  57. +5 −5 ocaml/xapi/xapi_vm_helpers.ml
  58. +4 −4 ocaml/xapi/xapi_vmpp.ml
  59. +2 −2 ocaml/xapi/xapi_xenops.ml
  60. +1 −1  ocaml/xenops-cli/xn.ml
  61. +40 −0 ocaml/xenops/cancel_utils.mli
  62. +3 −3 ocaml/xenops/domain.ml
  63. +2 −2 ocaml/xenops/memory_server.ml
  64. +1 −1  ocaml/xenops/stubdom.ml
  65. +3 −3 ocaml/xenops/tests.ml
  66. +2 −2 ocaml/xenops/xenguestHelper.ml
  67. +1 −1  ocaml/xenops/xenops.ml
  68. +1 −1  ocaml/xenops/xenops_server.ml
View
2  ocaml/database/block_device_io.ml
@@ -97,7 +97,7 @@ let magic = "redo-log--------" (* 16 bytes *)
(* Lengths of things on the socket comms protocol and in the redo-log *)
let magic_size = 16
let generation_size = 16
-let marker_size = String.length (Uuid.to_string (Uuid.make_uuid ()))
+let marker_size = String.length (Uuid.to_string (Uuid.insecure ()))
let size_size = 16 (* decimal digits *)
let command_size = 10 (* "write_delta" or "write_db___" or "read______" or "empty_____" *)
View
2  ocaml/database/redo_log.ml
@@ -663,7 +663,7 @@ let redo_log_creation_mutex = Mutex.create ()
let create ~name ~state_change_callback ~read_only =
let instance = {
name = name;
- marker = Uuid.to_string (Uuid.make_uuid ());
+ marker = Uuid.to_string (Uuid.insecure ());
read_only = read_only;
enabled = ref false;
device = ref None;
View
2  ocaml/gpg/gpg.ml
@@ -58,7 +58,7 @@ let common ty filename signature size f =
Unix.unlink tmp_file;
(* no need to close the 'tmp_oc' -> closing the fd is enough *)
let status_out, status_in = Unix.pipe() in
- let status_in_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let status_in_uuid = Uuid.to_string (Uuid.insecure ()) in (* only for command-line substitution *)
(* from the parent's PoV *)
let fds_to_close = ref [ result_out; result_in; status_out; status_in ] in
let close' fd =
View
8 ocaml/idl/ocaml_backend/ref.ml
@@ -17,9 +17,11 @@ type 'a t = string
let ref_prefix = "OpaqueRef:"
-let make () =
- let uuid = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+let wrap f () =
+ let uuid = Uuid.string_of_uuid (f ()) in
ref_prefix ^ uuid
+let secure = wrap Uuid.secure
+let insecure = wrap Uuid.insecure
let null = ref_prefix ^ "NULL"
@@ -37,7 +39,7 @@ let dummy_prefix = "DummyRef:"
open Stringext
let make_dummy task_name =
- let uuid = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+ let uuid = Uuid.string_of_uuid (Uuid.insecure ()) in
dummy_prefix ^ String.of_char dummy_sep ^ uuid ^ String.of_char dummy_sep ^ task_name
let is_dummy x =
View
5 ocaml/idl/ocaml_backend/ref.mli
@@ -15,7 +15,10 @@
type 'a t
val ref_prefix : string
-val make : unit -> 'a t
+
+val secure : unit -> 'a t
+val insecure : unit -> 'a t
+
val null : 'a t
val string_of : 'a t -> string
val of_string : string -> 'a t
View
4 ocaml/idl/ocaml_backend/taskHelper.ml
@@ -28,9 +28,9 @@ let string_of_task task_name task_id =
(* creates a new task *)
let make ~__context ?(description="") ?session_id ?subtask_of label : (t * t Uuid.t) =
- let uuid = Uuid.make_uuid () in
+ let uuid = Uuid.insecure () in
let uuid_str = Uuid.string_of_uuid uuid in
- let ref = Ref.make () in
+ let ref = Ref.insecure () in
(* we store in database only parent/child relationship between real tasks *)
let subtaskid_of = match subtask_of with
| Some task_id when not (Ref.is_dummy task_id) -> task_id
View
2  ocaml/ptoken/genptoken.ml
@@ -17,7 +17,7 @@ let _ =
then if !options.force
then Sys.remove !options.tgtfile
else begin print_endline "File exists, use -f to replace it."; exit 1 end;
- let uuid _ = Uuid.to_string (Uuid.make_uuid ()) in
+ let uuid _ = Uuid.to_string (Uuid.secure ()) in
let uuids = String.concat "/" [uuid (); uuid (); uuid ()] in
let f = open_out_gen [Open_wronly; Open_creat; Open_excl; Open_binary] 0o640 !options.tgtfile in
output_string f uuids
View
4 ocaml/test/suite.ml
@@ -39,9 +39,9 @@ let test_always_fail () = skip "This will fail" ; assert_equal 1 0
let test_mock_db () =
let db = MockDatabase.make () in
let __context = MockContext.make ~database:db "Mock context" in
- let blob_ref = Ref.make () in
+ let blob_ref = Ref.insecure () in
Db.Blob.create __context blob_ref
- (Uuid.to_string (Uuid.make_uuid ()))
+ (Uuid.to_string (Uuid.insecure ()))
"BLOB" "" 5L true (Date.of_float 0.0) "" ;
ignore (Db.Blob.get_record ~__context ~self:blob_ref) ;
ignore (Db.VM.get_all_records ~__context) ;
View
4 ocaml/util/util_inventory.ml
@@ -43,8 +43,8 @@ let inventory_m = Mutex.create ()
(* Compute the minimum necessary inventory file contents *)
let minimum_default_entries () =
- let host_uuid = Uuid.string_of_uuid (Uuid.make_uuid ()) in
- let dom0_uuid = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+ let host_uuid = Uuid.string_of_uuid (Uuid.insecure ()) in
+ let dom0_uuid = Uuid.string_of_uuid (Uuid.insecure ()) in
[ _installation_uuid, host_uuid;
_control_domain_uuid, dom0_uuid;
_management_interface, "";
View
20 ocaml/xapi/create_misc.ml
@@ -115,7 +115,7 @@ let rec ensure_domain_zero_records ~__context (host_info: host_info) : unit =
and ensure_domain_zero_record ~__context (host_info: host_info): [`VM] Ref.t =
let ref_lookup () = Helpers.get_domain_zero ~__context in
- let ref_create () = Ref.make () in
+ let ref_create () = Ref.insecure () in
let (domain_zero_ref, found) =
try ref_lookup (), true
with _ -> ref_create (), false in
@@ -142,7 +142,7 @@ and ensure_domain_zero_guest_metrics_record ~__context ~domain_zero_ref (host_in
if not (Db.is_valid_ref __context (Db.VM.get_metrics ~__context ~self:domain_zero_ref)) then
begin
debug "Domain 0 record does not have associated guest metrics record. Creating now";
- let metrics_ref = Ref.make() in
+ let metrics_ref = Ref.insecure() in
create_domain_zero_guest_metrics_record ~__context ~domain_zero_metrics_ref:metrics_ref ~memory_constraints:(create_domain_zero_default_memory_constraints host_info)
~vcpus:(calculate_domain_zero_vcpu_count ~__context);
Db.VM.set_metrics ~__context ~self:domain_zero_ref ~value:metrics_ref
@@ -165,7 +165,7 @@ and create_domain_zero_record ~__context ~domain_zero_ref (host_info: host_info)
let uuid = host_info.dom0_uuid in
(* FIXME: Assume dom0 has 1 vCPU per Host_cpu for now *)
let vcpus = calculate_domain_zero_vcpu_count ~__context in
- let metrics = Ref.make () in
+ let metrics = Ref.insecure () in
(* Now create the database record. *)
Db.VM.create ~__context ~ref:domain_zero_ref
~name_label:("Control domain on host: " ^ host_info.hostname) ~uuid
@@ -204,11 +204,11 @@ and create_domain_zero_console_record ~__context ~domain_zero_ref : unit =
let this_dom0s_consoles = Db.Console.get_refs_where ~__context ~expr: (Eq(Field "_ref", Literal (Ref.string_of domain_zero_ref))) in
List.iter (fun console -> debug "Deleted old dom0 console record"; Db.Console.destroy ~__context ~self: console) this_dom0s_consoles;
(* now make a new console record for dom0 *)
- let console_ref = Ref.make () in
+ let console_ref = Ref.insecure () in
let address = Db.Host.get_address ~__context ~self: (Helpers.get_localhost ~__context) in
let location = Printf.sprintf "https://%s%s?ref=%s" address Constants.console_uri (Ref.string_of domain_zero_ref) in
Db.Console.create ~__context ~ref: console_ref
- ~uuid: (Uuid.to_string (Uuid.make_uuid ()))
+ ~uuid: (Uuid.to_string (Uuid.insecure ()))
~protocol:`rfb
~location
~vM: domain_zero_ref
@@ -219,7 +219,7 @@ and create_domain_zero_guest_metrics_record ~__context ~domain_zero_metrics_ref
let rec mkints = function
| 0 -> []
| n -> (mkints (n - 1) @ [n]) in
- Db.VM_metrics.create ~__context ~ref: domain_zero_metrics_ref ~uuid: (Uuid.to_string (Uuid.make_uuid ()))
+ Db.VM_metrics.create ~__context ~ref: domain_zero_metrics_ref ~uuid: (Uuid.to_string (Uuid.insecure ()))
~memory_actual: memory_constraints.target
~vCPUs_utilisation: (List.map (fun x -> Int64.of_int x, 0.) (mkints vcpus))
~vCPUs_number: (Int64.of_int vcpus)
@@ -307,8 +307,8 @@ open Db_filter
let create_root_user ~__context =
let fullname = "superuser"
and short_name = "root"
- and uuid = Uuid.to_string (Uuid.make_uuid ())
- and ref = Ref.make () in
+ and uuid = Uuid.to_string (Uuid.insecure ())
+ and ref = Ref.insecure () in
let all = Db.User.get_records_where ~__context ~expr:(Eq(Field "short_name", Literal short_name)) in
if all = [] then Db.User.create ~__context ~ref ~fullname ~short_name ~uuid ~other_config:[]
@@ -484,8 +484,8 @@ let create_host_cpu ~__context =
List.iter (fun (r, _) -> Db.Host_cpu.destroy ~__context ~self:r) host_cpus;
for i = 0 to number - 1
do
- let uuid = Uuid.to_string (Uuid.make_uuid ())
- and ref = Ref.make () in
+ let uuid = Uuid.to_string (Uuid.insecure ())
+ and ref = Ref.insecure () in
debug "Creating CPU %d: %s" i uuid;
ignore (Db.Host_cpu.create ~__context ~ref ~uuid ~host ~number:(Int64.of_int i)
~vendor ~speed ~modelname
View
4 ocaml/xapi/dbsync.ml
@@ -38,9 +38,9 @@ let create_host_metrics ~__context =
let m = Db.Host.get_metrics ~__context ~self in
if not(Db.is_valid_ref __context m) then begin
debug "Creating missing Host_metrics object for Host: %s" (Db.Host.get_uuid ~__context ~self);
- let r = Ref.make () in
+ let r = Ref.insecure () in
Db.Host_metrics.create ~__context ~ref:r
- ~uuid:(Uuid.to_string (Uuid.make_uuid ())) ~live:false
+ ~uuid:(Uuid.to_string (Uuid.insecure ())) ~live:false
~memory_total:0L ~memory_free:0L ~last_updated:Date.never ~other_config:[];
Db.Host.set_metrics ~__context ~self ~value:r
end) (Db.Host.get_all ~__context)
View
8 ocaml/xapi/dbsync_master.ml
@@ -27,7 +27,7 @@ open Client
let create_pool_record ~__context =
let pools = Db.Pool.get_all ~__context in
if pools=[] then
- Db.Pool.create ~__context ~ref:(Ref.make()) ~uuid:(Uuid.to_string (Uuid.make_uuid()))
+ Db.Pool.create ~__context ~ref:(Ref.insecure()) ~uuid:(Uuid.to_string (Uuid.insecure()))
~name_label:"" ~name_description:"" ~master:(Helpers.get_localhost ~__context)
~default_SR:Ref.null ~suspend_image_SR:Ref.null ~crash_dump_SR:Ref.null
~ha_enabled:false ~ha_configuration:[] ~ha_statefiles:[]
@@ -129,7 +129,7 @@ let create_tools_sr __context =
with _ ->
begin
let sr =
- Client.SR.introduce ~rpc ~session_id ~uuid:(Uuid.to_string (Uuid.make_uuid()))
+ Client.SR.introduce ~rpc ~session_id ~uuid:(Uuid.to_string (Uuid.insecure()))
~name_label:name
~name_description:description
~_type ~content_type ~shared ~sm_config:[] in
@@ -164,8 +164,8 @@ let ensure_vm_metrics_records_exist __context =
let m = Db.VM.get_metrics ~__context ~self:vm in
if not(Db.is_valid_ref __context m) then begin
info "Regenerating missing VM_metrics record for VM %s" (Ref.string_of vm);
- let m = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let m = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
Db.VM_metrics.create ~__context ~ref:m ~uuid
~vCPUs_number:0L
~vCPUs_utilisation:[] ~memory_actual:0L
View
6 ocaml/xapi/dbsync_slave.ml
@@ -159,13 +159,13 @@ let record_host_memory_properties ~__context =
(* -- used this for testing uniqueness constraints executed on slave do not kill connection.
Committing commented out vsn of this because it might be useful again..
let test_uniqueness_doesnt_kill_us ~__context =
- let duplicate_uuid = Uuid.to_string (Uuid.make_uuid()) in
- Db.Network.create ~__context ~ref:(Ref.make()) ~uuid:duplicate_uuid
+ let duplicate_uuid = Uuid.to_string (Uuid.insecure()) in
+ Db.Network.create ~__context ~ref:(Ref.insecure()) ~uuid:duplicate_uuid
~current_operations:[] ~allowed_operations:[]
~name_label:"Test uniqueness constraint"
~name_description:"Testing"
~bridge:"bridge" ~other_config:[];
- Db.Network.create ~__context ~ref:(Ref.make()) ~uuid:duplicate_uuid
+ Db.Network.create ~__context ~ref:(Ref.insecure()) ~uuid:duplicate_uuid
~current_operations:[] ~allowed_operations:[]
~name_label:"Test uniqueness constraint"
~name_description:"Testing"
View
4 ocaml/xapi/debug_populate.ml
@@ -22,7 +22,7 @@ let rec make_srs __context i =
if i=0 then ()
else
begin
- let uuid = Uuid.to_string (Uuid.make_uuid()) in
+ let uuid = Uuid.to_string (Uuid.insecure()) in
let sr_ref = Xapi_sr.introduce ~__context ~uuid:uuid ~name_label:("SR-"^(string_of_int i))
~name_description:"Dummy data" ~_type:"ext" ~content_type:"dummy" ~shared:true ~sm_config:[] in
srs := sr_ref :: !srs;
@@ -48,7 +48,7 @@ let rec make_vdis_and_vbds __context vmref i =
if i=0 then ()
else
begin
- let uuid = Uuid.to_string (Uuid.make_uuid()) in
+ let uuid = Uuid.to_string (Uuid.insecure()) in
let vm_uuid = Db.VM.get_uuid ~self:vmref ~__context in
let name_label = "VDI-"^(string_of_int i)^"-for-VM-"^vm_uuid in
let name_description = "dummy" in
View
2  ocaml/xapi/helpers.ml
@@ -590,7 +590,7 @@ let get_pool_secret () =
Unix.access Constants.pool_secret_path [Unix.F_OK];
pool_secret := Unixext.string_of_file Constants.pool_secret_path
with _ -> (* No pool secret exists. *)
- let mk_rand_string () = Uuid.to_string (Uuid.make_uuid()) in
+ let mk_rand_string () = Uuid.to_string (Uuid.secure()) in
pool_secret := (mk_rand_string()) ^ "/" ^ (mk_rand_string()) ^ "/" ^ (mk_rand_string());
Unixext.write_string_to_file Constants.pool_secret_path !pool_secret
View
24 ocaml/xapi/import.ml
@@ -297,7 +297,7 @@ module VM : HandlerTools = struct
| Fail e -> raise e
| Default_template template -> state.table <- (x.cls, x.id, Ref.string_of template) :: state.table
| Clean_import _ | Replace _ ->
- let dummy_vm = Ref.make () in
+ let dummy_vm = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vm) :: state.table
let handle __context config rpc session_id state x precheck_result =
@@ -312,7 +312,7 @@ module VM : HandlerTools = struct
if config.full_restore
then other_config
else
- (Xapi_globs.mac_seed, Uuid.string_of_uuid (Uuid.make_uuid ())) ::
+ (Xapi_globs.mac_seed, Uuid.string_of_uuid (Uuid.insecure ())) ::
(List.filter (fun (x, _) -> x <> Xapi_globs.mac_seed) other_config) in
let vm_record = { vm_record with API.vM_other_config = other_config } in
@@ -446,15 +446,15 @@ module GuestMetrics : HandlerTools = struct
let precheck __context config rpc session_id state x = OK
let handle_dry_run __context config rpc session_id state x precheck_result =
- let dummy_gm = Ref.make () in
+ let dummy_gm = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_gm) :: state.table
let handle __context config rpc session_id state x precheck_result =
let gm_record = API.From.vM_guest_metrics_t "" x.snapshot in
- let gm = Ref.make () in
+ let gm = Ref.insecure () in
Db.VM_guest_metrics.create ~__context
~ref:gm
- ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ ~uuid:(Uuid.to_string (Uuid.insecure ()))
~os_version:gm_record.API.vM_guest_metrics_os_version
~pV_drivers_version:gm_record.API.vM_guest_metrics_PV_drivers_version
~pV_drivers_up_to_date:gm_record.API.vM_guest_metrics_PV_drivers_up_to_date
@@ -591,13 +591,13 @@ module VDI : HandlerTools = struct
(* We expect the disk to be missing during a live migration dry run. *)
debug "Ignoring missing disk %s - this will be mirrored during a real live migration." x.id;
(* Create a dummy disk in the state table so the VBD import has a disk to look up. *)
- let dummy_vdi = Ref.make () in
+ let dummy_vdi = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vdi) :: state.table
| _ -> raise e
end
| Skip -> ()
| Create _ ->
- let dummy_vdi = Ref.make () in
+ let dummy_vdi = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vdi) :: state.table
let handle __context config rpc session_id state x precheck_result =
@@ -646,7 +646,7 @@ module Net : HandlerTools = struct
match precheck_result with
| Found_net net -> state.table <- (x.cls, x.id, Ref.string_of net) :: state.table
| Create _ ->
- let dummy_net = Ref.make () in
+ let dummy_net = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_net) :: state.table
let handle __context config rpc session_id state x precheck_result =
@@ -708,7 +708,7 @@ module GPUGroup : HandlerTools = struct
state.table <- (x.cls, x.id, Ref.string_of group) :: state.table
| Found_no_GPU_group e -> raise e
| Create _ ->
- let dummy_gpu_group = Ref.make () in
+ let dummy_gpu_group = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_gpu_group) :: state.table
let handle __context config rpc session_id state x precheck_result =
@@ -801,7 +801,7 @@ module VBD : HandlerTools = struct
| Fail e -> raise e
| Skip -> ()
| Create _ -> begin
- let dummy_vbd = Ref.make () in
+ let dummy_vbd = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vbd) :: state.table
end
@@ -867,7 +867,7 @@ module VIF : HandlerTools = struct
state.table <- (x.cls, Ref.string_of vif, Ref.string_of vif) :: state.table
end
| Create _ -> begin
- let dummy_vif = Ref.make () in
+ let dummy_vif = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vif) :: state.table
end
@@ -929,7 +929,7 @@ module VGPU : HandlerTools = struct
state.table <- (x.cls, Ref.string_of vgpu, Ref.string_of vgpu) :: state.table
end
| Create _ -> begin
- let dummy_vgpu = Ref.make () in
+ let dummy_vgpu = Ref.insecure () in
state.table <- (x.cls, x.id, Ref.string_of dummy_vgpu) :: state.table
end
View
20 ocaml/xapi/monitor_master.ml
@@ -38,8 +38,8 @@ let set_vm_metrics ~__context ~vm ~memory ~cpus =
(* If VM metrics don't exist, then create them. *)
let metrics = Db.VM.get_metrics ~__context ~self:vm in
if not (Db.is_valid_ref __context metrics) then (
- let ref = Ref.make () in
- Db.VM_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ let ref = Ref.insecure () in
+ Db.VM_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.insecure ()))
~memory_actual:0L ~vCPUs_number:0L
~vCPUs_utilisation:[]
~vCPUs_CPU:[]
@@ -80,8 +80,8 @@ let update_vm_stats ~__context uuid cpus vbds vifs memory =
(* If VIF metrics don't exist, then make them. *)
let metrics = Db.VIF.get_metrics ~__context ~self in
if not (Db.is_valid_ref __context metrics) then begin
- let ref = Ref.make () in
- Db.VIF_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ let ref = Ref.insecure () in
+ Db.VIF_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.insecure ()))
~io_read_kbs:0. ~io_write_kbs:0. ~last_updated:(Date.of_float 0.) ~other_config:[];
Db.VIF.set_metrics ~__context ~self ~value:ref
end;
@@ -107,8 +107,8 @@ let update_vm_stats ~__context uuid cpus vbds vifs memory =
(* if vbd metrics don't exist then make one *)
let metrics = Db.VBD.get_metrics ~__context ~self in
if not (Db.is_valid_ref __context metrics) then begin
- let ref = Ref.make () in
- Db.VBD_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ let ref = Ref.insecure () in
+ Db.VBD_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.insecure ()))
~io_read_kbs:0. ~io_write_kbs:0. ~last_updated:(Date.of_float 0.) ~other_config:[];
Db.VBD.set_metrics ~__context ~self ~value:ref
end;
@@ -138,8 +138,8 @@ let update_host_cpu ~__context host cpus' =
let numbers = List.map (fun self -> Int64.to_int (Db.Host_cpu.get_number ~__context ~self)) all in
for i = 0 to Array.length cpus - 1 do
if not (List.mem i numbers) then
- let () = Db.Host_cpu.create ~__context ~ref:(Ref.make())
- ~uuid:(Uuid.string_of_uuid (Uuid.make_uuid ())) ~host ~number:(Int64.of_int i)
+ let () = Db.Host_cpu.create ~__context ~ref:(Ref.insecure())
+ ~uuid:(Uuid.string_of_uuid (Uuid.insecure ())) ~host ~number:(Int64.of_int i)
~vendor:"unknown" ~speed:0L ~modelname:"unknown"
~utilisation:cpus.(i) ~flags:"unknown" ~stepping:"unknown" ~model:(-1L) ~family:(-1L)
~features:"unknown" ~other_config:[] in ()
@@ -253,8 +253,8 @@ let update_pifs ~__context host pifs =
if Db.is_valid_ref __context pifrec.API.pIF_metrics then
pifrec.API.pIF_metrics
else begin
- let ref = Ref.make() in
- Db.PIF_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.make_uuid ())) ~carrier:false
+ let ref = Ref.insecure() in
+ Db.PIF_metrics.create ~__context ~ref ~uuid:(Uuid.to_string (Uuid.insecure ())) ~carrier:false
~device_name:"" ~vendor_name:"" ~device_id:"" ~vendor_id:""
~speed:0L ~duplex:false ~pci_bus_path:""
~io_read_kbs:0. ~io_write_kbs:0. ~last_updated:(Date.of_float 0.)
View
6 ocaml/xapi/quicktest_storage.ml
@@ -377,7 +377,7 @@ let vdi_bad_introduce caps session_id sr vdi =
let (_: API.ref_VDI) = Client.VDI.introduce ~rpc:!rpc ~session_id
~uuid:vdir.API.vDI_uuid ~name_label:"bad uuid" ~name_description:""
~sR:vdir.API.vDI_SR ~_type:vdir.API.vDI_type ~sharable:false ~read_only:false ~other_config:[]
- ~location:(Ref.string_of (Ref.make ())) ~xenstore_data:[] ~sm_config:[]
+ ~location:(Ref.string_of (Ref.insecure ())) ~xenstore_data:[] ~sm_config:[]
~managed:true ~virtual_size:0L ~physical_utilisation:0L ~metadata_of_pool:Ref.null
~is_a_snapshot:false ~snapshot_time:Date.never ~snapshot_of:Ref.null
in
@@ -390,7 +390,7 @@ let vdi_bad_introduce caps session_id sr vdi =
try
debug test (Printf.sprintf "Introducing a VDI with a duplicate location (%s)" vdir.API.vDI_location);
let (_: API.ref_VDI) = Client.VDI.introduce ~rpc:!rpc ~session_id
- ~uuid:(Uuid.string_of_uuid (Uuid.make_uuid ()))
+ ~uuid:(Uuid.string_of_uuid (Uuid.insecure ()))
~name_label:"bad location" ~name_description:""
~sR:vdir.API.vDI_SR ~_type:vdir.API.vDI_type ~sharable:false ~read_only:false ~other_config:[]
~location:vdir.API.vDI_location ~xenstore_data:[] ~sm_config:[]
@@ -474,7 +474,7 @@ let packages_iso_test session_id =
start test;
let host = List.hd (Client.Host.get_all !rpc session_id) in
debug test (Printf.sprintf "Will plug into host %s" (Client.Host.get_name_label !rpc session_id host));
- let sr = Client.SR.introduce ~rpc:!rpc ~session_id ~uuid:(Uuid.string_of_uuid (Uuid.make_uuid ()))
+ let sr = Client.SR.introduce ~rpc:!rpc ~session_id ~uuid:(Uuid.string_of_uuid (Uuid.insecure ()))
~name_label:"test tools SR" ~name_description:"" ~_type:"iso" ~content_type:"iso"
~shared:true ~sm_config:[] in
finally
View
4 ocaml/xapi/storage_access.ml
@@ -287,7 +287,7 @@ module SMAPIv1 = struct
(fun __context ->
let other_config = Db.VDI.get_other_config ~__context ~self in
if not (List.mem_assoc "content_id" other_config)
- then Db.VDI.add_to_other_config ~__context ~self ~key:"content_id" ~value:(Uuid.string_of_uuid (Uuid.make_uuid ())));
+ then Db.VDI.add_to_other_config ~__context ~self ~key:"content_id" ~value:(Uuid.string_of_uuid (Uuid.insecure ())));
(* If the backend doesn't advertise the capability then do nothing *)
if List.mem Smint.Vdi_activate (Sm.capabilities_of_driver _type)
then Sm.vdi_deactivate device_config _type sr self
@@ -378,7 +378,7 @@ module SMAPIv1 = struct
List.assoc "content_id"
(Db.VDI.get_other_config ~__context ~self:clonee)
with _ ->
- Uuid.string_of_uuid (Uuid.make_uuid ())
+ Uuid.string_of_uuid (Uuid.insecure ())
in
Db.VDI.set_name_label ~__context ~self ~value:vdi_info.name_label;
Db.VDI.set_name_description ~__context ~self ~value:vdi_info.name_description;
View
4 ocaml/xapi/storage_migrate.ml
@@ -236,7 +236,7 @@ let copy' ~task ~dbg ~sr ~vdi ~url ~dest ~dest_vdi =
try
- let dp = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+ let dp = Uuid.string_of_uuid (Uuid.insecure ()) in
let dest_vdi_url = Http.Url.set_uri remote_url (Printf.sprintf "%s/nbd/%s/%s/%s" (Http.Url.get_uri remote_url) dest dest_vdi dp) |> Http.Url.to_string in
debug "copy remote=%s/%s NBD URL = %s" dest dest_vdi dest_vdi_url;
@@ -467,7 +467,7 @@ let receive_start ~dbg ~sr ~vdi_info ~id ~similar =
let vdis = Local.SR.scan ~dbg ~sr in
- let leaf_dp = Local.DP.create ~dbg ~id:(Uuid.string_of_uuid (Uuid.make_uuid ())) in
+ let leaf_dp = Local.DP.create ~dbg ~id:(Uuid.string_of_uuid (Uuid.insecure ())) in
try
let vdi_info = { vdi_info with sm_config = ["base_mirror", id] } in
View
2  ocaml/xapi/system_status.ml
@@ -32,7 +32,7 @@ let get_capabilities () =
(* This fn outputs xen-bugtool straight to the socket, only
for tar output. It should work on embedded edition *)
let send_via_fd __context s entries output =
- let s_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let s_uuid = Uuid.to_string (Uuid.insecure ()) in
let params =
[sprintf "--entries=%s" entries;
View
4 ocaml/xapi/xapi_blob.ml
@@ -17,8 +17,8 @@ module D = Debug.Debugger(struct let name="xapi_blob" end)
open D
let create ~__context ~mime_type ~public =
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure () in
let mime_type' = if mime_type="" then "application/octet-stream" else mime_type in
Db.Blob.create ~__context ~ref ~uuid:(Uuid.to_string uuid) ~public ~mime_type:mime_type' ~size:0L ~last_updated:(Date.never) ~name_label:"" ~name_description:"";
ref
View
8 ocaml/xapi/xapi_bond.ml
@@ -284,8 +284,8 @@ let create ~__context ~network ~members ~mAC ~mode ~properties =
(* Prevent someone supplying the same PIF multiple times and bypassing the
* number of bond members check *)
let members = List.setify members in
- let master = Ref.make () in
- let bond = Ref.make () in
+ let master = Ref.insecure () in
+ let bond = Ref.insecure () in
with_local_lock (fun () ->
(* Validation constraints: *)
@@ -352,13 +352,13 @@ let create ~__context ~network ~members ~mAC ~mode ~properties =
(* Create master PIF and Bond objects *)
let device = choose_bond_device_name ~__context ~host in
let device_name = device in
- Db.PIF.create ~__context ~ref:master ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ Db.PIF.create ~__context ~ref:master ~uuid:(Uuid.to_string (Uuid.insecure ()))
~device ~device_name ~network ~host ~mAC ~mTU:(-1L) ~vLAN:(-1L) ~metrics:Ref.null
~physical:false ~currently_attached:false
~ip_configuration_mode:`None ~iP:"" ~netmask:"" ~gateway:"" ~dNS:"" ~bond_slave_of:Ref.null
~vLAN_master_of:Ref.null ~management:false ~other_config:[] ~disallow_unplug:false
~ipv6_configuration_mode:`None ~iPv6:[""] ~ipv6_gateway:"" ~primary_address_type:`IPv4;
- Db.Bond.create ~__context ~ref:bond ~uuid:(Uuid.to_string (Uuid.make_uuid ())) ~master:master ~other_config:[]
+ Db.Bond.create ~__context ~ref:bond ~uuid:(Uuid.to_string (Uuid.insecure ())) ~master:master ~other_config:[]
~primary_slave ~mode ~properties ~links_up:0L;
(* Set the PIF.bond_slave_of fields of the members.
View
4 ocaml/xapi/xapi_crashdump.ml
@@ -16,8 +16,8 @@ exception Not_implemented
let nothrow f () = try f() with _ -> ()
let create ~__context ~vM ~vDI =
- let cdumpref = Ref.make() in
- let uuid = Uuid.to_string (Uuid.make_uuid()) in
+ let cdumpref = Ref.insecure() in
+ let uuid = Uuid.to_string (Uuid.insecure()) in
Db.Crashdump.create ~__context ~ref:cdumpref ~uuid ~vM ~vDI ~other_config:[];
cdumpref
View
4 ocaml/xapi/xapi_dr_task.ml
@@ -19,8 +19,8 @@ module D = Debug.Debugger(struct let name="xapi" end)
open D
let make_task ~__context =
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure () in
Db.DR_task.create ~__context ~ref ~uuid:(Uuid.to_string uuid);
ref
View
4 ocaml/xapi/xapi_gpu_group.ml
@@ -15,8 +15,8 @@ module D=Debug.Debugger(struct let name="xapi" end)
open D
let create ~__context ~name_label ~name_description ~other_config =
- let group = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let group = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
Db.GPU_group.create ~__context ~ref:group ~uuid ~name_label ~name_description ~gPU_types:[] ~other_config;
group
View
2  ocaml/xapi/xapi_guest_agent.ml
@@ -203,7 +203,7 @@ let all (lookup: string -> string option) (list: string -> string list) ~__conte
then existing
else
(* if it doesn't exist, make a fresh one *)
- let new_ref = Ref.make () and new_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let new_ref = Ref.insecure () and new_uuid = Uuid.to_string (Uuid.insecure ()) in
Db.VM_guest_metrics.create ~__context ~ref:new_ref ~uuid:new_uuid
~os_version:os_version ~pV_drivers_version:pv_drivers_version ~pV_drivers_up_to_date:false ~memory:[] ~disks:[] ~networks:networks ~other:other
~last_updated:(Date.of_float last_updated) ~other_config:[] ~live:true;
View
2  ocaml/xapi/xapi_ha.ml
@@ -1460,7 +1460,7 @@ let enable __context heartbeat_srs configuration =
Db.Pool.set_ha_plan_exists_for ~__context ~self:pool ~value:0L;
let (_: bool) = Xapi_ha_vm_failover.update_pool_status ~__context in
- let generation = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+ let generation = Uuid.string_of_uuid (Uuid.insecure ()) in
let hosts = Db.Host.get_all ~__context in
View
6 ocaml/xapi/xapi_host.ml
@@ -572,12 +572,12 @@ let create ~__context ~uuid ~name_label ~name_description ~hostname ~address ~ex
let make_new_metrics_object ref =
Db.Host_metrics.create ~__context ~ref
- ~uuid:(Uuid.to_string (Uuid.make_uuid ())) ~live:false
+ ~uuid:(Uuid.to_string (Uuid.insecure ())) ~live:false
~memory_total:0L ~memory_free:0L ~last_updated:Date.never ~other_config:[] in
let name_description = "Default install of XenServer"
- and host = Ref.make () in
+ and host = Ref.insecure () in
- let metrics = Ref.make () in
+ let metrics = Ref.insecure () in
make_new_metrics_object metrics;
Db.Host.create ~__context ~ref:host
View
2  ocaml/xapi/xapi_host_crashdump.ml
@@ -95,7 +95,7 @@ let resynchronise ~__context ~host =
with _ ->
(Unix.stat (Filename.concat crash_dir filename)).Unix.st_ctime in
let timestamp = Date.of_float timestamp in
- let r = Ref.make () and uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let r = Ref.insecure () and uuid = Uuid.to_string (Uuid.insecure ()) in
Db.Host_crashdump.create ~__context ~ref:r ~uuid ~other_config:[]
~host ~timestamp ~size ~filename) arrived
View
2  ocaml/xapi/xapi_local_session.ml
@@ -27,7 +27,7 @@ let table = Hashtbl.create 10
let get_all ~__context = Mutex.execute m (fun () -> Hashtbl.fold (fun k v acc -> k :: acc) table [])
let create ~__context ~pool =
- let r = Ref.make () in
+ let r = Ref.secure () in
let session = { r = r; pool = pool; last_active = Date.of_float (Unix.gettimeofday ()) } in
Mutex.execute m (fun () -> Hashtbl.replace table r session);
r
View
4 ocaml/xapi/xapi_message.ml
@@ -355,8 +355,8 @@ let create ~__context ~name ~priority ~cls ~obj_uuid ~body =
then raise (Api_errors.Server_error
(Api_errors.uuid_invalid, [class_to_string cls; obj_uuid]))) ;
- let _ref = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let _ref = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
let timestamp = Mutex.execute event_mutex (fun () ->
Unix.gettimeofday ()) in
View
4 ocaml/xapi/xapi_network.ml
@@ -133,7 +133,7 @@ let mutex = Mutex.create ()
let stem = "xapi"
let pool_introduce ~__context ~name_label ~name_description ~mTU ~other_config ~bridge =
- let r = Ref.make() and uuid = Uuid.make_uuid() in
+ let r = Ref.insecure() and uuid = Uuid.insecure() in
Db.Network.create ~__context ~ref:r ~uuid:(Uuid.to_string uuid)
~current_operations:[] ~allowed_operations:[]
~name_label ~name_description ~mTU ~bridge
@@ -150,7 +150,7 @@ let create ~__context ~name_label ~name_description ~mTU ~other_config ~tags =
incr counter;
if List.mem name bridges then loop ()
else
- let r = Ref.make () and uuid = Uuid.make_uuid () in
+ let r = Ref.insecure () and uuid = Uuid.insecure () in
Db.Network.create ~__context ~ref:r ~uuid:(Uuid.to_string uuid)
~current_operations:[] ~allowed_operations:[]
~name_label ~name_description ~mTU ~bridge:name
View
4 ocaml/xapi/xapi_pbd.ml
@@ -30,8 +30,8 @@ let create_common ~__context ~host ~sR ~device_config ~currently_attached ~other
; Ref.string_of host
; Ref.string_of (List.find (fun pbd -> Db.PBD.get_host ~__context ~self:pbd = host) pbds)
]));
- let ref = Ref.make() in
- let uuid = Uuid.to_string (Uuid.make_uuid()) in
+ let ref = Ref.insecure() in
+ let uuid = Uuid.to_string (Uuid.insecure()) in
Db.PBD.create ~__context ~ref ~uuid ~host ~sR ~device_config ~currently_attached ~other_config:[];
ref
View
4 ocaml/xapi/xapi_pci.ml
@@ -63,8 +63,8 @@ let get_pcis_by_class pcis cls =
let create ~__context ~class_id ~class_name ~vendor_id ~vendor_name ~device_id
~device_name ~host ~pci_id ~functions ~dependencies ~other_config =
- let p = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let p = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
Db.PCI.create ~__context ~ref:p ~uuid ~class_id ~class_name ~vendor_id ~vendor_name ~device_id
~device_name ~host ~pci_id ~functions ~dependencies:[] ~other_config:[];
debug "PCI %s, %s, %s created" pci_id vendor_name device_name;
View
4 ocaml/xapi/xapi_pgpu.ml
@@ -17,8 +17,8 @@ open D
open Listext
let create ~__context ~pCI ~gPU_group ~host ~other_config =
- let pgpu = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let pgpu = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
Db.PGPU.create ~__context ~ref:pgpu ~uuid ~pCI ~gPU_group ~host ~other_config;
debug "PGPU ref='%s' created (host = '%s')" (Ref.string_of pgpu) (Ref.string_of host);
pgpu
View
16 ocaml/xapi/xapi_pif.ml
@@ -227,8 +227,8 @@ let find_or_create_network (bridge: string) (device: string) ~__context =
match nets with
| [net] -> net
| _ ->
- let net_ref = Ref.make ()
- and net_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let net_ref = Ref.insecure ()
+ and net_uuid = Uuid.to_string (Uuid.insecure ()) in
let () = Db.Network.create
~__context ~ref:net_ref ~uuid:net_uuid
~current_operations:[] ~allowed_operations:[]
@@ -268,8 +268,8 @@ let is_my_management_pif ~__context ~self =
Db.Network.get_bridge ~__context ~self:net = management_if
let make_pif_metrics ~__context =
- let metrics = Ref.make ()
- and metrics_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let metrics = Ref.insecure ()
+ and metrics_uuid = Uuid.to_string (Uuid.insecure ()) in
let () = Db.PIF_metrics.create
~__context ~ref:metrics ~uuid:metrics_uuid ~carrier:false
~device_name:"" ~vendor_name:"" ~device_id:"" ~vendor_id:""
@@ -285,11 +285,11 @@ let pool_introduce
~dNS ~bond_slave_of ~vLAN_master_of ~management
~other_config ~disallow_unplug ~ipv6_configuration_mode
~iPv6 ~ipv6_gateway ~primary_address_type =
- let pif_ref = Ref.make () in
+ let pif_ref = Ref.insecure () in
let metrics = make_pif_metrics ~__context in
let () =
Db.PIF.create
- ~__context ~ref:pif_ref ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ ~__context ~ref:pif_ref ~uuid:(Uuid.to_string (Uuid.insecure ()))
~device ~device_name:device ~network ~host
~mAC ~mTU ~vLAN ~metrics
~physical ~currently_attached:false
@@ -320,13 +320,13 @@ let introduce_internal
| None -> make_pif_metrics ~__context
| Some m -> m
in
- let pif = Ref.make () in
+ let pif = Ref.insecure () in
debug
"Creating a new record for NIC: %s: %s"
(device)
(Ref.string_of pif);
let () = Db.PIF.create
- ~__context ~ref:pif ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ ~__context ~ref:pif ~uuid:(Uuid.to_string (Uuid.insecure ()))
~device ~device_name:device ~network:net_ref ~host ~mAC
~mTU ~vLAN ~metrics ~physical ~currently_attached:false
~ip_configuration_mode:`None ~iP:"" ~netmask:"" ~gateway:""
View
8 ocaml/xapi/xapi_pool_patch.ml
@@ -184,7 +184,7 @@ let read_in_and_check_patch length s path =
raise (Api_errors.Server_error(Api_errors.invalid_patch, []))
let create_patch_record ~__context ?path patch_info =
- let r = Ref.make () in
+ let r = Ref.insecure () in
let path, size =
match path with
| None -> "", Int64.zero
@@ -220,7 +220,7 @@ let pool_patch_upload_handler (req: Request.t) s _ =
debug "Patch Upload Handler - Authenticated...";
let _ = Unixext.mkdir_safe patch_dir 0o755 in
- let new_path = patch_dir ^ "/" ^ (Uuid.to_string (Uuid.make_uuid ())) in
+ let new_path = patch_dir ^ "/" ^ (Uuid.to_string (Uuid.insecure ())) in
let task_id = Context.get_task_id __context in
begin
@@ -507,8 +507,8 @@ let write_patch_applied_db ~__context ?date ~self ~host () =
| Some d -> d
| None -> Unix.gettimeofday ()
in
- let uuid = Uuid.make_uuid () in
- let r = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let r = Ref.insecure () in
Db.Host_patch.create ~__context
~ref:r
~uuid:(Uuid.to_string uuid)
View
4 ocaml/xapi/xapi_role.ml
@@ -233,8 +233,8 @@ let get_by_permission_name_label ~__context ~label =
let create ~__context ~name_label ~name_description ~subroles =
(* disabled in RBAC 1.0 *)
(*
- let ref=Ref.make() in
- let uuid=Uuid.to_string (Uuid.make_uuid()) in
+ let ref=Ref.insecure() in
+ let uuid=Uuid.to_string (Uuid.insecure()) in
(* TODO: verify the uniqueness of id *)
if id = "no"
then raise (Api_errors.Server_error (Api_errors.role_not_found, []))
View
4 ocaml/xapi/xapi_secret.ml
@@ -21,12 +21,12 @@ module D = Debug.Debugger(struct let name = "xapi_secret" end)
open D
let introduce ~__context ~uuid ~value ~other_config =
- let ref = Ref.make () in
+ let ref = Ref.secure () in
Db.Secret.create ~__context ~ref ~uuid ~value ~other_config;
ref
let create ~__context ~value ~other_config=
- let uuid = Uuid.to_string(Uuid.make_uuid()) in
+ let uuid = Uuid.to_string(Uuid.secure()) in
let ref = introduce ~__context ~uuid ~value ~other_config in
ref
View
4 ocaml/xapi/xapi_session.ml
@@ -269,8 +269,8 @@ let revalidate_all_sessions ~__context =
(* XXX: only used internally by the code which grants the guest access to the API.
Needs to be protected by a proper access control system *)
let login_no_password ~__context ~uname ~host ~pool ~is_local_superuser ~subject ~auth_user_sid ~auth_user_name ~rbac_permissions =
- let session_id = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let session_id = Ref.secure () in
+ let uuid = Uuid.to_string (Uuid.secure ()) in
let user = Ref.null in (* always return a null reference to the deprecated user object *)
let parent = try Context.get_session_id __context with _ -> Ref.null in
(*match uname with (* the user object is deprecated in favor of subject *)
View
2  ocaml/xapi/xapi_sm.ml
@@ -31,7 +31,7 @@ module D=Debug.Debugger(struct let name="xapi" end)
open D
let create_from_query_result ~__context q =
- let r = Ref.make () and u = Uuid.string_of_uuid (Uuid.make_uuid ()) in
+ let r = Ref.insecure () and u = Uuid.string_of_uuid (Uuid.insecure ()) in
let open Storage_interface in
info "Registering SM plugin %s (version %s)" (String.lowercase q.driver) q.version;
Db.SM.create ~__context ~ref:r ~uuid:u ~_type:(String.lowercase q.driver)
View
8 ocaml/xapi/xapi_sr.ml
@@ -259,8 +259,8 @@ let scanning_thread () =
let introduce ~__context ~uuid ~name_label
~name_description ~_type ~content_type ~shared ~sm_config =
let _type = String.lowercase _type in
- let uuid = if uuid="" then Uuid.to_string (Uuid.make_uuid()) else uuid in (* fill in uuid if none specified *)
- let sr_ref = Ref.make () in
+ let uuid = if uuid="" then Uuid.to_string (Uuid.insecure()) else uuid in (* fill in uuid if none specified *)
+ let sr_ref = Ref.insecure () in
(* Create SR record in DB *)
let () = Db.SR.create ~__context ~ref:sr_ref ~uuid
~name_label ~name_description
@@ -324,7 +324,7 @@ let create ~__context ~host ~device_config ~(physical_size:int64) ~name_label ~
| _ -> ()
end;
*)
- let sr_uuid = Uuid.make_uuid() in
+ let sr_uuid = Uuid.insecure() in
let sr_uuid_str = Uuid.to_string sr_uuid in
(* Create the SR in the database before creating on disk, so the backends can read the sm_config field. If an error happens here
we have to clean up the record.*)
@@ -450,7 +450,7 @@ let update_vdis ~__context ~sr db_vdis vdi_infos =
(* Create the new ones *)
let db_vdi_map = StringMap.fold
(fun loc vdi m ->
- let ref = Ref.make () and uuid = Uuid.make_uuid () in
+ let ref = Ref.insecure () and uuid = Uuid.insecure () in
debug "Creating VDI: %s (ref=%s)" (string_of_vdi_info vdi) (Ref.string_of ref);
Db.VDI.create ~__context ~ref ~uuid:(Uuid.string_of_uuid uuid)
~name_label:vdi.name_label ~name_description:vdi.name_description
View
4 ocaml/xapi/xapi_subject.ml
@@ -58,8 +58,8 @@ let create ~__context ~subject_identifier ~other_config =
else
*)
(* add the new subject to the db *)
- let ref=Ref.make() in
- let uuid=Uuid.to_string (Uuid.make_uuid()) in
+ let ref=Ref.insecure() in
+ let uuid=Uuid.to_string (Uuid.insecure()) in
(* CP-1224: Free Edition: Newly created subjects will have the Pool Administrator role. *)
(* CP-1224: Paid-for Edition: Newly created subjects will have an empty role. *)
View
2  ocaml/xapi/xapi_test_common.ml
@@ -62,7 +62,7 @@ let make_vm ~__context ?(name_label="name_label") ?(name_description="descriptio
~ha_always_run ~ha_restart_priority ~tags ~blocked_operations ~protection_policy
~is_snapshot_from_vmpp ~appliance ~start_delay ~shutdown_delay ~order ~suspend_SR ~version
-let make_host ~__context ?(uuid=Uuid.string_of_uuid (Uuid.make_uuid ())) ?(name_label="host")
+let make_host ~__context ?(uuid=Uuid.string_of_uuid (Uuid.insecure ())) ?(name_label="host")
?(name_description="description") ?(hostname="localhost") ?(address="127.0.0.1")
?(external_auth_type="") ?(external_auth_service_name="") ?(external_auth_configuration=[])
?(license_params=[]) ?(edition="free") ?(license_server=[]) ?(local_cache_sr=Ref.null) ?(chipset_info=[]) () =
View
10 ocaml/xapi/xapi_tunnel.ml
@@ -31,19 +31,19 @@ let choose_tunnel_device_name ~__context ~host =
choose 0
let create_internal ~__context ~transport_PIF ~network ~host =
- let tunnel = Ref.make () in
- let access_PIF = Ref.make () in
+ let tunnel = Ref.insecure () in
+ let access_PIF = Ref.insecure () in
let device = choose_tunnel_device_name ~__context ~host in
let device_name = device in
- let mAC = Xapi_vif_helpers.gen_mac (0, Uuid.to_string (Uuid.make_uuid ())) in
+ let mAC = Xapi_vif_helpers.gen_mac (0, Uuid.to_string (Uuid.insecure ())) in
let metrics = Db.PIF.get_metrics ~__context ~self:transport_PIF in
- Db.PIF.create ~__context ~ref:access_PIF ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ Db.PIF.create ~__context ~ref:access_PIF ~uuid:(Uuid.to_string (Uuid.insecure ()))
~device ~device_name ~network ~host ~mAC ~mTU:(-1L) ~vLAN:(-1L) ~metrics
~physical:false ~currently_attached:false
~ip_configuration_mode:`None ~iP:"" ~netmask:"" ~gateway:"" ~dNS:"" ~bond_slave_of:Ref.null
~vLAN_master_of:Ref.null ~management:false ~other_config:[] ~disallow_unplug:false ~ipv6_configuration_mode:`None
~iPv6:[""] ~ipv6_gateway:"" ~primary_address_type:`IPv4;
- Db.Tunnel.create ~__context ~ref:tunnel ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ Db.Tunnel.create ~__context ~ref:tunnel ~uuid:(Uuid.to_string (Uuid.insecure ()))
~access_PIF ~transport_PIF ~status:["active", "false"] ~other_config:[];
tunnel, access_PIF
View
4 ocaml/xapi/xapi_user.ml
@@ -18,8 +18,8 @@
let get_allowed_messages ~__context ~self = []
let create ~__context ~short_name ~fullname ~other_config =
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure () in
Db.User.create ~__context ~ref ~uuid:(Uuid.to_string uuid)
~short_name ~fullname ~other_config;
ref
View
6 ocaml/xapi/xapi_vbd.ml
@@ -144,8 +144,8 @@ let create ~__context ~vM ~vDI ~userdevice ~bootable ~mode ~_type ~unpluggable
then string_of_int (Device_number.to_disk_number (List.hd possibilities)) (* already checked for [] above *)
else userdevice in
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure () in
debug "VBD.create (device = %s; uuid = %s; ref = %s)"
userdevice (Uuid.string_of_uuid uuid) (Ref.string_of ref);
@@ -160,7 +160,7 @@ let create ~__context ~vM ~vDI ~userdevice ~bootable ~mode ~_type ~unpluggable
(* Make people aware that non-shared disks make VMs not agile *)
if not empty then assert_doesnt_make_vm_non_agile ~__context ~vm:vM ~vdi:vDI;
- let metrics = Ref.make () and metrics_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let metrics = Ref.insecure () and metrics_uuid = Uuid.to_string (Uuid.insecure ()) in
Db.VBD_metrics.create ~__context ~ref:metrics ~uuid:metrics_uuid
~io_read_kbs:0. ~io_write_kbs:0. ~last_updated:(Date.of_float 0.)
~other_config:[];
View
8 ocaml/xapi/xapi_vbd_helpers.ml
@@ -288,10 +288,10 @@ type do_hotplug_fn = __context:Context.t -> vbd:API.ref_VBD -> unit
(* copy a vbd *)
let copy ~__context ?vdi ~vm vbd =
let all = Db.VBD.get_record ~__context ~self:vbd in
- let new_vbd = Ref.make () in
- let vbd_uuid = Uuid.to_string (Uuid.make_uuid ()) in
- let metrics = Ref.make () in
- let metrics_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let new_vbd = Ref.insecure () in
+ let vbd_uuid = Uuid.to_string (Uuid.insecure ()) in
+ let metrics = Ref.insecure () in
+ let metrics_uuid = Uuid.to_string (Uuid.insecure ()) in
let vdi = Pervasiveext.default all.API.vBD_VDI vdi in
Db.VBD_metrics.create ~__context
~ref:metrics
View
4 ocaml/xapi/xapi_vdi.ml
@@ -182,7 +182,7 @@ let cancel_tasks ~__context ~self ~all_tasks_in_db ~task_ids =
?physical_utilisation ?_type ?sharable ?read_only ?storage_lock ?other_config ?parent
?xenstore_data ?sm_config ~current_operations ~__context ~original () =
let a = Db.VDI.get_record_internal ~__context ~self:original in
- let r = Ref.make () in
+ let r = Ref.insecure () in
Db.VDI.create ~__context ~ref:r
~uuid:(Uuid.to_string uuid)
~name_label:(default a.Db_actions.vDI_name_label name_label)
@@ -286,7 +286,7 @@ let introduce_dbonly ~__context ~uuid ~name_label ~name_description ~sR ~_type
(fun _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ -> ())
with _ -> raise (Api_errors.Server_error (Api_errors.uuid_invalid, [ "VDI"; uuid ]))
end;
- let ref = Ref.make() in
+ let ref = Ref.insecure() in
debug "VDI.introduce read_only = %b" read_only;
Db.VDI.create ~__context ~ref ~uuid:uuid
~name_label ~name_description
View
4 ocaml/xapi/xapi_vgpu.ml
@@ -22,8 +22,8 @@ let valid_device device =
device = "0"
let create ~__context ~vM ~gPU_group ~device ~other_config =
- let vgpu = Ref.make () in
- let uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let vgpu = Ref.insecure () in
+ let uuid = Uuid.to_string (Uuid.insecure ()) in
if not (Pool_features.is_enabled ~__context Features.GPU) then
raise (Api_errors.Server_error (Api_errors.feature_restricted, []));
if not(valid_device device) then
View
6 ocaml/xapi/xapi_vif_helpers.ml
@@ -151,8 +151,8 @@ let create ~__context ~device ~network ~vM
~currently_attached ~locking_mode ~ipv4_allowed ~ipv6_allowed : API.ref_VIF =
let () = debug "VIF.create running" in
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make () in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure () in
let vm_mac_seed =
try Some (List.assoc Xapi_globs.mac_seed (Db.VM.get_other_config ~__context ~self:vM)) with _ -> None in
@@ -191,7 +191,7 @@ let create ~__context ~device ~network ~vM
if List.mem device all_devices
then raise (Api_errors.Server_error (Api_errors.device_already_exists, [device]));
- let metrics = Ref.make () and metrics_uuid = Uuid.to_string (Uuid.make_uuid ()) in
+ let metrics = Ref.insecure () and metrics_uuid = Uuid.to_string (Uuid.insecure ()) in
Db.VIF_metrics.create ~__context ~ref:metrics ~uuid:metrics_uuid
~io_read_kbs:0. ~io_write_kbs:0. ~last_updated:(Date.of_float 0.) ~other_config:[];
View
6 ocaml/xapi/xapi_vlan.ml
@@ -18,12 +18,12 @@ open D
let vlan_mac = "fe:ff:ff:ff:ff:ff"
let create_internal ~__context ~host ~tagged_PIF ~tag ~network ~device =
- let vlan = Ref.make () and vlan_uuid = Uuid.to_string (Uuid.make_uuid ()) in
- let untagged_PIF = Ref.make () in
+ let vlan = Ref.insecure () and vlan_uuid = Uuid.to_string (Uuid.insecure ()) in
+ let untagged_PIF = Ref.insecure () in
(* Copy the MTU and metrics from the base PIF *)
let mTU = Db.PIF.get_MTU ~__context ~self:tagged_PIF in
let metrics = Db.PIF.get_metrics ~__context ~self:tagged_PIF in
- Db.PIF.create ~__context ~ref:untagged_PIF ~uuid:(Uuid.to_string (Uuid.make_uuid ()))
+ Db.PIF.create ~__context ~ref:untagged_PIF ~uuid:(Uuid.to_string (Uuid.insecure ()))
~device ~device_name:device ~network ~host ~mAC:vlan_mac ~mTU ~vLAN:tag ~metrics
~physical:false ~currently_attached:false
~ip_configuration_mode:`None ~iP:"" ~netmask:"" ~gateway:"" ~dNS:"" ~bond_slave_of:Ref.null
View
2  ocaml/xapi/xapi_vm.ml
@@ -379,7 +379,7 @@ let create ~__context
~suspend_SR
~version
: API.ref_VM =
- let gen_mac_seed () = Uuid.to_string (Uuid.make_uuid ()) in
+ let gen_mac_seed () = Uuid.to_string (Uuid.insecure ()) in
(* Add random mac_seed if there isn't one specified already *)
let other_config =
if not (List.mem_assoc Xapi_globs.mac_seed other_config)
View
4 ocaml/xapi/xapi_vm_appliance.ml
@@ -34,8 +34,8 @@ let assert_operation_valid = Xapi_vm_appliance_lifecycle.assert_operation_valid
let update_allowed_operations = Xapi_vm_appliance_lifecycle.update_allowed_operations
let create ~__context ~name_label ~name_description =
- let uuid = Uuid.make_uuid () in
- let ref = Ref.make() in
+ let uuid = Uuid.insecure () in
+ let ref = Ref.insecure() in
Db.VM_appliance.create ~__context ~ref ~uuid:(Uuid.to_string uuid) ~name_label ~name_description ~allowed_operations:[] ~current_operations:[];
update_allowed_operations ~__context ~self:ref;
ref