From nobody Wed May 14 23:10:41 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: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1517936156343933.8568281956963; Tue, 6 Feb 2018 08:55:56 -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 612DC2AD61; Tue, 6 Feb 2018 16:55:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E0DD5C885; Tue, 6 Feb 2018 16:55:55 +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 D7F594A46C; Tue, 6 Feb 2018 16:55:54 +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 w16GtskR010952 for ; Tue, 6 Feb 2018 11:55:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id DE0FD87AF; Tue, 6 Feb 2018 16:55:53 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BFE412A4B for ; Tue, 6 Feb 2018 16:55:47 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 6 Feb 2018 17:54:58 +0100 Message-Id: <20180206165459.15651-4-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 3/4] qemu: Implement the CFPC 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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.39]); Tue, 06 Feb 2018 16:55:55 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani --- docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ src/qemu/qemu_command.c | 5 ++++ src/qemu/qemu_domain.c | 1 + tests/qemuxml2argvdata/pseries-features-cfpc.args | 19 +++++++++++++++ tests/qemuxml2argvdata/pseries-features-cfpc.xml | 28 ++++++++++++++++++= ++++ tests/qemuxml2argvtest.c | 5 ++++ tests/qemuxml2xmloutdata/pseries-features-cfpc.xml | 1 + tests/qemuxml2xmltest.c | 3 +++ 12 files changed, 79 insertions(+) create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.args create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-cfpc.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8e19a687a..8c918ec0c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4807,6 +4807,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fcc84dc95..f894fce18 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -154,6 +154,7 @@ VIR_ENUM_IMPL(virDomainFeature, VIR_DOMAIN_FEATURE_LAST, "vmcoreinfo", "htm", "sbbc", + "cfpc", ); =20 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, VIR_DOMAIN_CAPABILITIES_POLICY_= LAST, @@ -19278,6 +19279,7 @@ virDomainDefParseXML(xmlDocPtr xml, break; =20 case VIR_DOMAIN_FEATURE_SBBC: + case VIR_DOMAIN_FEATURE_CFPC: if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("missing state attribute '%s' of feature = '%s'"), @@ -21460,6 +21462,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefP= tr src, break; =20 case VIR_DOMAIN_FEATURE_SBBC: + case VIR_DOMAIN_FEATURE_CFPC: if (src->features[i] !=3D dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of feature '%s:%s' differs: " @@ -27009,6 +27012,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, break; =20 case VIR_DOMAIN_FEATURE_SBBC: + case VIR_DOMAIN_FEATURE_CFPC: if (def->features[i] =3D=3D VIR_DOMAIN_HWBUG_NONE) break; =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ab106e900..13ac63cf2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1743,6 +1743,7 @@ typedef enum { VIR_DOMAIN_FEATURE_VMCOREINFO, VIR_DOMAIN_FEATURE_HTM, VIR_DOMAIN_FEATURE_SBBC, + VIR_DOMAIN_FEATURE_CFPC, =20 VIR_DOMAIN_FEATURE_LAST } virDomainFeature; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index be216bccf..32ad58036 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -461,6 +461,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "dump-completed", "machine.pseries.cap-htm", "machine.pseries.cap-sbbc", + + /* 285 */ + "machine.pseries.cap-cfpc", ); =20 =20 @@ -4905,6 +4908,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, ARCH_IS_PPC64(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC); } =20 if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8fbfc94d5..226c5e3af 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -447,6 +447,9 @@ typedef enum { QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries,cap-htm=3D */ QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries,cap-sbbc=3D */ =20 + /* 285 */ + QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC , /* -machine pseries,cap-cfpc=3D */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c83758b77..7ce6dfa77 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7068,6 +7068,8 @@ virDomainFeatureToQEMUCaps(int feature) return QEMU_CAPS_MACHINE_PSERIES_CAP_HTM; case VIR_DOMAIN_FEATURE_SBBC: return QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC; + case VIR_DOMAIN_FEATURE_CFPC: + return QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC; case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_APIC: case VIR_DOMAIN_FEATURE_PAE: @@ -7100,6 +7102,8 @@ virDomainFeatureToMachineOption(int feature) return "cap-htm"; case VIR_DOMAIN_FEATURE_SBBC: return "cap-sbbc"; + case VIR_DOMAIN_FEATURE_CFPC: + return "cap-cfpc"; case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_APIC: case VIR_DOMAIN_FEATURE_PAE: @@ -7411,6 +7415,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, break; =20 case VIR_DOMAIN_FEATURE_SBBC: + case VIR_DOMAIN_FEATURE_CFPC: if (def->features[i] =3D=3D VIR_DOMAIN_HWBUG_NONE) break; =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d7ce6ed65..eefea56fb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3274,6 +3274,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def) break; =20 case VIR_DOMAIN_FEATURE_SBBC: + case VIR_DOMAIN_FEATURE_CFPC: if (def->features[i] !=3D VIR_DOMAIN_HWBUG_NONE && !qemuDomainIsPSeries(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/pseries-features-cfpc.args b/tests/qemu= xml2argvdata/pseries-features-cfpc.args new file mode 100644 index 000000000..c1ed0c1dc --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-features-cfpc.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-cfpc=3Dworkaround \ +-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-cfpc.xml b/tests/qemux= ml2argvdata/pseries-features-cfpc.xml new file mode 100644 index 000000000..f30bad7f9 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-features-cfpc.xml @@ -0,0 +1,28 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 524288 + 524288 + 1 + + hvm + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-ppc64 + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0aa4145f2..649598c22 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1906,6 +1906,11 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC); DO_TEST_FAILURE("pseries-features-sbbc", QEMU_CAPS_MACHINE_OPT); + DO_TEST("pseries-features-cfpc", + QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC); + DO_TEST_FAILURE("pseries-features-cfpc", + 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-cfpc.xml b/tests/qem= uxml2xmloutdata/pseries-features-cfpc.xml new file mode 120000 index 000000000..fb3b1f05a --- /dev/null +++ b/tests/qemuxml2xmloutdata/pseries-features-cfpc.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/pseries-features-cfpc.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 05610a273..e5ff51867 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -772,6 +772,9 @@ mymain(void) DO_TEST("pseries-features-sbbc", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC); + DO_TEST("pseries-features-cfpc", + QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC); =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