From nobody Wed May 14 23:11:50 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 1517936205926349.79251766760603;
 Tue, 6 Feb 2018 08:56:45 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 0220EC058EA8;
	Tue,  6 Feb 2018 16:56:45 +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 A728A5B812;
	Tue,  6 Feb 2018 16:56:44 +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 3D13E1832ED3;
	Tue,  6 Feb 2018 16:56:44 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
	[10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w16GtlZF010920 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 6 Feb 2018 11:55:47 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 91810649BA; Tue,  6 Feb 2018 16:55:47 +0000 (UTC)
Received: from inaba.usersys.redhat.com (unknown [10.43.2.98])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BC66A5C461
	for <libvir-list@redhat.com>; Tue,  6 Feb 2018 16:55:38 +0000 (UTC)
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Date: Tue,  6 Feb 2018 17:54:57 +0100
Message-Id: <20180206165459.15651-3-abologna@redhat.com>
In-Reply-To: <20180206165459.15651-1-abologna@redhat.com>
References: <20180206165459.15651-1-abologna@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH RFCv2 2/4] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Tue, 06 Feb 2018 16:56:45 +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_capabilities.c                       |  2 +
 src/qemu/qemu_capabilities.h                       |  1 +
 src/qemu/qemu_command.c                            | 13 ++++++
 src/qemu/qemu_domain.c                             | 10 +++++
 tests/qemuxml2argvdata/pseries-features-sbbc.args  | 19 +++++++++
 tests/qemuxml2argvdata/pseries-features-sbbc.xml   | 28 +++++++++++++
 tests/qemuxml2argvtest.c                           |  5 +++
 tests/qemuxml2xmloutdata/pseries-features-sbbc.xml |  1 +
 tests/qemuxml2xmltest.c                            |  3 ++
 13 files changed, 158 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.args
 create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.xml
 create mode 120000 tests/qemuxml2xmloutdata/pseries-features-sbbc.xml

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 262f83ad7..8e19a687a 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>
@@ -5802,6 +5807,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 ea3930c5d..fcc84dc95 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)
@@ -19268,6 +19277,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;
@@ -21433,6 +21459,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:%s' differs: "
+                                 "source: '%s', destination: '%s'"),
+                               featureName, "state",
+                               virDomainHWBugTypeToString(src->features[i]=
),
+                               virDomainHWBugTypeToString(dst->features[i]=
));
+                return false;
+            }
+            break;
+
         case VIR_DOMAIN_FEATURE_LAST:
             break;
         }
@@ -26970,6 +27008,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 3a1fa1522..ab106e900 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1742,6 +1742,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;
@@ -1882,6 +1883,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 17c3b71e0..c21346027 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -396,6 +396,8 @@ virDomainHostdevSubsysTypeToString;
 virDomainHPTResizingTypeToString;
 virDomainHubTypeFromString;
 virDomainHubTypeToString;
+virDomainHWBugTypeFromString;
+virDomainHWBugTypeToString;
 virDomainHypervTypeFromString;
 virDomainHypervTypeToString;
 virDomainInputBusTypeToString;
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c3b1f748a..be216bccf 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -460,6 +460,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "machine.pseries.max-cpu-compat",
               "dump-completed",
               "machine.pseries.cap-htm",
+              "machine.pseries.cap-sbbc",
     );
=20
=20
@@ -4903,6 +4904,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
     if (qemuCaps->version >=3D 2012000 &&
         ARCH_IS_PPC64(qemuCaps->arch)) {
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM);
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC);
     }
=20
     if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5d9b67177..8fbfc94d5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -445,6 +445,7 @@ typedef enum {
     QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-=
compat=3D */
     QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
     QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries,cap-htm=3D */
+    QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries,cap-sbbc=3D */
=20
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 877482853..c83758b77 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7066,6 +7066,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:
@@ -7096,6 +7098,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:
@@ -7406,6 +7410,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 906d64894..d7ce6ed65 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3273,6 +3273,16 @@ 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 only supported for %=
s guests"),
+                               featureName, "pSeries");
+                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-sbbc.args b/tests/qemu=
xml2argvdata/pseries-features-sbbc.args
new file mode 100644
index 000000000..e619056b2
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-features-sbbc.args
@@ -0,0 +1,19 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-ppc64 \
+-name guest \
+-S \
+-machine pseries,accel=3Dtcg,cap-sbbc=3Dbroken \
+-m 512 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
+-nographic \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-guest/monitor.s=
ock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-boot c
diff --git a/tests/qemuxml2argvdata/pseries-features-sbbc.xml b/tests/qemux=
ml2argvdata/pseries-features-sbbc.xml
new file mode 100644
index 000000000..eac2c19ae
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-features-sbbc.xml
@@ -0,0 +1,28 @@
+<domain type=3D'qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit=3D'KiB'>524288</memory>
+  <currentMemory unit=3D'KiB'>524288</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'ppc64' machine=3D'pseries'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <sbbc state=3D'broken'/>
+  </features>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-ppc64</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+      <model name=3D'spapr-pci-host-bridge'/>
+      <target index=3D'0'/>
+    </controller>
+    <memballoon model=3D'none'/>
+    <panic model=3D'pseries'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 085e3a126..0aa4145f2 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1901,6 +1901,11 @@ mymain(void)
             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM);
     DO_TEST_FAILURE("pseries-features-htm",
                     QEMU_CAPS_MACHINE_OPT);
+    DO_TEST("pseries-features-sbbc",
+            QEMU_CAPS_MACHINE_OPT,
+            QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC);
+    DO_TEST_FAILURE("pseries-features-sbbc",
+                    QEMU_CAPS_MACHINE_OPT);
     DO_TEST_PARSE_ERROR("pseries-features-invalid-machine", NONE);
=20
     DO_TEST("pseries-serial-native",
diff --git a/tests/qemuxml2xmloutdata/pseries-features-sbbc.xml b/tests/qem=
uxml2xmloutdata/pseries-features-sbbc.xml
new file mode 120000
index 000000000..0bbe53221
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-features-sbbc.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pseries-features-sbbc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index a593a59e0..05610a273 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -769,6 +769,9 @@ mymain(void)
     DO_TEST("pseries-features-htm",
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_CAP_HTM);
+    DO_TEST("pseries-features-sbbc",
+            QEMU_CAPS_MACHINE_OPT,
+            QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC);
=20
     DO_TEST("pseries-serial-native",
             QEMU_CAPS_NODEFCONFIG,
--=20
2.14.3

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