Merge ~paelzer/ubuntu/+source/qemu:bug-1841066-fix-arch_cap-detection into ubuntu/+source/qemu:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

A PPA with the fix can be found at [1].

With it libvirt (as it is in Eoan) can properly detect those features:

$ virsh domcapabilities | grep -e rdctl-no -e ibrs-all -e skip-l1dfl-vmentry -e mds-no
      <feature policy='require' name='rdctl-no'/>
      <feature policy='require' name='ibrs-all'/>
      <feature policy='require' name='skip-l1dfl-vmentry'/>
      <feature policy='require' name='mds-no'/>

[1]: https://launchpad.net/~paelzer/+archive/ubuntu/experimental-eoan-archcap-detection

[Rafael David Tinoco (rafaeldtinoco)]

Code looks good, upstream code is the same, will test in AMD (from PPA). For now, gcc-9 from -proposed seems to brake build as we've spoken.

[Rafael David Tinoco (rafaeldtinoco)]

/home/inaddy/work/sources/ubuntu/qemu/hw/display/qxl.c:50:19: error: taking address of packed member of ‘struct QXLReleaseRing_ring_el’ may result in an unaligned pointer value [-Werror=address-of-packed-member]

likely related to previous warnings being treated as errors by default now.

[Rafael David Tinoco (rafaeldtinoco)]

In file included from /usr/include/string.h:494,
                 from /home/inaddy/work/sources/ubuntu/qemu/include/qemu/osdep.h:101,
                 from /home/inaddy/work/sources/ubuntu/qemu/util/qemu-sockets.c:18:
In function ‘strncpy’,
    inlined from ‘unix_connect_saddr.isra.0’ at /home/inaddy/work/sources/ubuntu/qemu/util/qemu-sockets.c:925:5:
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 108 equals destination size [-Werror=stringop-truncation]
  106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[Rafael David Tinoco (rafaeldtinoco)]

review: Needs Fixing

[Rafael David Tinoco (rafaeldtinoco)]

As we said, this is likely something in my building environment (which Ill check). I have checked PPA in an AMD machine and it works good, including nested KVM. +1 for that. Sorry for the noise!

review: Approve

[Christian Ehrhardt  (paelzer)]

Yep as the ppa re-upload with proposed enabled worked just fine.
I'll sponsor and we wills see.

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Christian,

revisiting this, because of previous building errors, I opened the following bug:

https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1841457

and the cause for the bug is this:

https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1841457/comments/1

I'm not quite sure why this is happening now, it did not happen before in my environment, for sure... AND, as demonstrated.. its not related to my environment, just related to existing .git directory (as it appears).

Best,
Rafael

diff --git a/debian/changelog b/debian/changelog
index a48d48f..b049e78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qemu (1:4.0+dfsg-0ubuntu6) eoan; urgency=medium
+
+  * d/p/ubuntu/lp-1841066-*: fix detection of arch_capability flags
+    (LP: #1841066)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 26 Aug 2019 12:08:04 +0200
+
 qemu (1:4.0+dfsg-0ubuntu5) eoan; urgency=medium
 
   * d/p/ubuntu/lp-1836154-*: further fixups for HW CPU model for newer
diff --git a/debian/patches/series b/debian/patches/series
index 06f87a5..1382ff0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,5 @@ ubuntu/lp-1836066-s390-cpumodel-fix-description-for-the-new-vector-fac.patch
 ubuntu/lp-1836159-fix-with-latest-kernel.patch
 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
diff --git a/debian/patches/ubuntu/lp-1841066-i386-unavailable-features-QOM-property.patch b/debian/patches/ubuntu/lp-1841066-i386-unavailable-features-QOM-property.patch
new file mode 100644
index 0000000..dc73297
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1841066-i386-unavailable-features-QOM-property.patch
@@ -0,0 +1,64 @@
+From 506174bf8219dc6d56d2b1f7e66e8cf39157466f Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <[e-mail]>
+Date: Mon, 22 Apr 2019 20:47:42 -0300
+Subject: [PATCH] i386: "unavailable-features" QOM property
+
+Add a "unavailable-features" QOM property to X86CPU objects that
+have the same semantics of "unavailable-features" on
+query-cpu-definitions.  The new property has the same goal of
+"filtered-features", but is generic enough to let any kind of CPU
+feature to be listed there without relying on low level details
+like CPUID leaves or MSR numbers.
+
+Message-Id: <[e-mail]>
+Signed-off-by: Eduardo Habkost <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=506174bf8219dc6d56d2b1f7e66e8cf39157466f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1841066
+Last-Update: 2019-08-26
+
+---
+ target/i386/cpu.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index 36589adb1f..7e5b545005 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -3692,6 +3692,17 @@ static void x86_cpu_list_feature_names(FeatureWordArray features,
+     }
+ }
+ 
++static void x86_cpu_get_unavailable_features(Object *obj, Visitor *v,
++                                             const char *name, void *opaque,
++                                             Error **errp)
++{
++    X86CPU *xc = X86_CPU(obj);
++    strList *result = NULL;
++
++    x86_cpu_list_feature_names(xc->filtered_features, &result);
++    visit_type_strList(v, "unavailable-features", &result, errp);
++}
++
+ /* Check for missing features that may prevent the CPU class from
+  * running using the current machine and accelerator.
+  */
+@@ -5632,6 +5643,15 @@ static void x86_cpu_initfn(Object *obj)
+     object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo",
+                         x86_cpu_get_feature_words,
+                         NULL, NULL, (void *)cpu->filtered_features, NULL);
++    /*
++     * The "unavailable-features" property has the same semantics as
++     * CpuDefinitionInfo.unavailable-features on the "query-cpu-definitions"
++     * QMP command: they list the features that would have prevented the
++     * CPU from running if the "enforce" flag was set.
++     */
++    object_property_add(obj, "unavailable-features", "strList",
++                        x86_cpu_get_unavailable_features,
++                        NULL, NULL, NULL, &error_abort);
+ 
+     object_property_add(obj, "crash-information", "GuestPanicInformation",
+                         x86_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL);
+-- 
+2.22.0
+
diff --git a/debian/patches/ubuntu/lp-1841066-i386-x86_cpu_list_feature_names-function.patch b/debian/patches/ubuntu/lp-1841066-i386-x86_cpu_list_feature_names-function.patch
new file mode 100644
index 0000000..4d67bc7
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1841066-i386-x86_cpu_list_feature_names-function.patch
@@ -0,0 +1,83 @@
+From 5a853fc57a0860da4a55d1448a77845f97e7a9be Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <[e-mail]>
+Date: Mon, 22 Apr 2019 20:47:41 -0300
+Subject: [PATCH] i386: x86_cpu_list_feature_names() function
+
+Extract feature name listing code from
+x86_cpu_class_check_missing_features().  It will be reused to
+return information about CPU filtered features at runtime.
+
+Message-Id: <[e-mail]>
+Signed-off-by: Eduardo Habkost <[e-mail]>
+
+Origin: upstream, https://git.qemu.org/?p=qemu.git;a=commit;h=5a853fc57a0860da4a55d1448a77845f97e7a9be
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1841066
+Last-Update: 2019-08-26
+
+---
+ target/i386/cpu.c | 35 ++++++++++++++++++++++-------------
+ 1 file changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index b21ecaac17..36589adb1f 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -3671,6 +3671,27 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
+ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp);
+ static int x86_cpu_filter_features(X86CPU *cpu);
+ 
++/* Build a list with the name of all features on a feature word array */
++static void x86_cpu_list_feature_names(FeatureWordArray features,
++                                       strList **feat_names)
++{
++    FeatureWord w;
++    strList **next = feat_names;
++
++    for (w = 0; w < FEATURE_WORDS; w++) {
++        uint32_t filtered = features[w];
++        int i;
++        for (i = 0; i < 32; i++) {
++            if (filtered & (1UL << i)) {
++                strList *new = g_new0(strList, 1);
++                new->value = g_strdup(x86_cpu_feature_name(w, i));
++                *next = new;
++                next = &new->next;
++            }
++        }
++    }
++}
++
+ /* Check for missing features that may prevent the CPU class from
+  * running using the current machine and accelerator.
+  */
+@@ -3678,7 +3699,6 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,
+                                                  strList **missing_feats)
+ {
+     X86CPU *xc;
+-    FeatureWord w;
+     Error *err = NULL;
+     strList **next = missing_feats;
+ 
+@@ -3705,18 +3725,7 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,
+ 
+     x86_cpu_filter_features(xc);
+ 
+-    for (w = 0; w < FEATURE_WORDS; w++) {
+-        uint32_t filtered = xc->filtered_features[w];
+-        int i;
+-        for (i = 0; i < 32; i++) {
+-            if (filtered & (1UL << i)) {
+-                strList *new = g_new0(strList, 1);
+-                new->value = g_strdup(x86_cpu_feature_name(w, i));
+-                *next = new;
+-                next = &new->next;
+-            }
+-        }
+-    }
++    x86_cpu_list_feature_names(xc->filtered_features, next);
+ 
+     object_unref(OBJECT(xc));
+ }
+-- 
+2.22.0
+