Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xapi-project/xen-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: cheng-z/xen-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 13 commits
  • 23 files changed
  • 5 contributors

Commits on Mar 17, 2015

  1. CP-11136 (1/5): Block VMs migration to host which does not support it…

    …s virtual hardware platform
    
    (Commit 1 of 5: requires 4 following commits for CP-11136.)
    
    This code change is only to add virtual hardware platform
    infrastructure in XenServer Host. VM migration will be blocked if
    virtual hardware platform not support.
    
    With this infrastructure, we can add virtual hardware platform
    information in other feature.
    
    Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
    (cherry picked from commit 593b8e6)
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    
    Conflicts:
    
    	ocaml/idl/datamodel.ml
    	ocaml/xapi/xapi_globs.ml
    	ocaml/xapi/xapi_host.ml
    	ocaml/xapi/xapi_vm_helpers.ml
    cheng-z committed Mar 17, 2015
    Copy the full SHA
    8ea07c3 View commit details
  2. CP-11136: Add hardware platform version check when VM migration

    (Commit 2 of 5 commits for CP-11136.)
    
    Signed-off-by: chengz <cheng.zhang@citrix.com>
    (cherry picked from commit c265b0d)
    (only selected parts cherry-picked)
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    
    Conflicts:
    
    	ocaml/xapi/xapi_host.ml
    cheng-z committed Mar 17, 2015
    Copy the full SHA
    1a9815d View commit details
  3. CP-11136: fix Virtual Hardware Platform versioning

    (Commit 3 of 5 commits for CP-11136.)
    
    Together with the previous two CP-11136 commits, this feature for
    the Virtual Hardware Platform versioning is complete (and believed
    correct) but we intend to change the names "virt_hw_vn" and
    "virt_hw_vns" to be longer and more descriptive.
    
    Changes in this commit:
    
    * Define new error (about vm/host version mismatch, not about 6.5SP1).
    * Increment minor version no. of datamodel schema and cream release.
    * Fix doc strings.
    * Host creation: no parameter to specify the supported versions.
    * Default [0L] for host's supported versions, when creating host.
    * (Due to the above) No special-case in check when VM has version 0.
    * VM hardware platform version is read-write in datamodel now.
    * Check for version compatibility in the right places.
    * More comments.
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    (cherry picked from commit 1267f24)
    (only some parts cherry-picked; slight changes)
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    
    Conflicts:
    
    	ocaml/idl/datamodel.ml
    	ocaml/xapi/xapi_globs.ml
    	ocaml/xapi/xapi_host.ml
    	ocaml/xapi/xapi_vm_helpers.ml
    thomassa authored and cheng-z committed Mar 17, 2015
    Copy the full SHA
    b060da4 View commit details
  4. CP-11136: Change name for virtual hardware platform version

    (Commit 4 of 5 for CP-11136.)
    
    Change from VM.virt_hw_vn and Host.virt_hw_vns to
    VM.hardware_platform_version and
    Host.virtual_hardware_platform_versions
    
    Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
    (cherry picked from commit 590437f)
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    
    Conflicts:
    
    	ocaml/idl/datamodel.ml
    	ocaml/xapi/xapi_host.ml
    	ocaml/xapi/xapi_vm_helpers.ml
    thomassa authored and cheng-z committed Mar 17, 2015
    Copy the full SHA
    61b34a4 View commit details
  5. CP-11136: Fix field-name: hyphens not underscores

    The fifth and last commit for this feature.
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    thomassa authored and cheng-z committed Mar 17, 2015
    Copy the full SHA
    3306ac9 View commit details
  6. CP-10533: Add flag VM.platform.pci_pv and its default value

    Signed-off-by: Kaifeng Zhu <kaifeng.zhu@citrix.com>
    Kaifeng Zhu authored and cheng-z committed Mar 17, 2015
    Copy the full SHA
    3c528d0 View commit details

Commits on Mar 18, 2015

  1. CP-11136: Fix compilation after merge to master

    In xapi_vm_helpers.ml, the "Client" identifier was binding to a
    module in Xenstore.  Fixed by no longer opening the Xenstore module.
    
    Commit 6 of 7 for this feature.
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    thomassa authored and cheng-z committed Mar 18, 2015
    Copy the full SHA
    aa8b016 View commit details
  2. CP-11136: XenAPI = Client.Client (readability++)

    The seventh and last commit for this feature.
    This is just to improve readability.
    
    Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
    thomassa authored and cheng-z committed Mar 18, 2015
    Copy the full SHA
    d71aec6 View commit details

Commits on Mar 30, 2015

  1. CP-10532: Add pci_pv check for VHP

    This code change is to add “pci_pv” into VHPs.
    
    Will update VM’s VHP on pci_pv supported Host to 2;
    Add VHP refresh on both VM clean_reboot and hard_reboot.
    
    Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
    cheng-z committed Mar 30, 2015
    Copy the full SHA
    e5c9ed7 View commit details

Commits on Apr 3, 2015

  1. CP-10531: Update vm_guest_metrics to implement PV drivers update

    1. Introduce network_paths_optimized and storage_paths_optimized flags to vm_guest_metrics.
       They are used to represent if VM is using PV network and PV storage frontends.
       XenCenter could display them respectively.
    2. Update the computation of PV_drivers_up_to_date.
       The value is logical AND of network_paths_optimized and storage_paths_optimized.
       Also deprecate this flag since the network and storage flags are introduced.
    
    Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
    huizh committed Apr 3, 2015
    Copy the full SHA
    dab231c View commit details

Commits on Apr 7, 2015

  1. Merge pull request #2198 from huizh/CP-10531

    CP-10531: Update vm_guest_metrics to implement PV drivers update
    robhoes committed Apr 7, 2015
    Copy the full SHA
    5b26de4 View commit details
  2. Merge pull request #2197 from cheng--zhang/CP-10532

    Windows PV auto-update feature support
    robhoes committed Apr 7, 2015
    Copy the full SHA
    1128e61 View commit details

Commits on Apr 24, 2015

  1. test

    Signed-off-by: chengz <cheng.zhang@citrix.com>
    cheng-z committed Apr 24, 2015
    Copy the full SHA
    a4c10a4 View commit details
Loading