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

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/fix-1842774-z15-model-name-eoan

[Christian Ehrhardt  (paelzer)]

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)]

+1

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

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, tagged and uploaded

diff --git a/debian/changelog b/debian/changelog
index fd58216..430c149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:4.0+dfsg-0ubuntu9) eoan; urgency=medium
+
+  * d/p/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch:
+    update the z15 model name (LP: #1842774)
+
+ -- Christian Ehrhardt <[e-mail]>  Tue, 24 Sep 2019 11:42:58 +0200
+
 qemu (1:4.0+dfsg-0ubuntu8) eoan; urgency=medium
 
   * d/binfmt-update-in: fix binfmt being called in some containers
diff --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
 new file mode 100644
index 0000000..f54a573
--- /dev/null
+++ b/debian/patches/lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch
@@ -0,0 +1,34 @@
+From 7505deca0bfa859136ec6419dbafc504f22fcac2 Mon Sep 17 00:00:00 2001
+From: Christian Borntraeger <[e-mail]>
+Date: Wed, 18 Sep 2019 16:42:14 +0200
+Subject: [PATCH] s390x/cpumodel: Add the z15 name to the description of gen15a
+
+We now know that gen15a is called z15.
+
+Reviewed-by: David Hildenbrand <[e-mail]>
+Signed-off-by: Christian Borntraeger <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=7505deca
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842774
+Last-Update: 2019-09-24
+
+---
+ target/s390x/cpu_models.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
+index 1d16d7d5e7..009afc38b9 100644
+--- a/target/s390x/cpu_models.c
++++ b/target/s390x/cpu_models.c
+@@ -84,7 +84,7 @@ static S390CPUDef s390_cpu_defs[] = {
+     CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
+     CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
+     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
+-    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
++    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 GA1"),
+     CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
+ };
+ 
+-- 
+2.23.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 1382ff0..72b9e84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ ubuntu/lp-1836154-s390x-cpumodel-remove-esort-from-the-default-model.patch
 ubuntu/lp-1836154-s390x-cpumodel-also-change-name-of-vxbeh.patch
 ubuntu/lp-1841066-i386-x86_cpu_list_feature_names-function.patch
 ubuntu/lp-1841066-i386-unavailable-features-QOM-property.patch
+lp-1842774-s390x-cpumodel-Add-the-z15-name-to-the-description-o.patch