Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows PV auto-update feature support #2197

Merged
merged 9 commits into from
Apr 7, 2015
Merged

Windows PV auto-update feature support #2197

merged 9 commits into from
Apr 7, 2015

Conversation

cheng-z
Copy link
Member

@cheng-z cheng-z commented Mar 26, 2015

This pull request include three part of code change:

  1. Add VHP for xenserver
  2. Add flag VM.platform.pci_pv and its default value
  3. Add pci_pv check for VHP

cheng-z and others added 8 commits March 17, 2015 08:18
@cheng-z
CP-11136 (1/5): Block VMs migration to host which does not support it…
8ea07c3 
…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
CP-11136: Add hardware platform version check when VM migration
1a9815d 
(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
@thomassa @cheng-z
CP-11136: fix Virtual Hardware Platform versioning
b060da4 
(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 @cheng-z
CP-11136: Change name for virtual hardware platform version
61b34a4 
(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 @cheng-z
CP-11136: Fix field-name: hyphens not underscores
3306ac9 
The fifth and last commit for this feature.

Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
@cheng-z
CP-10533: Add flag VM.platform.pci_pv and its default value
3c528d0 
Signed-off-by: Kaifeng Zhu <kaifeng.zhu@citrix.com>
@thomassa @cheng-z
CP-11136: Fix compilation after merge to master
aa8b016 
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 @cheng-z
CP-11136: XenAPI = Client.Client (readability++)
d71aec6 
The seventh and last commit for this feature.
This is just to improve readability.

Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
@kaifengz kaifengz mentioned this pull request Mar 26, 2015
Closed
@cheng-z
Copy link
Member Author

cheng-z commented Mar 27, 2015

Hi @simonjbeaumont
Could you please help to review the code?
Some of the code are reviewed here: #2180
I made another commit which based on #2180. So I compose all the code together.
Thank you so much for your great support.

@simonjbeaumont
Copy link
Contributor

@xen-git: retest this please.

simonjbeaumont referenced this pull request in cheng-z/xen-api Mar 27, 2015
@cheng-z
CP-10533: Add flag VM.platform.pci_pv and its default value
caff4c5 
Signed-off-by: Kaifeng Zhu <kaifeng.zhu@citrix.com>
@simonjbeaumont
Copy link
Contributor

Hi Cheng, I've added some comments on the commits that are the extras to #2180. One of them looks like it needs to be removed. I'm concerned by some of (what look like) conflicting comments in the final commit.

Also, the build on xen-git failed. I've kicked it off again because the logs have expired but if it's failing then we'll need to fix it up.

@cheng-z
CP-10532: Add pci_pv check for VHP
e5c9ed7 
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
Copy link
Member Author

cheng-z commented Mar 30, 2015

Hi @simonjbeaumont
Thank you so much for your great help. I already removed the empty commit. Seems this time the merge build test passed.
Please help to check it again.

Why I create pull request for all the code is because we just waiting on the feature to be test. I know there is already a pull request on trunk which include a lot of my code pull request. But I still create this because we want to integrate the code in early stage, so QA team can have something to test.

Thanks again for your great support.

@cheng-z cheng-z mentioned this pull request Apr 2, 2015
Merged
@robhoes
Copy link
Member

robhoes commented Apr 7, 2015

I've merged the original pull request to master just now (#2180). It seems that the new commits in this pull request are the 6th and the 9th.

@robhoes
Copy link
Member

robhoes commented Apr 7, 2015

I discussed briefly with @thomassa and it seems that the current implementation using platform keys was chosen in order to start testing of this stuff soon. However, it may be decided that another approach is better, and the design may be revised. I'll merge this pull request, since it is for a feature branch, but would expect a new pull request for master at some point.

robhoes added a commit that referenced this pull request Apr 7, 2015
@robhoes
Merge pull request #2197 from cheng--zhang/CP-10532
1128e61 
Windows PV auto-update feature support
@robhoes robhoes merged commit 1128e61 into xapi-project:trunk-car1755 Apr 7, 2015
@cheng-z cheng-z deleted the CP-10532 branch April 7, 2016 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@cheng-z @simonjbeaumont @robhoes @thomassa