From patchwork Mon Mar 10 15:14:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 872210 Delivered-To: patch@linaro.org Received: by 2002:a5d:64ce:0:b0:38f:210b:807b with SMTP id f14csp1044506wri; Mon, 10 Mar 2025 08:17:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWJ5Z2kSvLqTpcyfovBRAIFeZBpCcCWDa5qTiHHc46f3dFVtDsDswMyvMihcHVOIOUXNJ055w==@linaro.org X-Google-Smtp-Source: AGHT+IGZmJdiN7tca5G1r9ntkJDgru7REx1rkU/bbrKMAYIWx73WUWSR8ew9mW4JZtRAQ6gGAT9Y X-Received: by 2002:a05:622a:348:b0:475:b03:a054 with SMTP id d75a77b69052e-476109cdc92mr159126401cf.25.1741619851822; Mon, 10 Mar 2025 08:17:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741619851; cv=none; d=google.com; s=arc-20240605; b=C/rTUOeBUAlgPJhpzJ3GnvU7gfVb3PoH4t5pFzGBUFaJgzfs1sJvdzsBO5k6U688sg a7Svd7duy+v/vEMBatIAeT+jL9UR61GBubwPjXajBf2uT7szr+ImhbI4d0kxe72qZLC4 xEuFF3iXzmd5w9NOMJafIrlm9S298joErzOhjkAEAmmwauq00kpsKtrahQiZSRcGPIqz aPp1ETbsHpcpKllpvnEJ2xo7+GfX4pkL+EvOJHYjUSxMKwElcHpMOoEfDXIHF0qX0q6A DlosIzAKQOJWgrSh/JiZiUWVhIzBlAlgGifQf2e3wB4irIwE8xq8jjYs8nm+5ddT/kPI DSIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IjyeW5Nt8o0UjpeWcNjmceOtbUr0M3LV9xv1HVnRIgs=; fh=FrXspGF9dqFxfqr7h/opREu8X39lKPmpirjz+1d7KSk=; b=IHT0Tp0M+abVNrZd9O3x23fODl4gu7I1r87mPImsnoURZub6qDIOpkAsJAuESTaneM TRl60mq1adyxROClcRM9rvgYPlIO3rZ9I4y7gaU8AgCZR6sk9rAEWXRzZgbZVxqettvY mry/VYL8bsJBJZOlTvdPxrcGWDR98z9nrxqdmYeFS/5NA2l5p16rqFGH86rvUtQHNUHx 2LSosj+LNalOSxXXYYGBDYTLlas1cThU4/JdfdyixE6UIZrOXqmepbakeOdVpcozsoIa Wh0HjHutlaR2q+TtM1dV2rXYnaLO2bSUs/Abo0Q4p2drseigMtHTV/Q8bwn6zyK/bmEQ kVbg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mLZ143dB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4766aea2215si48536431cf.79.2025.03.10.08.17.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Mar 2025 08:17:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mLZ143dB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1treqY-0008MW-43; Mon, 10 Mar 2025 11:15:14 -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 1treqU-000841-A2 for qemu-devel@nongnu.org; Mon, 10 Mar 2025 11:15:10 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1treqQ-000879-6u for qemu-devel@nongnu.org; Mon, 10 Mar 2025 11:15:08 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-390effd3e85so3838778f8f.0 for ; Mon, 10 Mar 2025 08:15:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741619698; x=1742224498; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IjyeW5Nt8o0UjpeWcNjmceOtbUr0M3LV9xv1HVnRIgs=; b=mLZ143dBTnh7gSPOcy1JkJ/9Sb+Rvc+HZWxiJcxg9Dhf3tU+viYaiKCSdfHxzjuMnv X4JN/VyFqwshP0679Q8sklqGOk2otUF/TsajHYKLeqCP+lLdCfEZ5WhfqPfAc5orhfty dndpwkyimf6eo62lIktKJLlZ4WiKjrg81SuyJkXXlEHxJ5bsJlEZQNw1Fi15s5lQqirK aIY4RF4Hinv0rTla/5pDNPCgquvD3kZIkcfqboqW6eUewqKcwx7eoVMOE+JmJnq5k6hT fE+arY4Mflx9mix1XmWpIGPdtTVzVynBvSdN0bB7xVCxI2QgaVC+5592R0MMvNjHyxhe wXfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741619698; x=1742224498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IjyeW5Nt8o0UjpeWcNjmceOtbUr0M3LV9xv1HVnRIgs=; b=OiheI8QD3kzTdf/rWJXCNwh+82hYZW2K2rDid4SeJGz7rPHXFZOMvzZ1YiPU9Od0iu RsgGBEAyV53xvp04TKXOsUqYvn+ZpMtJII1NV8txoMevfClzsJjRl89bE1HzjEiAJuyn H6+1OMyzTxpFEcsAuGPZ2VbZK2o4C0X4F/1r5MKjCxqv+DdE/QtntImego0EG9IM4f9f gskeSLqvRANtR7Dfb+BoGsRX7Uz16Rq9exgaU0IfigKWevLdfrouiTHK3/pxLGD0NJiq /7VMPKfJyQ/09sjs4Mc0SZ8GhIdzQuvi9q2wMiQr3P51eYhq6KzX9b5P474YTGWUg1uf E4ag== X-Gm-Message-State: AOJu0YzAscUeTU6av0wFXD1D+DWHuj5b0UyQOjWgUJVEoG9v26YF4nSc 4QLCnn4017jrVJpvg/JxZfO6EnUW/wxyswiExkFqSupzGqGPcKsQnqyHqbbsNZ/xRoUbZOAq2ZM 6xt8= X-Gm-Gg: ASbGncs7Glw2Lh1ojJAEIbbEb/7Kw+Cf/+b/97Dld0Xeo5C7POc+BPgwKrq1qv9v4jG L/MSj0a6wcJPXhJlGQuNRatjDsgNTylI8Ds2dwSg6FZn3IyB5SM9KgvYP0nEggM1OhOSrxeylgU 14BT1u3U2FyxxVGaDyWgFeskZGcVc5ZGpqpF6WU1pMwVyi0qPgzQfFPzGf4XrGu0cuE+SRQA1ME OTMaYPb/ZEVDk2XoAksjd9qutuYYozOiRaYSkIsi2C5YvdglMo8EgN9ydIAkWQRKGmhGcF4Uh1u 37pKjRc/tJhLhm/wXAbx5ezEW4fyjwiCjS3H1QBKSjkU9wJA1pVk17DYgKTyV23wRK/CS/hnmQq vcNA4U91h37o+m45OGB4= X-Received: by 2002:a5d:5f4e:0:b0:391:fcc:9ee8 with SMTP id ffacd0b85a97d-39132d6bc06mr8314088f8f.23.1741619696600; Mon, 10 Mar 2025 08:14:56 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c103f41sm15004792f8f.85.2025.03.10.08.14.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 10 Mar 2025 08:14:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Richard Henderson , Thomas Huth , David Hildenbrand , Anton Johansson , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Zhao Liu , Christian Borntraeger , Ilya Leoshkevich , Eduardo Habkost , Yanan Wang , Pierrick Bouvier , =?utf-8?q?Alex_Benn=C3=A9e?= , Eric Blake , "Dr. David Alan Gilbert" , Halil Pasic , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Eric Farman Subject: [PATCH v3 3/4] hw/s390x/ccw: Have CCW machine implement a qmp_dump_skeys() callback Date: Mon, 10 Mar 2025 16:14:13 +0100 Message-ID: <20250310151414.11550-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250310151414.11550-1-philmd@linaro.org> References: <20250310151414.11550-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In preparation to make @dump-skeys command generic, extract s390_qmp_dump_skeys() out of qmp_dump_skeys(). Register it as CCW qmp_dump_skeys() callback. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/s390x/storage-keys.h | 1 + hw/s390x/s390-skeys.c | 7 ++++++- hw/s390x/s390-virtio-ccw.c | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h index fb766d4631b..ac303001f57 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -122,6 +122,7 @@ int s390_skeys_set(S390SKeysState *ks, uint64_t start_gfn, S390SKeysState *s390_get_skeys_device(void); +void s390_qmp_dump_skeys(const char *filename, Error **errp); void hmp_dump_skeys(Monitor *mon, const QDict *qdict); void hmp_info_skeys(Monitor *mon, const QDict *qdict); diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 0d3d4f74b4c..fd1123b0f35 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -142,7 +142,7 @@ void hmp_dump_skeys(Monitor *mon, const QDict *qdict) } } -void qmp_dump_skeys(const char *filename, Error **errp) +void s390_qmp_dump_skeys(const char *filename, Error **errp) { S390SKeysState *ss = s390_get_skeys_device(); S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss); @@ -219,6 +219,11 @@ out: fclose(f); } +void qmp_dump_skeys(const char *filename, Error **errp) +{ + s390_qmp_dump_skeys(filename, errp); +} + static bool qemu_s390_skeys_are_enabled(S390SKeysState *ss) { QEMUS390SKeysState *skeys = QEMU_S390_SKEYS(ss); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index a9b3db19f63..104cd1c79eb 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -809,6 +809,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) NMIClass *nc = NMI_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc); + DumpSKeysInterface *dsi = DUMP_SKEYS_INTERFACE_CLASS(oc); s390mc->hpage_1m_allowed = true; s390mc->max_threads = 1; @@ -834,6 +835,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) nc->nmi_monitor_handler = s390_nmi; mc->default_ram_id = "s390.ram"; mc->default_nic = "virtio-net-ccw"; + dsi->qmp_dump_skeys = s390_qmp_dump_skeys; object_class_property_add_bool(oc, "aes-key-wrap", machine_get_aes_key_wrap, @@ -875,6 +877,7 @@ static const TypeInfo ccw_machine_info = { .interfaces = (InterfaceInfo[]) { { TYPE_NMI }, { TYPE_HOTPLUG_HANDLER}, + { TYPE_DUMP_SKEYS_INTERFACE}, { } }, };