From nobody Sat Nov 15 16:07:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1748959096; cv=none; d=zohomail.com; s=zohoarc; b=gF/3yBUII3QQbmCS88JJWzAnl8T4IpGv3/NaT4eweWVhRmEDmB9oRKwilf9eovbB8n4IQaglwcJUVDzbcNvwEkn6ovIrGx3MC/KtkxYwqNuyWeQzPTClRjrqA/MYOyLXbEBxVdvJIFFgSyQJXNBQKiBvObm9B+gj8MO0H4Ltyuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748959096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9tAU8my0e3Qa/qPiF873+4rIfDxlHiKCRO96TB7AvrY=; b=WT/n9mTzamUvbObmIuuYgkehNDFVXrMCHzoV1S0EArq/kq1P96eAGtFdTOIvpsmQ+8gm5GL6s1HKI5RSgt+KjkQfLgdBn3bFEDwhr0aXkf+prFf6pcPDgOU+Hy4VdtLgApyQcP/yhkuOgh2P0rtKOz2/BKT3WHUE/EmvaMV8sgs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748959096560606.9319019548877; Tue, 3 Jun 2025 06:58:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMS8l-0002sN-Le; Tue, 03 Jun 2025 09:57:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8j-0002qi-Iw; Tue, 03 Jun 2025 09:57:17 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8e-0004LW-9V; Tue, 03 Jun 2025 09:57:17 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 553727av014211; Tue, 3 Jun 2025 13:57:08 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 471geymsgy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:07 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 553A5RkV031690; Tue, 3 Jun 2025 13:57:07 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 470cfyu7qe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:06 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 553Dv2RC49217994 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Jun 2025 13:57:02 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A57B72004B; Tue, 3 Jun 2025 13:57:02 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6135F20040; Tue, 3 Jun 2025 13:57:02 +0000 (GMT) Received: from a46lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 3 Jun 2025 13:57:02 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=9tAU8my0e3Qa/qPiF 873+4rIfDxlHiKCRO96TB7AvrY=; b=L2QdQv7AasIpZvYms+HemmD+5llM2iEth rRFK67prvGVPk5CIMKnmPYWH/AeDdGPKQB2apbwP85XPx4Oa1hRbyQfoNENK4CNr iZWWrpyVUtvIBk8lUUDaIdmpUqt3wT520tpIiBw7daZgbH8bKtJRx0vufNQ/fQY1 r5naPlph4NJg0FJaPG77ufZsQGlMj6YhkK9gaoTc/a9GzqJvydUzHwXB94MKcZZ+ ud3HcZjczROanMI2e/+xrlX6TujdRG/3zWoJ5SbGL1Xnco52NGIqUTNl1FAQxGCz SBhKH/13bsUBDy7TQQ9AKtZf5QhDEPdmlm8b8+A9PfLxwJnBVJd2g== From: Shalini Chellathurai Saroja To: qemu-s390x mailing list , Thomas Huth Cc: Daniel Berrange , qemu-devel mailing list , Nina Schoetterl-Glausch , Hendrik Brueckner , Shalini Chellathurai Saroja Subject: [PATCH v5 1/3] hw/s390x: add SCLP event type CPI Date: Tue, 3 Jun 2025 15:56:53 +0200 Message-ID: <20250603135655.595602-2-shalini@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603135655.595602-1-shalini@linux.ibm.com> References: <20250603135655.595602-1-shalini@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: UopzZeb6ePHlvK99j2gXJd5n66s7uQVQ X-Proofpoint-ORIG-GUID: UopzZeb6ePHlvK99j2gXJd5n66s7uQVQ X-Authority-Analysis: v=2.4 cv=X4dSKHTe c=1 sm=1 tr=0 ts=683eff33 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8 a=WFBG01HGG7YeWrT3N-wA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjAzMDExNyBTYWx0ZWRfX45RkAu8cKW4D ApWupNzoYyH1p/BcnDS12jHYTCAqw1+O5y+X9i3GcgJEsljw0emyKLho8tsWUsv83sbagfRDbkG RR7wQPWaqHNqPPGVtJkU/AWLmjuANQ5USjRHidMa+uz/+MAn1nhGIdvk1Wr5lW9bVOLao+lUs/4 HhwaUjuBUWtpt8E+i8zgW3Uq6E+O+Sqjn5+abYa0O3/DKIHF6aYbRE+ouzyWnF0Fm2ByqYG88LL lAb6sxyhWDbs0CndiKuH7LA/FG+O8hDQZesEdAqTS0qjT68yPoVYCfv3ORz7Gf0yxej9Pfoewwr gSXsUf4zLvJ5SiqSH60/nzA3+RjK1QEPOM6NJr9fibIIBRSe7KK0ZjqzcPZheh/MM8HdFLXbmno zd7pYJicw00Vzuxgu4mA7E/dWx8QUXaaqxbunFdLqHqfSHrV08ec9dBCHG74AbltchidickO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-03_01,2025-06-02_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 phishscore=0 bulkscore=0 malwarescore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506030117 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=shalini@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1748959098247116600 Content-Type: text/plain; charset="utf-8" Implement the Service-Call Logical Processor (SCLP) event type Control-Program Identification (CPI) in QEMU. This event is used to send CPI identifiers from the guest to the host. The CPI identifiers are: system type, system name, system level and sysplex name. System type: operating system of the guest (e.g. "LINUX"). System name: user configurable name of the guest (e.g. "TESTVM"). System level: distribution and kernel version, if the system type is Linux (e.g. 0x50e00). Sysplex name: name of the cluster which the guest belongs to (if any) (e.g. "PLEX"). The SCLP event CPI is supported only from "s390-ccw-virtio-10.1" machine and higher. Signed-off-by: Shalini Chellathurai Saroja Reviewed-by: Thomas Huth --- hw/s390x/event-facility.c | 2 + hw/s390x/meson.build | 1 + hw/s390x/s390-virtio-ccw.c | 22 ++++++++ hw/s390x/sclpcpi.c | 89 ++++++++++++++++++++++++++++++ include/hw/s390x/event-facility.h | 12 ++++ include/hw/s390x/s390-virtio-ccw.h | 1 + 6 files changed, 127 insertions(+) create mode 100644 hw/s390x/sclpcpi.c diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 7b7bf237fe..fee286ea63 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -4,6 +4,7 @@ * handles SCLP event types * - Signal Quiesce - system power down * - ASCII Console Data - VT220 read and write + * - Control-Program Identification - Send OS data from guest to = host * * Copyright IBM, Corp. 2012 * @@ -40,6 +41,7 @@ struct SCLPEventFacility { SysBusDevice parent_obj; SCLPEventsBus sbus; SCLPEvent quiesce, cpu_hotplug; + SCLPEventCPI cpi; /* guest's receive mask */ union { uint32_t receive_mask_pieces[2]; diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build index 3bbebfd817..eb7950489c 100644 --- a/hw/s390x/meson.build +++ b/hw/s390x/meson.build @@ -13,6 +13,7 @@ s390x_ss.add(files( 's390-skeys.c', 's390-stattrib.c', 'sclp.c', + 'sclpcpi.c', 'sclpcpu.c', 'sclpquiesce.c', 'tod.c', diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f69a4d8ed3..a0f766c026 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -260,9 +260,21 @@ static void s390_create_sclpconsole(SCLPDevice *sclp, qdev_realize_and_unref(dev, ev_fac_bus, &error_fatal); } =20 +static void s390_create_sclpcpi(SCLPDevice *sclp) +{ + SCLPEventFacility *ef =3D sclp->event_facility; + BusState *ev_fac_bus =3D sclp_get_event_facility_bus(ef); + DeviceState *dev; + + dev =3D qdev_new(TYPE_SCLP_EVENT_CPI); + object_property_add_child(OBJECT(ef), "sclpcpi", OBJECT(dev)); + qdev_realize_and_unref(dev, ev_fac_bus, &error_fatal); +} + static void ccw_init(MachineState *machine) { MachineClass *mc =3D MACHINE_GET_CLASS(machine); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); S390CcwMachineState *ms =3D S390_CCW_MACHINE(machine); int ret; VirtualCssBus *css_bus; @@ -323,6 +335,12 @@ static void ccw_init(MachineState *machine) =20 /* init the TOD clock */ s390_init_tod(); + + /* init SCLP event Control-Program Identification */ + if (s390mc->use_cpi) { + s390_create_sclpcpi(ms->sclp); + } + } =20 static void s390_cpu_plug(HotplugHandler *hotplug_dev, @@ -783,6 +801,7 @@ static void ccw_machine_class_init(ObjectClass *oc, con= st void *data) DumpSKeysInterface *dsi =3D DUMP_SKEYS_INTERFACE_CLASS(oc); =20 s390mc->max_threads =3D 1; + s390mc->use_cpi =3D true; mc->reset =3D s390_machine_reset; mc->block_default_type =3D IF_VIRTIO; mc->no_cdrom =3D 1; @@ -908,6 +927,9 @@ static void ccw_machine_10_0_instance_options(MachineSt= ate *machine) =20 static void ccw_machine_10_0_class_options(MachineClass *mc) { + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); + s390mc->use_cpi =3D false; + ccw_machine_10_1_class_options(mc); compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len); } diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c new file mode 100644 index 0000000000..935fa87acd --- /dev/null +++ b/hw/s390x/sclpcpi.c @@ -0,0 +1,89 @@ + /* + * SPDX-License-Identifier: GPL-2.0-or-later + * + * SCLP event type 11 - Control-Program Identification (CPI): + * CPI is used to send program identifiers from the guest to the + * Service-Call Logical Processor (SCLP). It is not sent by the SCLP. + * Please refer S390ControlProgramId QOM-type description for details + * on the contents of the CPI. + * + * Copyright IBM, Corp. 2024 + * + * Authors: + * Shalini Chellathurai Saroja + * + */ + +#include "qemu/osdep.h" +#include "hw/s390x/event-facility.h" + +typedef struct Data { + uint8_t id_format; + uint8_t reserved0; + uint8_t system_type[8]; + uint64_t reserved1; + uint8_t system_name[8]; + uint64_t reserved2; + uint64_t system_level; + uint64_t reserved3; + uint8_t sysplex_name[8]; + uint8_t reserved4[16]; +} QEMU_PACKED Data; + +typedef struct ControlProgramIdMsg { + EventBufferHeader ebh; + Data data; +} QEMU_PACKED ControlProgramIdMsg; + +static bool can_handle_event(uint8_t type) +{ + return type =3D=3D SCLP_EVENT_CTRL_PGM_ID; +} + +static sccb_mask_t send_mask(void) +{ + return 0; +} + +/* Enable SCLP to accept buffers of event type CPI from the control-progra= m. */ +static sccb_mask_t receive_mask(void) +{ + return SCLP_EVENT_MASK_CTRL_PGM_ID; +} + +static int write_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_h= dr) +{ + ControlProgramIdMsg *cpim =3D container_of(evt_buf_hdr, ControlProgram= IdMsg, + ebh); + + cpim->ebh.flags =3D SCLP_EVENT_BUFFER_ACCEPTED; + return SCLP_RC_NORMAL_COMPLETION; +} + +static void cpi_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + SCLPEventClass *k =3D SCLP_EVENT_CLASS(klass); + + dc->user_creatable =3D false; + + k->can_handle_event =3D can_handle_event; + k->get_send_mask =3D send_mask; + k->get_receive_mask =3D receive_mask; + k->write_event_data =3D write_event_data; +} + +static const TypeInfo sclp_cpi_info =3D { + .name =3D TYPE_SCLP_EVENT_CPI, + .parent =3D TYPE_SCLP_EVENT, + .instance_size =3D sizeof(SCLPEventCPI), + .class_init =3D cpi_class_init, +}; + +static void sclp_cpi_register_types(void) +{ + type_register_static(&sclp_cpi_info); +} + +type_init(sclp_cpi_register_types) + diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index ff874e792d..e81bc80498 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -25,6 +25,7 @@ #define SCLP_EVENT_MESSAGE 0x02 #define SCLP_EVENT_CONFIG_MGT_DATA 0x04 #define SCLP_EVENT_PMSGCMD 0x09 +#define SCLP_EVENT_CTRL_PGM_ID 0x0b #define SCLP_EVENT_ASCII_CONSOLE_DATA 0x1a #define SCLP_EVENT_SIGNAL_QUIESCE 0x1d =20 @@ -35,6 +36,7 @@ #define SCLP_EVENT_MASK_MSG SCLP_EVMASK(SCLP_EVENT_MESSAGE) #define SCLP_EVENT_MASK_CONFIG_MGT_DATA SCLP_EVMASK(SCLP_EVENT_CONFIG_MGT_= DATA) #define SCLP_EVENT_MASK_PMSGCMD SCLP_EVMASK(SCLP_EVENT_PMSGCMD) +#define SCLP_EVENT_MASK_CTRL_PGM_ID SCLP_EVMASK(SCLP_EVENT_CTRL_PGM_ID) #define SCLP_EVENT_MASK_MSG_ASCII SCLP_EVMASK(SCLP_EVENT_ASCII_CONSO= LE_DATA) #define SCLP_EVENT_MASK_SIGNAL_QUIESCE SCLP_EVMASK(SCLP_EVENT_SIGNAL_QUIE= SCE) =20 @@ -191,6 +193,16 @@ struct SCLPEventClass { bool (*can_handle_event)(uint8_t type); }; =20 +#define TYPE_SCLP_EVENT_CPI "sclpcpi" +typedef struct SCLPEventCPIClass SCLPEventCPIClass; +typedef struct SCLPEventCPI SCLPEventCPI; +OBJECT_DECLARE_TYPE(SCLPEventCPI, SCLPEventCPIClass, + SCLP_EVENT_CPI) + +struct SCLPEventCPI { + SCLPEvent event; +}; + #define TYPE_SCLP_EVENT_FACILITY "s390-sclp-event-facility" typedef struct SCLPEventFacility SCLPEventFacility; typedef struct SCLPEventFacilityClass SCLPEventFacilityClass; diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index 321b26df30..526078a4e2 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -54,6 +54,7 @@ struct S390CcwMachineClass { =20 /*< public >*/ int max_threads; + bool use_cpi; }; =20 #endif --=20 2.49.0 From nobody Sat Nov 15 16:07:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1748959096; cv=none; d=zohomail.com; s=zohoarc; b=Bp1IkybwplLvP7+xvmoZuvX9Z1rWdC191GRX2oVj46qEt9TcmK+ygUytdjfV3lrPR09m0mrxTrTkhA7xkr0A7HvJfcebbogWplenKBMdJWRNnVgHOLDWgthi1ecb3JLpFA18/akMM+HZqISm4GAD7EHYIhjbypyvhjc3rErz/28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748959096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OQmINx8T3y9xOi+1kApS0skKtU1RofciDPRKO0qlAMc=; b=G/dEpvFBRZ8MxFes/KBLFBsGp8hCbD9V4J0zn6f2i4FLmPxRrKjbeNIFlhxoIGZYUETlizvXHh/DtAwnlI0h6554tOxBfwh+SuexpeHB8WTH+Jj6UJGcr1pqZk/0nniv4piaTfhvLEr7gn0quIkN7DsYwkDzGt+woFNpiZKCgkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748959096479684.071951503778; Tue, 3 Jun 2025 06:58:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMS8p-0002tX-K5; Tue, 03 Jun 2025 09:57:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8m-0002sw-OR; Tue, 03 Jun 2025 09:57:20 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8f-0004Lh-PP; Tue, 03 Jun 2025 09:57:20 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5537Jicl019326; Tue, 3 Jun 2025 13:57:09 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 471geymuth-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:09 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 553DrGL5024754; Tue, 3 Jun 2025 13:57:08 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 470dkmb0s2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:08 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 553Dv4SA30081384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Jun 2025 13:57:04 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 21E052004D; Tue, 3 Jun 2025 13:57:04 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF46F20049; Tue, 3 Jun 2025 13:57:03 +0000 (GMT) Received: from a46lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 3 Jun 2025 13:57:03 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=OQmINx8T3y9xOi+1k ApS0skKtU1RofciDPRKO0qlAMc=; b=aT/Fzt1GRzAvg4nSAO2Qh+RtT5ydil1Bt J+jW8iQcNrFrXJG90uhl/V23E9QWlehDpk8PGdnQbIKA1yRkJH6VObXIsSYCsQEC ZaDB2dm5joEo7CRaVwDuSEGCI3kq0BSzsH9V2+a+KQlKKOcdXVCy+22wvloyx0Bh 2mfjDDC8qqOryvxVigdrSnn9ExmmmQVsZTebsVXzQ9ZX+X/w7EICRuOJepSlp3MW tdLEUmjikhZMO4TZulDDe7JZzBUg0sZ5RDb7hw3EK2fozJR3vu3E8mnbfagbO4O5 Yb7ODhjuXZ+UIC8N3vz2AhWoHirrouHFoCMrzbVRsQUHZAfewIy6A== From: Shalini Chellathurai Saroja To: qemu-s390x mailing list , Thomas Huth Cc: Daniel Berrange , qemu-devel mailing list , Nina Schoetterl-Glausch , Hendrik Brueckner , Shalini Chellathurai Saroja Subject: [PATCH v5 2/3] hw/s390x: add Control-Program Identification to QOM Date: Tue, 3 Jun 2025 15:56:54 +0200 Message-ID: <20250603135655.595602-3-shalini@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603135655.595602-1-shalini@linux.ibm.com> References: <20250603135655.595602-1-shalini@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 5zy2rH2IyQo85sEJHyGayRdRaD9bzvSs X-Authority-Analysis: v=2.4 cv=DYMXqutW c=1 sm=1 tr=0 ts=683eff35 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=QWFg5UiSIRAATzpd3y4A:9 X-Proofpoint-GUID: 5zy2rH2IyQo85sEJHyGayRdRaD9bzvSs X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjAzMDExNyBTYWx0ZWRfX6c0pF7j5wDeW I4AGZHcebOeWoqhX29fBjvTSQ23CNyIV2RRrpl9vAp9TRuRGjfJBQU7aUmpDhrjEn+zgowyoBpV 7PKxAZzvFIRGbx91WusK4MvzORryI9Q08TUFtudfovvtGnak+pw6oXlHhf2ezxTnS0ISNOo9Jhn iowAPXgR1JK1uE4Q8sNLsWO3Ph7t9JC9l1nyAwBx1uS2Sj+LIY9fGhJXoiRr0yzhz/VVB9RBhdS MmW+42EwqVqfFfY5vYEc32Gu7Wc05ZJ+wE7ThAWZ0J+iwZ8EzXAu/YofLvbEm0Zzm/a6zx9odtM x95LNcJiP1Y5VqSRMsKu0DzWZD+eDXyiGbWfIreEAZs8YvZntamyTYQRVbeXc3QevHhxO8GyhYX +6n3GstcB4GZG/Ti3rHcZrLvojV9MBzTb0321YSwdeRUdBW6xrOZcC1QEu2pBLS6PS0nA3Qh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-03_01,2025-06-02_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 phishscore=0 mlxlogscore=999 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506030117 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=shalini@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1748959098251116600 Content-Type: text/plain; charset="utf-8" Add Control-Program Identification (CPI) data to the QEMU Object Model (QOM), along with the timestamp in which the data was received as shown below. virsh # qemu-monitor-command vm --pretty '{"execute":"qom-list", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi"}}' { "return": [ [...] { "name": "system_level", "type": "uint64" }, { "name": "system_name", "type": "string" }, { "name": "system_type", "type": "string" }, { "name": "timestamp", "type": "uint64" }, { "name": "sysplex_name", "type": "string" } ], "id": "libvirt-14" } Example CPI data: virsh # qemu-monitor-command vm --pretty '{"execute":"qom-get", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi", "property":"system_type"}}' { "return": "LINUX ", "id": "libvirt-18" } virsh # qemu-monitor-command vm --pretty '{"execute":"qom-get", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi", "property":"system_name"}}' { "return": "TESTVM ", "id": "libvirt-19" } virsh # qemu-monitor-command vm --pretty '{"execute":"qom-get", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi", "property":"sysplex_name"}}' { "return": "PLEX ", "id": "libvirt-20" } virsh # qemu-monitor-command vm --pretty '{"execute":"qom-get", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi", "property":"system_level"}}' { "return": 74872343805430528, "id": "libvirt-21" } virsh # qemu-monitor-command vm --pretty '{"execute":"qom-get", "arguments":{"path":"/machine/sclp/s390-sclp-event-facility/sclpcpi", "property":"timestamp"}}' { "return": 1748866753433923000, "id": "libvirt-22" } Signed-off-by: Shalini Chellathurai Saroja --- hw/s390x/sclpcpi.c | 47 +++++++++++++++++++++++++ include/hw/s390x/event-facility.h | 5 +++ qapi/machine.json | 58 +++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c index 935fa87acd..ec711e2291 100644 --- a/hw/s390x/sclpcpi.c +++ b/hw/s390x/sclpcpi.c @@ -15,7 +15,9 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/timer.h" #include "hw/s390x/event-facility.h" +#include "hw/s390x/ebcdic.h" =20 typedef struct Data { uint8_t id_format; @@ -55,11 +57,42 @@ static int write_event_data(SCLPEvent *event, EventBuff= erHeader *evt_buf_hdr) { ControlProgramIdMsg *cpim =3D container_of(evt_buf_hdr, ControlProgram= IdMsg, ebh); + SCLPEventCPI *e =3D SCLP_EVENT_CPI(event); + + ascii_put(e->system_type, (char *)cpim->data.system_type, + sizeof(cpim->data.system_type)); + ascii_put(e->system_name, (char *)cpim->data.system_name, + sizeof(cpim->data.system_name)); + ascii_put(e->sysplex_name, (char *)cpim->data.sysplex_name, + sizeof(cpim->data.sysplex_name)); + e->system_level =3D ldq_be_p(&cpim->data.system_level); + e->timestamp =3D qemu_clock_get_ns(QEMU_CLOCK_HOST); =20 cpim->ebh.flags =3D SCLP_EVENT_BUFFER_ACCEPTED; return SCLP_RC_NORMAL_COMPLETION; } =20 +static char *get_system_type(Object *obj, Error **errp) +{ + SCLPEventCPI *e =3D SCLP_EVENT_CPI(obj); + + return g_strndup((char *) e->system_type, sizeof(e->system_type)); +} + +static char *get_system_name(Object *obj, Error **errp) +{ + SCLPEventCPI *e =3D SCLP_EVENT_CPI(obj); + + return g_strndup((char *) e->system_name, sizeof(e->system_name)); +} + +static char *get_sysplex_name(Object *obj, Error **errp) +{ + SCLPEventCPI *e =3D SCLP_EVENT_CPI(obj); + + return g_strndup((char *) e->sysplex_name, sizeof(e->sysplex_name)); +} + static void cpi_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -73,10 +106,24 @@ static void cpi_class_init(ObjectClass *klass, const v= oid *data) k->write_event_data =3D write_event_data; } =20 +static void cpi_init(Object *obj) +{ + SCLPEventCPI *e =3D SCLP_EVENT_CPI(obj); + + object_property_add_str(obj, "system_type", get_system_type, NULL); + object_property_add_str(obj, "system_name", get_system_name, NULL); + object_property_add_str(obj, "sysplex_name", get_sysplex_name, NULL); + object_property_add_uint64_ptr(obj, "system_level", &(e->system_level), + OBJ_PROP_FLAG_READ); + object_property_add_uint64_ptr(obj, "timestamp", &(e->timestamp), + OBJ_PROP_FLAG_READ); +} + static const TypeInfo sclp_cpi_info =3D { .name =3D TYPE_SCLP_EVENT_CPI, .parent =3D TYPE_SCLP_EVENT, .instance_size =3D sizeof(SCLPEventCPI), + .instance_init =3D cpi_init, .class_init =3D cpi_class_init, }; =20 diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-fac= ility.h index e81bc80498..eac7a51100 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -201,6 +201,11 @@ OBJECT_DECLARE_TYPE(SCLPEventCPI, SCLPEventCPIClass, =20 struct SCLPEventCPI { SCLPEvent event; + uint8_t system_type[8]; + uint8_t system_name[8]; + uint64_t system_level; + uint8_t sysplex_name[8]; + uint64_t timestamp; }; =20 #define TYPE_SCLP_EVENT_FACILITY "s390-sclp-event-facility" diff --git a/qapi/machine.json b/qapi/machine.json index 5373e1368c..1f2db68032 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -2279,3 +2279,61 @@ # Since: 1.2 ## { 'command': 'query-cpu-definitions', 'returns': ['CpuDefinitionInfo'] } + +## +# @S390ControlProgramId: +# +# Control-program identifiers provide data about the guest operating syste= m. +# The control-program identifiers are: system type, system name, system le= vel +# and sysplex name. +# +# In Linux, all the control-program identifiers are user configurable. The +# system type, system name, and sysplex name use EBCDIC characters from +# this set: capital A-Z, 0-9, $, @, #, and blank. In Linux, the system ty= pe, +# system name and sysplex name are arbitrary free-form texts. +# +# In Linux, the 8-byte hexadecimal system-level has the format +# 0x
, where: +# : is one hexadecimal byte, its most significant bit indicates hypervi= sor +# use +# : is one digit that represents Linux distributions as follows +# 0: generic Linux +# 1: Red Hat Enterprise Linux +# 2: SUSE Linux Enterprise Server +# 3: Canonical Ubuntu +# 4: Fedora +# 5: openSUSE Leap +# 6: Debian GNU/Linux +# 7: Red Hat Enterprise Linux CoreOS +# : are two digits for a distribution-specific encoding of the major v= ersion +# of the distribution +#
: are two digits for a distribution-specific encoding of the minor v= ersion +# of the distribution +# : are four digits for the patch level of the distribution +# : are two digits for the major version of the kernel +# : are two digits for the minor version of the kernel +# : are two digits for the stable version of the kernel +# (e.g. 74872343805430528, when converted to hex is 0x010a000000060b00). On +# machines prior to z16, some of the values are not available to display. +# +# Sysplex refers to a cluster of logical partitions that communicates and +# co-operates with each other. +# +# @system-type: operating system (e.g. "LINUX ") +# +# @system-name: user configurable name of the VM (e.g. "TESTVM ") +# +# @system-level: distribution and kernel version in Linux +# +# @sysplex-name: sysplex which the VM belongs to, if any (e.g. "PLEX ") +# +# @timestamp: latest update of CPI data in nanoseconds since the UNIX EPOCH +# +# Since: 10.1 +## +{ 'struct': 'S390ControlProgramId', 'data': { + 'system-type': 'str', + 'system-name': 'str', + 'system-level': 'uint64', + 'sysplex-name': 'str', + 'timestamp': 'uint64' } } --=20 2.49.0 From nobody Sat Nov 15 16:07:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1748959096; cv=none; d=zohomail.com; s=zohoarc; b=gQcu1KaziKsGclGyOB/rOrArI1YQastFmFyZhFLjjtbA9mY9LTy80mz8t25HcgJadY/StiM/pmpTNACuCTisIe08Pk7Gawrj/DwD+j201324yT2Ad0XvMeyEgqaiua5lFOV/K1+dnktwhw2+hdF3GYGKGtMt6Tr2kZVmj66UrE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748959096; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lZT+M675yQzwY6sJ3bP6ppPy4ZUlcZnaoD9UuowffU8=; b=A3KKaTbPqDa3Og2iBK3nad6GJgYEhv8Z0n9agdbU8+fP53VfmwKFhm1qc0EeMQOnop63iZoGGoqk6ri+bgH4gFgQDWuZ4Xq+pa7nbKkKEkfdS5dHJHorrEfz6xBUgDUNuiiWeQ4WaBCcw6eDU8LnGiHwK5Hf7JCFEVF8vVhmcCk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748959095952402.8626294321963; Tue, 3 Jun 2025 06:58:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMS8k-0002rA-Ph; Tue, 03 Jun 2025 09:57:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8h-0002q0-PH; Tue, 03 Jun 2025 09:57:15 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMS8e-0004Lo-JY; Tue, 03 Jun 2025 09:57:14 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5535t5HL032519; Tue, 3 Jun 2025 13:57:11 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 471gf04t5t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:10 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 553A7sx7022518; Tue, 3 Jun 2025 13:57:10 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 470c3tba13-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 03 Jun 2025 13:57:10 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 553Dv64v33227420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 3 Jun 2025 13:57:06 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 850162004B; Tue, 3 Jun 2025 13:57:06 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 422DB20049; Tue, 3 Jun 2025 13:57:06 +0000 (GMT) Received: from a46lp68.lnxne.boe (unknown [9.152.108.100]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 3 Jun 2025 13:57:06 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=lZT+M675yQzwY6sJ3 bP6ppPy4ZUlcZnaoD9UuowffU8=; b=HKOR+4+T8HMeekmcmEXth1YiKOLCfAOvM gRUrh0vjIgyHkTcHMbtCVxLRDak7ANqon9a6w0Re+whg1uWh3lE6F5SWaPU554NV mZNa+oc25O4y2EZHkw3xY3f2zK+m4dw3FBTgV1iy7rfL8RPjq68vHDYEV+S7Pk22 cMXwJ4R1/u9RdxremhFt4UUv06lyLpQqL8YkCW34+sMb6eM0r56bMfol6aIVGBv/ X9/UGmF4EZOJn3h5Z4qBSq026UZ3JawFJFbbydZtXky9Jqg17CY7yVUuqZrIbZcL y7f0jfFpmOHjydyzXAeFdkB6w6mGodnA+XmEoZWKH8F6hQckWChJA== From: Shalini Chellathurai Saroja To: qemu-s390x mailing list , Thomas Huth Cc: Daniel Berrange , qemu-devel mailing list , Nina Schoetterl-Glausch , Hendrik Brueckner , Shalini Chellathurai Saroja Subject: [PATCH v5 3/3] hw/s390x: support migration of CPI data Date: Tue, 3 Jun 2025 15:56:55 +0200 Message-ID: <20250603135655.595602-4-shalini@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250603135655.595602-1-shalini@linux.ibm.com> References: <20250603135655.595602-1-shalini@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: MITLKln34ki6wPqoi0MNoqH6N0lQUfh1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjAzMDExNyBTYWx0ZWRfXyhFvhZAUcQgy wFZvch107WkbmRZOlBCiPISrRat3dT6y0spp4wotn5c0qki+g/LxEYW32Vxjk0DRtjQ7GF1siWo /RPl0hcoq7rLXojBZn5mBWm7t4GSSxxxqLEKv5JZQQ92KC3995641FT/gqkd1go198QWdgnRGOP +2bsnb2t+4Z1ls0z1TX1CxnWwlKIq0ixPI/YAT9CMnKiMljz4nEgdu4zI4n0DbvhtWCW2n64M59 fC1rFrEU3biWOB7G95RjV+y5d0V1wVNkwgrrkDAqtdj1HNKf/FDDhBVje286ohTr5kwmG0Y879h eXAQU2wAJf3r1PqKATASf+17gU5sTgsiAsVnQpW5VkQjgZky7CltZprMglQCiW19WwoEKnmdTTI K0PC6Wi02rcApb1GITfu+2dO78yrwb0HU/aEW+VAD9DqNFT45y2UfDtz0rbzP6exCfz6XECV X-Proofpoint-ORIG-GUID: MITLKln34ki6wPqoi0MNoqH6N0lQUfh1 X-Authority-Analysis: v=2.4 cv=c+WrQQ9l c=1 sm=1 tr=0 ts=683eff36 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=xxl9de-Fxz7HayD7txoA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-03_01,2025-06-02_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 spamscore=0 priorityscore=1501 mlxlogscore=999 phishscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=0 bulkscore=0 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506030117 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=shalini@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1748959098002116600 Content-Type: text/plain; charset="utf-8" Register Control-Program Identification data with the live migration infrastructure. Signed-off-by: Shalini Chellathurai Saroja Reviewed-by: Nina Schoetterl-Glausch --- hw/s390x/sclpcpi.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c index ec711e2291..12664b0a57 100644 --- a/hw/s390x/sclpcpi.c +++ b/hw/s390x/sclpcpi.c @@ -18,6 +18,7 @@ #include "qemu/timer.h" #include "hw/s390x/event-facility.h" #include "hw/s390x/ebcdic.h" +#include "migration/vmstate.h" =20 typedef struct Data { uint8_t id_format; @@ -93,12 +94,26 @@ static char *get_sysplex_name(Object *obj, Error **errp) return g_strndup((char *) e->sysplex_name, sizeof(e->sysplex_name)); } =20 +static const VMStateDescription vmstate_sclpcpi =3D { + .name =3D "s390_control_program_id", + .version_id =3D 0, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT8_ARRAY(system_type, SCLPEventCPI, 8), + VMSTATE_UINT8_ARRAY(system_name, SCLPEventCPI, 8), + VMSTATE_UINT64(system_level, SCLPEventCPI), + VMSTATE_UINT8_ARRAY(sysplex_name, SCLPEventCPI, 8), + VMSTATE_UINT64(timestamp, SCLPEventCPI), + VMSTATE_END_OF_LIST() + } +}; + static void cpi_class_init(ObjectClass *klass, const void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); SCLPEventClass *k =3D SCLP_EVENT_CLASS(klass); =20 dc->user_creatable =3D false; + dc->vmsd =3D &vmstate_sclpcpi; =20 k->can_handle_event =3D can_handle_event; k->get_send_mask =3D send_mask; --=20 2.49.0