From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1977C3600C for ; Thu, 3 Apr 2025 14:35:20 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0LeI-0006Nh-C4; Thu, 03 Apr 2025 10:34:30 -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 1u0Ldw-0006MC-2u; Thu, 03 Apr 2025 10:34:11 -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 1u0Lds-0008I4-Cq; Thu, 03 Apr 2025 10:34:06 -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 533AV0MU023809; Thu, 3 Apr 2025 14:34:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=pp1; bh=MRaqqycMRXK/iiAZKtXBuqN+sESx pgpBLhDh0TVcy1s=; b=MTi3e9eJUqZewaC066bomoa8YYw8WLbv/pLn+wfyfvFY CH577u0wHLs9nJ9zlxK7xNjRLXwycVUXpyoIheu46+BGLukYDjD/MfISoT3k+SWP /gy8WfaxnaIWDLwAtUmPkPgpAUUHY3w1iZrpAynwGWYtA3ckabysz+LtTny7xf8F r88UO91FHvT/Zl2pX1zb+wT4LJJQNLy5RBbs6CWml6EHh0tH1r4ncoDYqLywbJQB bPyhGfipT0hoTqraZxHiF6ccToX8W7AMyOD/2LeUXeYted207S4Gbft+KuwmZiJ1 mgVFxnbaUvYVIV9+h6NtWJ5GQQf/TbeKVj5iJjDyZw== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45scdr476k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Apr 2025 14:34:02 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 533BVeOR005431; Thu, 3 Apr 2025 14:34:01 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 45pww2mxbx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 03 Apr 2025 14:34:01 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 533EXxii31982156 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 3 Apr 2025 14:33:59 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7E5EE58064; Thu, 3 Apr 2025 14:33:59 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 367575805A; Thu, 3 Apr 2025 14:33:59 +0000 (GMT) Received: from ltc.linux.ibm.com (unknown [9.5.196.140]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 3 Apr 2025 14:33:59 +0000 (GMT) MIME-Version: 1.0 Date: Thu, 03 Apr 2025 16:33:59 +0200 From: Shalini Chellathurai Saroja To: Nina Schoetterl-Glausch , Thomas Huth Cc: qemu-s390x mailing list , Daniel Berrange , qemu-devel mailing list , Hendrik Brueckner Subject: Re: [PATCH v3 2/4] hw/s390x: add Control-Program Identification to QOM Message-ID: X-Sender: shalini@linux.ibm.com Organization: IBM Deutschland Research & Development GmbH Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: P8sQCKootVQbu3cFqeam_-tR_-MpKRcY X-Proofpoint-GUID: P8sQCKootVQbu3cFqeam_-tR_-MpKRcY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-03_06,2025-04-02_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 clxscore=1015 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 mlxlogscore=999 lowpriorityscore=0 mlxscore=0 impostorscore=0 malwarescore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504030067 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 2025-04-01 15:55, Nina Schoetterl-Glausch wrote: > On Mon, 2025-03-31 at 16:00 +0200, Shalini Chellathurai Saroja wrote: >> Add Control-Program Identification data to the QEMU Object >> Model (QOM), along with the timestamp in which the data was received. >> >> Example: >> virsh # qemu-monitor-command vm --pretty '{ >> "execute": "qom-get", >> "arguments": { >> "path": "/machine/sclp/s390-sclp-event-facility/sclpcpi", >> "property": "control-program-id" }}' >> { >> "return": { >> "timestamp": 1742390410685762000, >> "system-level": 74872343805430528, >> "sysplex-name": "PLEX ", >> "system-name": "TESTVM ", >> "system-type": "LINUX " >> }, >> "id": "libvirt-15" >> } >> >> Signed-off-by: Shalini Chellathurai Saroja >> --- >> hw/s390x/sclpcpi.c | 38 ++++++++++++++++++++ >> include/hw/s390x/event-facility.h | 9 +++++ >> qapi/machine.json | 58 >> +++++++++++++++++++++++++++++++ >> 3 files changed, 105 insertions(+) >> >> diff --git a/hw/s390x/sclpcpi.c b/hw/s390x/sclpcpi.c >> index 7ace5dd64e..969c15e43d 100644 >> --- a/hw/s390x/sclpcpi.c >> +++ b/hw/s390x/sclpcpi.c >> @@ -57,8 +57,11 @@ >> */ >> >> #include "qemu/osdep.h" >> +#include "qemu/timer.h" >> #include "hw/s390x/sclp.h" >> #include "hw/s390x/event-facility.h" >> +#include "hw/s390x/ebcdic.h" >> +#include "qapi/qapi-visit-machine.h" >> >> typedef struct Data { >> uint8_t id_format; >> @@ -99,10 +102,37 @@ static int write_event_data(SCLPEvent *event, >> EventBufferHeader *evt_buf_hdr) >> ControlProgramIdMsg *cpim = container_of(evt_buf_hdr, >> ControlProgramIdMsg, >> ebh); >> >> + ascii_put(event->cpi.system_type, (char *)cpim->data.system_type, >> 8); >> + ascii_put(event->cpi.system_name, (char *)cpim->data.system_name, >> 8); >> + ascii_put(event->cpi.sysplex_name, (char >> *)cpim->data.sysplex_name, 8); >> + event->cpi.system_level = ldq_be_p(&cpim->data.system_level); >> + event->cpi.timestamp = qemu_clock_get_ns(QEMU_CLOCK_HOST); >> + >> cpim->ebh.flags = SCLP_EVENT_BUFFER_ACCEPTED; >> return SCLP_RC_NORMAL_COMPLETION; >> } >> >> +static void get_control_program_id(Object *obj, Visitor *v, >> + const char *name, void *opaque, >> + Error **errp) >> +{ >> + SCLPEvent *event = (SCLPEvent *)(obj); > > Do a checked cast with SCLP_EVENT(obj). Hello Nina, ok, thank you. > >> + S390ControlProgramId *cpi; >> + >> + cpi = &(S390ControlProgramId){ >> + .system_type = g_strndup((char *) event->cpi.system_type, >> + sizeof(event->cpi.system_type)), >> + .system_name = g_strndup((char *) event->cpi.system_name, >> + sizeof(event->cpi.system_name)), >> + .system_level = event->cpi.system_level, >> + .sysplex_name = g_strndup((char *) event->cpi.sysplex_name, >> + sizeof(event->cpi.sysplex_name)), >> + .timestamp = event->cpi.timestamp >> + }; >> + >> + visit_type_S390ControlProgramId(v, name, &cpi, errp); >> +} >> + >> static void cpi_class_init(ObjectClass *klass, void *data) >> { >> DeviceClass *dc = DEVICE_CLASS(klass); >> @@ -114,6 +144,14 @@ static void cpi_class_init(ObjectClass *klass, >> void *data) >> k->get_send_mask = send_mask; >> k->get_receive_mask = receive_mask; >> k->write_event_data = write_event_data; >> + >> + object_class_property_add(klass, "control-program-id", >> + "S390ControlProgramId", >> + get_control_program_id, >> + NULL, NULL, NULL); >> + object_class_property_set_description(klass, >> "control-program-id", >> + "Control-program identifiers provide data about the guest " >> + "operating system"); >> } >> >> static const TypeInfo sclp_cpi_info = { >> diff --git a/include/hw/s390x/event-facility.h >> b/include/hw/s390x/event-facility.h >> index f445d2f9f5..39e589ed44 100644 >> --- a/include/hw/s390x/event-facility.h >> +++ b/include/hw/s390x/event-facility.h >> @@ -169,10 +169,19 @@ typedef struct ReadEventData { >> }; >> } QEMU_PACKED ReadEventData; >> >> +typedef struct ControlProgramId { >> + uint8_t system_type[8]; >> + uint8_t system_name[8]; >> + uint64_t system_level; >> + uint8_t sysplex_name[8]; >> + uint64_t timestamp; >> +} QEMU_PACKED ControlProgramId; >> + >> struct SCLPEvent { >> DeviceState qdev; >> bool event_pending; >> char *name; >> + ControlProgramId cpi; > > I don't think this should go into SCLPEvent. > Rather SCLPEventFacility or SCLPDevice. Otherwise all events, > so also quiesce and cpu_hotplug have a cpi field. > ok, that is correct. I gave it a try by moving ControlProgramId to SCLPDevice. With this, the migration data is stored in dc->vmsd of TYPE_SCLP as shown below. diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 5945c9b1d8..4d6d5bb857 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -424,6 +424,29 @@ static void sclp_init(Object *obj) sclp_memory_init(sclp); } +static const VMStateDescription vmstate_control_program_id = { + .name = "s390_control_program_id", + .version_id = 0, + .fields = (const VMStateField[]) { + VMSTATE_UINT8_ARRAY(system_type, ControlProgramId, 8), + VMSTATE_UINT8_ARRAY(system_name, ControlProgramId, 8), + VMSTATE_UINT64(system_level, ControlProgramId), + VMSTATE_UINT8_ARRAY(sysplex_name, ControlProgramId, 8), + VMSTATE_UINT64(timestamp, ControlProgramId), + VMSTATE_END_OF_LIST() + } +}; + +static const VMStateDescription vmstate_sclpcpi = { + .name = "s390_sclpcpi", + .version_id = 0, + .fields = (const VMStateField[]) { + VMSTATE_STRUCT(cpi, SCLPDevice, 0, vmstate_control_program_id, + ControlProgramId), + VMSTATE_END_OF_LIST() + } +}; + static void sclp_class_init(ObjectClass *oc, void *data) { SCLPDeviceClass *sc = SCLP_CLASS(oc); @@ -438,6 +461,7 @@ static void sclp_class_init(ObjectClass *oc, void *data) * which is a non-pluggable sysbus device */ dc->user_creatable = false; + dc->vmsd = &vmstate_sclpcpi; sc->read_SCP_info = read_SCP_info; sc->read_cpu_info = sclp_read_cpu_info; @Thomas Huth: Is this ok?, thank you. >> }; > > [...] -- Mit freundlichen Grüßen / Kind regards Shalini Chellathurai Saroja Software Developer Linux on IBM Z & KVM Development IBM Deutschland Research & Development GmbH Dept 1419, Schoenaicher Str. 220, 71032 Boeblingen Vorsitzender des Aufsichtsrats: Wolfgang Wendt Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294