Merge ~bladernr/plainbox-provider-checkbox:1683895-virt-kvm-s390-invalid-machine into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: f728fc43a2507a453b1ce9dc3fe3cfaca224eb2d
Merged at revision: ce29d32ed10cfb8b72bfec903362ecc2477d5e91
Proposed branch: ~bladernr/plainbox-provider-checkbox:1683895-virt-kvm-s390-invalid-machine
Merge into: plainbox-provider-checkbox:master
Diff against target: 13 lines (+1/-1)
1 file modified
bin/virtualization (+1/-1)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Review via email: mp+322706@code.launchpad.net

Description of the change

bin/virtualization: change the machine type to more generic s390-ccw-virtio

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

tested, only affects s390x. Self approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/virtualization b/bin/virtualization
2index 0d450a9..46cf13e 100755
3--- a/bin/virtualization
4+++ b/bin/virtualization
5@@ -126,7 +126,7 @@ QEMU_ARCH_CONFIG = {
6 'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO,
7 'qemu_extra_args': [
8 '-enable-kvm',
9- '-machine', 's390-ccw-virtio-2.5',
10+ '-machine', 's390-ccw-virtio',
11 ],
12 },
13 }

Subscribers

People subscribed via source and target branches