From nobody Wed May 14 22:49:10 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519927440841125.71856870192767;
 Thu, 1 Mar 2018 10:04:00 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 64B697FEC8;
	Thu,  1 Mar 2018 18:03:59 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E5275F708;
	Thu,  1 Mar 2018 18:03:59 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id F299D18033FD;
	Thu,  1 Mar 2018 18:03:58 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
	[10.11.54.4])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w21I3hOQ017531 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 1 Mar 2018 13:03:43 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 47BD9200A3A9; Thu,  1 Mar 2018 18:03:43 +0000 (UTC)
Received: from inaba.usersys.redhat.com (unknown [10.43.2.98])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E3B092026E04
	for <libvir-list@redhat.com>; Thu,  1 Mar 2018 18:03:42 +0000 (UTC)
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  1 Mar 2018 19:03:32 +0100
Message-Id: <20180301180334.4225-8-abologna@redhat.com>
In-Reply-To: <20180301180334.4225-1-abologna@redhat.com>
References: <20180301180334.4225-1-abologna@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4
X-loop: libvir-list@redhat.com
Subject: [libvirt] [RFC PATCH v3 7/9] qemu: Implement the SBBC pSeries
	feature
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Thu, 01 Mar 2018 18:03:59 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

This is the first pSeries-specific optional feature that is
used to represent a hardware bug and to control how it will
be exposed to the guest.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 docs/schemas/domaincommon.rng                      | 15 +++++++
 src/conf/domain_conf.c                             | 47 ++++++++++++++++++=
++++
 src/conf/domain_conf.h                             | 12 ++++++
 src/libvirt_private.syms                           |  2 +
 src/qemu/qemu_command.c                            | 13 ++++++
 src/qemu/qemu_domain.c                             | 13 ++++++
 .../pseries-features-invalid-machine.xml           |  1 +
 tests/qemuxml2argvdata/pseries-features.args       |  2 +-
 tests/qemuxml2argvdata/pseries-features.xml        |  1 +
 tests/qemuxml2argvtest.c                           |  1 +
 tests/qemuxml2xmltest.c                            |  1 +
 11 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index b4143f5bc3..eaec426121 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -4802,6 +4802,11 @@
               <ref name=3D"featurestate"/>
             </element>
           </optional>
+          <optional>
+            <element name=3D"sbbc">
+              <ref name=3D"hwbugstate"/>
+            </element>
+          </optional>
           <optional>
             <ref name=3D"vmcoreinfo"/>
           </optional>
@@ -5824,6 +5829,16 @@
     </attribute>
   </define>
=20
+  <define name=3D"hwbugstate">
+    <attribute name=3D"state">
+      <choice>
+        <value>broken</value>
+        <value>workaround</value>
+        <value>fixed</value>
+      </choice>
+    </attribute>
+  </define>
+
   <!--
        Optional hypervisor extensions in their own namespace:
          QEmu
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1c4568396d..a112215560 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -153,6 +153,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST,
               "hpt",
               "vmcoreinfo",
               "htm",
+              "sbbc",
 );
=20
 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_=
LAST,
@@ -913,6 +914,14 @@ VIR_ENUM_IMPL(virDomainHPTResizing,
               "required",
 );
=20
+VIR_ENUM_IMPL(virDomainHWBug,
+              VIR_DOMAIN_HWBUG_LAST,
+              "none",
+              "broken",
+              "workaround",
+              "fixed",
+);
+
 /* Internal mapping: subset of block job types that can be present in
  * <mirror> XML (remaining types are not two-phase). */
 VIR_ENUM_DECL(virDomainBlockJob)
@@ -19353,6 +19362,23 @@ virDomainDefParseXML(xmlDocPtr xml,
             VIR_FREE(tmp);
             break;
=20
+        case VIR_DOMAIN_FEATURE_SBBC:
+            if (!(tmp =3D virXMLPropString(nodes[i], "state"))) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("missing state attribute '%s' of feature =
'%s'"),
+                               tmp, virDomainFeatureTypeToString(val));
+                goto error;
+            }
+            if ((def->features[val] =3D virDomainHWBugTypeFromString(tmp))=
 < 0 ||
+                def->features[val] =3D=3D VIR_DOMAIN_HWBUG_NONE) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("unknown state attribute '%s' of feature =
'%s'"),
+                               tmp, virDomainFeatureTypeToString(val));
+                goto error;
+            }
+            VIR_FREE(tmp);
+            break;
+
         /* coverity[dead_error_begin] */
         case VIR_DOMAIN_FEATURE_LAST:
             break;
@@ -21520,6 +21546,18 @@ virDomainDefFeaturesCheckABIStability(virDomainDef=
Ptr src,
             }
             break;
=20
+        case VIR_DOMAIN_FEATURE_SBBC:
+            if (src->features[i] !=3D dst->features[i]) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("State of feature '%s' differs: "
+                                 "source: '%s=3D%s', destination: '%s=3D%s=
'"),
+                               featureName,
+                               "state", virDomainHWBugTypeToString(src->fe=
atures[i]),
+                               "state", virDomainHWBugTypeToString(dst->fe=
atures[i]));
+                return false;
+            }
+            break;
+
         case VIR_DOMAIN_FEATURE_LAST:
             break;
         }
@@ -27051,6 +27089,15 @@ virDomainDefFormatInternal(virDomainDefPtr def,
                                   virDomainHPTResizingTypeToString(def->fe=
atures[i]));
                 break;
=20
+            case VIR_DOMAIN_FEATURE_SBBC:
+                if (def->features[i] =3D=3D VIR_DOMAIN_HWBUG_NONE)
+                    break;
+
+                virBufferAsprintf(buf, "<%s state=3D'%s'/>\n",
+                                  name,
+                                  virDomainHWBugTypeToString(def->features=
[i]));
+                break;
+
             /* coverity[dead_error_begin] */
             case VIR_DOMAIN_FEATURE_LAST:
                 break;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 79530101e9..a907df7830 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1747,6 +1747,7 @@ typedef enum {
     VIR_DOMAIN_FEATURE_HPT,
     VIR_DOMAIN_FEATURE_VMCOREINFO,
     VIR_DOMAIN_FEATURE_HTM,
+    VIR_DOMAIN_FEATURE_SBBC,
=20
     VIR_DOMAIN_FEATURE_LAST
 } virDomainFeature;
@@ -1887,6 +1888,17 @@ typedef enum {
=20
 VIR_ENUM_DECL(virDomainHPTResizing);
=20
+typedef enum {
+    VIR_DOMAIN_HWBUG_NONE =3D 0,
+    VIR_DOMAIN_HWBUG_BROKEN,
+    VIR_DOMAIN_HWBUG_WORKAROUND,
+    VIR_DOMAIN_HWBUG_FIXED,
+
+    VIR_DOMAIN_HWBUG_LAST
+} virDomainHWBug;
+
+VIR_ENUM_DECL(virDomainHWBug);
+
 /* Operating system configuration data & machine / arch */
 typedef struct _virDomainOSEnv virDomainOSEnv;
 typedef virDomainOSEnv *virDomainOSEnvPtr;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8a62ea159e..2f3ffed36e 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -398,6 +398,8 @@ virDomainHostdevSubsysTypeToString;
 virDomainHPTResizingTypeToString;
 virDomainHubTypeFromString;
 virDomainHubTypeToString;
+virDomainHWBugTypeFromString;
+virDomainHWBugTypeToString;
 virDomainHypervTypeFromString;
 virDomainHypervTypeToString;
 virDomainInputBusTypeToString;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d40c038660..1d781d1abd 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7123,6 +7123,8 @@ virDomainFeatureToQEMUCaps(int feature)
     switch ((virDomainFeature) feature) {
     case VIR_DOMAIN_FEATURE_HTM:
         return QEMU_CAPS_MACHINE_PSERIES_CAP_HTM;
+    case VIR_DOMAIN_FEATURE_SBBC:
+        return QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC;
     case VIR_DOMAIN_FEATURE_ACPI:
     case VIR_DOMAIN_FEATURE_APIC:
     case VIR_DOMAIN_FEATURE_PAE:
@@ -7153,6 +7155,8 @@ virDomainFeatureToMachineOption(int feature)
     switch ((virDomainFeature) feature) {
     case VIR_DOMAIN_FEATURE_HTM:
         return "cap-htm";
+    case VIR_DOMAIN_FEATURE_SBBC:
+        return "cap-sbbc";
     case VIR_DOMAIN_FEATURE_ACPI:
     case VIR_DOMAIN_FEATURE_APIC:
     case VIR_DOMAIN_FEATURE_PAE:
@@ -7463,6 +7467,15 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
                     goto cleanup;
                 break;
=20
+            case VIR_DOMAIN_FEATURE_SBBC:
+                if (def->features[i] =3D=3D VIR_DOMAIN_HWBUG_NONE)
+                    break;
+
+                value =3D virDomainHWBugTypeToString(def->features[i]);
+                if (qemuBuildMachineCommandLineFeature(&buf, i, value, qem=
uCaps) < 0)
+                    goto cleanup;
+                break;
+
             case VIR_DOMAIN_FEATURE_ACPI:
             case VIR_DOMAIN_FEATURE_APIC:
             case VIR_DOMAIN_FEATURE_PAE:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fa32dd1075..38059215c6 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3390,6 +3390,19 @@ qemuDomainDefValidateFeatures(const virDomainDef *de=
f)
             }
             break;
=20
+        case VIR_DOMAIN_FEATURE_SBBC:
+            if (def->features[i] !=3D VIR_DOMAIN_HWBUG_NONE &&
+                !qemuDomainIsPSeries(def)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("The '%s' feature is not supported for "
+                                 "architecture '%s' or machine type '%s'"),
+                               featureName,
+                               virArchToString(def->os.arch),
+                               def->os.machine);
+                return -1;
+            }
+            break;
+
         case VIR_DOMAIN_FEATURE_ACPI:
         case VIR_DOMAIN_FEATURE_APIC:
         case VIR_DOMAIN_FEATURE_PAE:
diff --git a/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml b/=
tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
index 76cbf0737f..0a6fcedc0c 100644
--- a/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
+++ b/tests/qemuxml2argvdata/pseries-features-invalid-machine.xml
@@ -10,6 +10,7 @@
     <!-- pSeries features can't be enabled for non-pSeries guests -->
     <hpt resizing=3D'enabled'/>
     <htm state=3D'on'/>
+    <sbbc state=3D'broken'/>
   </features>
   <devices>
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2a=
rgvdata/pseries-features.args
index 0517ca8237..7c9b803af9 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=3Dnone \
 /usr/bin/qemu-system-ppc64 \
 -name guest \
 -S \
--machine pseries,accel=3Dtcg,resize-hpt=3Drequired,cap-htm=3Don \
+-machine pseries,accel=3Dtcg,resize-hpt=3Drequired,cap-htm=3Don,cap-sbbc=
=3Dbroken \
 -m 512 \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
diff --git a/tests/qemuxml2argvdata/pseries-features.xml b/tests/qemuxml2ar=
gvdata/pseries-features.xml
index a0e98db8b2..273f74c285 100644
--- a/tests/qemuxml2argvdata/pseries-features.xml
+++ b/tests/qemuxml2argvdata/pseries-features.xml
@@ -11,6 +11,7 @@
   <features>
     <hpt resizing=3D'required'/>
     <htm state=3D'on'/>
+    <sbbc state=3D'broken'/>
   </features>
   <clock offset=3D'utc'/>
   <on_poweroff>destroy</on_poweroff>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 03f8c429e0..284cb7fb68 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1899,6 +1899,7 @@ mymain(void)
     DO_TEST("pseries-features",
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
+            QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
     DO_TEST_FAILURE("pseries-features",
                     QEMU_CAPS_MACHINE_OPT);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index b9a8bd6f14..a063e8a7a3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -766,6 +766,7 @@ mymain(void)
     DO_TEST("pseries-features",
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
+            QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
=20
     DO_TEST("pseries-serial-native",
--=20
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list