Merge lp://staging/~ack/landscape-client/vm-info-detect-qemu into lp://staging/~landscape/landscape-client/trunk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Alberto Donato | ||||
| Approved revision: | 789 | ||||
| Merged at revision: | 789 | ||||
| Proposed branch: | lp://staging/~ack/landscape-client/vm-info-detect-qemu | ||||
| Merge into: | lp://staging/~landscape/landscape-client/trunk | ||||
| Diff against target: |
158 lines (+80/-33) 2 files modified
landscape/lib/tests/test_vm_info.py (+23/-1) landscape/lib/vm_info.py (+57/-32) |
||||
| To merge this branch: | bzr merge lp://staging/~ack/landscape-client/vm-info-detect-qemu | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Björn Tillenius (community) | Approve | ||
| Free Ekanayaka (community) | Approve | ||
|
Review via email:
|
|||
Commit message
This extends the VM-info detection to report QEMU-virtualized machines that report "QEMU" as vendor as type "kvm".
Currently QEMU machines are only matches if they have the string "QEMU" in their /proc/cpuinfo. This isn't always the case.
Also, support for detecting Google Compute Engine (reported as vm-info "gce") has been added.
The branch also makes the match a less bit strict, by using case-insensitive match, and more generic strings.
Description of the change
This extends the VM-info detection to report QEMU-virtualized machines that report "QEMU" as vendor as type "kvm".
Currently QEMU machines are only matches if they have the string "QEMU" in their /proc/cpuinfo. This isn't always the case.
The branch also makes the match a less bit strict, by using case-insensitive match, and more generic strings.
| Alberto Donato (ack) wrote | # |
I think Google is missing from the vendor list? See the bug.