Merge ~paelzer/ubuntu/+source/qemu:fix-1842774-z15-model-name-eoan into ubuntu/+source/qemu:ubuntu/eoan-devel

Proposed by Christian Ehrhardt  on 2019-09-24
Status: Merged
Approved by: Christian Ehrhardt  on 2019-09-24
Approved revision: c1a855ad86dd5997ad8e38f15805b41184236133
Merged at revision: c1a855ad86dd5997ad8e38f15805b41184236133
Proposed branch: ~paelzer/ubuntu/+source/qemu:fix-1842774-z15-model-name-eoan
Merge into: ubuntu/+source/qemu:ubuntu/eoan-devel
Diff against target: 64 lines (+42/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch (+34/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Robie Basak 2019-09-24 Approve on 2019-09-24
Canonical Server Team 2019-09-24 Pending
Canonical Server packageset reviewers 2019-09-24 Pending
Review via email: mp+373118@code.launchpad.net
To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

Test on PPA is ok:
root@e:~# qemu-system-s390x -cpu ? | grep gen15
s390 gen15a-base IBM z15 GA1 (static, migration-safe)
s390 gen15a IBM z15 GA1 (migration-safe)
s390 gen15b-base IBM 8562 GA1 (static, migration-safe)
s390 gen15b IBM 8562 GA1 (migration-safe)

Robie Basak (racb) wrote :

+1

This looks safe. I would have questions over renaming the key, but you're not doing that.

review: Approve
Christian Ehrhardt  (paelzer) wrote :

Thanks, tagged and uploaded

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index fd58216..430c149 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+qemu (1:4.0+dfsg-0ubuntu9) eoan; urgency=medium
7+
8+ * d/p/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch:
9+ update the z15 model name (LP: #1842774)
10+
11+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 24 Sep 2019 11:42:58 +0200
12+
13 qemu (1:4.0+dfsg-0ubuntu8) eoan; urgency=medium
14
15 * d/binfmt-update-in: fix binfmt being called in some containers
16diff --git a/debian/patches/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch b/debian/patches/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
17new file mode 100644
18index 0000000..f54a573
19--- /dev/null
20+++ b/debian/patches/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
21@@ -0,0 +1,34 @@
22+From 7505deca0bfa859136ec6419dbafc504f22fcac2 Mon Sep 17 00:00:00 2001
23+From: Christian Borntraeger <borntraeger@de.ibm.com>
24+Date: Wed, 18 Sep 2019 16:42:14 +0200
25+Subject: [PATCH] s390x/cpumodel: Add the z15 name to the description of gen15a
26+
27+We now know that gen15a is called z15.
28+
29+Reviewed-by: David Hildenbrand <david@redhat.com>
30+Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
31+
32+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=7505deca
33+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842774
34+Last-Update: 2019-09-24
35+
36+---
37+ target/s390x/cpu_models.c | 2 +-
38+ 1 file changed, 1 insertion(+), 1 deletion(-)
39+
40+diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
41+index 1d16d7d5e7..009afc38b9 100644
42+--- a/target/s390x/cpu_models.c
43++++ b/target/s390x/cpu_models.c
44+@@ -84,7 +84,7 @@ static S390CPUDef s390_cpu_defs[] = {
45+ CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
46+ CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
47+ CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
48+- CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
49++ CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 GA1"),
50+ CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
51+ };
52+
53+--
54+2.23.0
55+
56diff --git a/debian/patches/series b/debian/patches/series
57index 1382ff0..72b9e84 100644
58--- a/debian/patches/series
59+++ b/debian/patches/series
60@@ -30,3 +30,4 @@ ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
61 ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
62 ubuntu/lp-1841066-i386-x86_cpu_list_feature_names-function.patch
63 ubuntu/lp-1841066-i386-unavailable-features-QOM-property.patch
64+lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch

Subscribers

People subscribed via source and target branches