From patchwork Mon Feb 13 17:01:40 2023 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: 1741775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=QWZY9Cry; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrJf1Z4Qz23yT for ; Tue, 14 Feb 2023 04:03:30 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcEA-0003mT-54; Mon, 13 Feb 2023 12:02:54 -0500 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 1pRcDa-0002sq-JX for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:22 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDW-0007WZ-IX for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:17 -0500 Received: by mail-wm1-x32c.google.com with SMTP id r18so9152801wmq.5 for ; Mon, 13 Feb 2023 09:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=nyLbjeolJt6ZW4phcgy63TammsHqUZyvpx842CmDisc=; b=QWZY9CryGlVdSgTHbSKoxaymnHl/VL20bVgsjMRsyeRrPD4tWapd+Q+ZUowArWE1io C/SEk2oDUKV00XPiz8spGIz7NfWF/Cbfwqp7OohHcIT3VZ3Hr//J4II+Y5JOEAGN+E9d ZN4ic1Jhx6PLkQ+uk2cvMvTKIGGuMLqTONZPDkJDWBumxS+duku+h3Xtvi3X9f8aJZT+ W7Z9rYkBzIcpFfotGVRSvLIgEuGWqyXFmVulFLLfOOcKGwcuwEMoZC1yw05esN+MJfK3 448F8HaNlaRE5fNT7X0FIkd4SriBeTFQv00zE5eMkW+C4YRU5DkkB4biVFeEL603O0am PfCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=nyLbjeolJt6ZW4phcgy63TammsHqUZyvpx842CmDisc=; b=yK2CaFeZZ/T1CHRy7jL2o0TzoRLDBRgQOTRcw0eA0RqP7i5uP9EzDTq4WsyNrrVme9 dYAvliu92qpDx1TDV9UFeObLrUfTPyTBCF5na9daJpOAh27G3MZeN8KWW3NnsFMojUO5 hW62BnR/r8utVu35YH9bPEGV83z5iUNpPgqBuSg9AeC4DJztTQWHPgniut7xMiIja/Qj y8VtjBzzWyayl6e/t5ePYjLESaTyOPQ77xr2QBEwj9/K+u+y8r0PsxjrASh0NGK14O6A 6Fl0REJ9XKKfGDuN/0/Pub3p8aM2HhhgotZcDq0xTENoitCgSEYJTjw8E4GxGktLh2bH O6+g== X-Gm-Message-State: AO0yUKW7kyGsiJHHq2r0tZPYuUWQPFfHKmxbuyAvE6kTedxgxqBNfvSt rLFwwid8Z2v4EMsKCcNrmlVZDA== X-Google-Smtp-Source: AK7set90CkhHSo3LRsKyc6A6piIY1o8Y6F8Z1bO4UvTahltfRn9lEtVp7/BCbt0V4d+08aaXCfg/Pw== X-Received: by 2002:a05:600c:43d3:b0:3da:1357:4ca2 with SMTP id f19-20020a05600c43d300b003da13574ca2mr21719945wmn.11.1676307714869; Mon, 13 Feb 2023 09:01:54 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id f15-20020adff98f000000b002c5583ab017sm3517148wrr.15.2023.02.13.09.01.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:01:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/6] hw/s390x/event-facility: Replace DO_UPCAST(SCLPEvent) by SCLP_EVENT() Date: Mon, 13 Feb 2023 18:01:40 +0100 Message-Id: <20230213170145.45666-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the SCLP_EVENT() QOM type-checking macro to avoid DO_UPCAST(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Farman --- hw/s390x/event-facility.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index faa51aa4c7..6891e3cd73 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -64,8 +64,7 @@ static bool event_pending(SCLPEventFacility *ef) SCLPEventClass *event_class; QTAILQ_FOREACH(kid, &ef->sbus.qbus.children, sibling) { - DeviceState *qdev = kid->child; - event = DO_UPCAST(SCLPEvent, qdev, qdev); + event = SCLP_EVENT(kid->child); event_class = SCLP_EVENT_GET_CLASS(event); if (event->event_pending && event_class->get_send_mask() & ef->receive_mask) { From patchwork Mon Feb 13 17:01:41 2023 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: 1741782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ff77CIRv; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrLm3G9yz23r9 for ; Tue, 14 Feb 2023 04:05:20 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcE9-0003dj-4n; Mon, 13 Feb 2023 12:02:53 -0500 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 1pRcDZ-0002r8-9Z for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:22 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDW-0007Wz-IO for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:17 -0500 Received: by mail-wm1-x331.google.com with SMTP id f23-20020a05600c491700b003dff4480a17so8600289wmp.1 for ; Mon, 13 Feb 2023 09:02:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=mzRrE5rjXmOyZOi/ZezrjP3KF0ocZr49iG/FcJhUhr8=; b=ff77CIRvBqg0FshGIstdyA9ZCiDc0JAEZXrHVLFnhwTGr+T/EdKTV0cbrFkZ6gJ51z 4iHELRUbGsKzrNckIbac22iCQGelrT1USO6owJ78ClDXKUPMg8fFuNNzWyKBIjCaX3/4 l4QcF44a7WXpsOko0JU3Nn5ffTD7VHyYnmeJJ5oPfaNVrxHcWP+bn5jWVw6mtUy00Q5V Gwhfzy6iiZrjTM7WUghZseaDUVALkeTMdsLxbtyg4rUBWH9QkQoHMSed9V3wim93v50C TqYITizvDNCusyl0Avb5zR8BI9qpxlncmVrTdbPfSYUsxmlJo7DUgXUc2RvB/VoqBB90 7Hpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=mzRrE5rjXmOyZOi/ZezrjP3KF0ocZr49iG/FcJhUhr8=; b=spRkA5N5V8gWQx6R2U7vaf3bbphkeBTUcvL8uF7q9XcV0GDyvYo3l4P+rZ6G+erhrA 1Z171fLwyfW1XAZ4XjyebWj73v2DhFm/u7KLZtl/utDgOo6mCtAeH8OPCDc0tjvHoSC7 9riZGXKaalyeDeMh4sgbHpzavHUBsaqRPftVWvxMh2BPzYc4MG4SMwB/9nf1UGT2I7a9 cDDrhfyFTk7BOPdDLWHhVeDsQZhhbjzsq1KCmBNOi6h2QJTCwRP9LFMtwvrNsGleEwRd bRtSafo1h8Ye/EaroBx6qIuxb56Yz0z8+gjRIsGs+hernHDlyCFr5LUafp2wL4WJ8K9c bTrg== X-Gm-Message-State: AO0yUKVQJtrmUR6H+AULb4MH+lbJXsi+wiI2NV4JSBxypDC3EApy1Wes ecB666VuCPYIU2bFu37jOrfYiQ== X-Google-Smtp-Source: AK7set+S49/ewjjHEQNfmGcUdo3/bm3tdDD82VrztEKuMwJ6r5GBZ2EMLz4TyH1xjiW0/9uHVPp+xg== X-Received: by 2002:a05:600c:44ca:b0:3d9:69fd:7707 with SMTP id f10-20020a05600c44ca00b003d969fd7707mr4800553wmo.2.1676307720161; Mon, 13 Feb 2023 09:02:00 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id bg1-20020a05600c3c8100b003e118684d56sm15599282wmb.45.2023.02.13.09.01.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:01:59 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/6] hw/vfio/ccw: Simplify using DEVICE() macro Date: Mon, 13 Feb 2023 18:01:41 +0100 Message-Id: <20230213170145.45666-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QOM parenthood relationship is: VFIOCCWDevice -> S390CCWDevice -> CcwDevice -> DeviceState We can directly use the QOM DEVICE() macro to get the parent object. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Farman --- hw/vfio/ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 0354737666..503de94ce1 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -618,7 +618,7 @@ static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev, vcdev->vdev.ops = &vfio_ccw_ops; vcdev->vdev.type = VFIO_DEVICE_TYPE_CCW; vcdev->vdev.name = name; - vcdev->vdev.dev = &vcdev->cdev.parent_obj.parent_obj; + vcdev->vdev.dev = DEVICE(vcdev); return; From patchwork Mon Feb 13 17:01:42 2023 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: 1741780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=UP3p++YP; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrLd1Dj0z23r9 for ; Tue, 14 Feb 2023 04:05:13 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcE9-0003jp-SY; Mon, 13 Feb 2023 12:02:53 -0500 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 1pRcDa-0002sr-Ji for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:22 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDW-0007a3-K0 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:18 -0500 Received: by mail-wr1-x429.google.com with SMTP id bk16so12943998wrb.11 for ; Mon, 13 Feb 2023 09:02:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=mQaGN2ZmTjyrZEnHrp959iGgJeokZoc0TpE2rWnYg0s=; b=UP3p++YPab2rM2Cc+kin5Hor4zwzF3icUymHDjxTdhXtAoyjuuH+XZIPZ87rn0hhla OcV5N6RwViYWYNpmDFcUVabF5/HruHG0FKuIxvdBMMOA/DT1SIpDpFoI6g2vQmQI6mRt ZNZUetpYrGZGPFOd1c15IlBXWbbvH1B1SVL8QxqAxY7bFf/eaiKYJBQFJu4E9jLY0itz 6OwnhRWA4wUP9akTUpJ6OQX2PGLtyrtt9/GagKzZogjptXLBCY2/7VqEo7STg8NCjfOx 7BANwleg/1e77bmHFfTjPlL8Ob0mxHOAz+IyzlJWQJZVRsJYBDB0OpObtxgbeXwdKpGp 6MnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=mQaGN2ZmTjyrZEnHrp959iGgJeokZoc0TpE2rWnYg0s=; b=nTI9hvsFtjcTBLV8BNUqc7lQDW7ZQB6mUVcklDU8RL3jJ3zgMJnIo2c/UGruSqpBPk mrGtan1HkBEXSW8QTetUc4Lbv80HjBd6WSoJsnzm6HZRHlaMlyHRk3wOfn+CgUT8RzJ0 37cVEo+qk6WxausbNQ9s1uqsZSce4HmB4uZVGIhRs0LW9oLNJGTa2rdvWULmphsRTL0V w9Z2E1Z3B0zFTtlOFQiUzp97XPn2LOTRmteab1xN6A5L5qtiAA8ChlA+1b7xeeR0leFa /Cu+d/1IGYPrfQko2Hw/7af8sxIxO2cLKIzuqt0sHBeYoCQjkY4WIXHbI+t9s5vdSEus i19A== X-Gm-Message-State: AO0yUKW5LqqnKRGngf+4RFuobKG1JJHNw2HBnxQPO+m7UUbh9lrfoCv/ 0TRxlWXPLTdqzFvdQxaw3o1Ylg== X-Google-Smtp-Source: AK7set/NOjFEbTQDW+gbHIABBFXhQvk4GlWxl3IZ7ATfJFzujOJHXCCNJSawnT2ojixM7dO97SbU4g== X-Received: by 2002:a5d:5005:0:b0:2c5:584b:4f65 with SMTP id e5-20020a5d5005000000b002c5584b4f65mr3300155wrt.32.1676307725463; Mon, 13 Feb 2023 09:02:05 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id j37-20020a05600c1c2500b003daf6e3bc2fsm25153430wms.1.2023.02.13.09.02.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:02:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/6] hw/vfio/ccw: Use intermediate S390CCWDevice variable Date: Mon, 13 Feb 2023 18:01:42 +0100 Message-Id: <20230213170145.45666-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 'cdev' is VFIOCCWDevice's private parent object. Access it using the S390_CCW_DEVICE() QOM macro. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Farman --- hw/vfio/ccw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 503de94ce1..2c20e3c202 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -588,9 +588,10 @@ static void vfio_ccw_put_device(VFIOCCWDevice *vcdev) static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev, Error **errp) { - char *name = g_strdup_printf("%x.%x.%04x", vcdev->cdev.hostid.cssid, - vcdev->cdev.hostid.ssid, - vcdev->cdev.hostid.devid); + S390CCWDevice *cdev = S390_CCW_DEVICE(vcdev); + char *name = g_strdup_printf("%x.%x.%04x", cdev->hostid.cssid, + cdev->hostid.ssid, + cdev->hostid.devid); VFIODevice *vbasedev; QLIST_FOREACH(vbasedev, &group->device_list, next) { @@ -611,7 +612,7 @@ static void vfio_ccw_get_device(VFIOGroup *group, VFIOCCWDevice *vcdev, */ vcdev->vdev.ram_block_discard_allowed = true; - if (vfio_get_device(group, vcdev->cdev.mdevid, &vcdev->vdev, errp)) { + if (vfio_get_device(group, cdev->mdevid, &vcdev->vdev, errp)) { goto out_err; } From patchwork Mon Feb 13 17:01:43 2023 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: 1741776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=pgTLrzb1; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrJf1TJGz23h0 for ; Tue, 14 Feb 2023 04:03:30 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcEF-0004JY-8j; Mon, 13 Feb 2023 12:02:59 -0500 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 1pRcDZ-0002r7-7Y for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:22 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDW-0007aQ-HS for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:16 -0500 Received: by mail-wm1-x32b.google.com with SMTP id n13so9158802wmr.4 for ; Mon, 13 Feb 2023 09:02:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=NE9DmmuW1MdiTRa7txeyB+Xb80CvmASbM5xSHtXSVRY=; b=pgTLrzb1sy7itkIkli8f87RbzMntjJ08tshfJ0JiGa5ogvYzyQdO5nF9pGZQI7a5mx uDLzneNQ+FQ48z/yYg6mZ2Of4VxqHMBdua8I45sbDMfWp+//Ko2Hv/2Q8gnW+Ajt0If1 vCWcbbkrMVS1Pspw6hv138uLG014ks8EDSuNT2kBjkQWf5XJLctV8BAl/NcPpGyqYxw1 lrBRrYrF+YbGsXx8lEiLIyLyFk+7zY1cN03Tj4pkq824QFbPMlgUnxxf/5mrUfUdNr+e y8UkjhBTmxcmy0ItdGzlozvvwU7GOIHw0lBHlpFbGqmf3mspYerV6Yw3TJc+AEwftcUB wcrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=NE9DmmuW1MdiTRa7txeyB+Xb80CvmASbM5xSHtXSVRY=; b=EIbHd29IH/qV3xrWe1yc9TnBw59RcInwTMTlN82FKAngvAcSUCImz3BRGfq2lMdDQf Ynh6tHHT4R6wn8SVfEHCjlut33sbS2dkhIYz+tYou53t1jA7fP21T2hbadqvybEdm10g ysH8TK7pDcwVIgjox6RH0i76ZGlfdXNYyPetyhpXhOcgGOBsO2TQ3/9XLYOsXbVCjAuj EmRn2v52CI/aCsSycI4BfSCpsvRTb5h7NTQjHmce8V6S6l2N/R/3KPYvfkAJsAquaGwJ p6uCMAT4zQKv9nCNwm4evb6HdTGLAXg0ncXdRGWz1BV1GtW2kupcWsR3XHctruBzD9ay /mzw== X-Gm-Message-State: AO0yUKVVCryBSPhgLxJdvc281BpwWMs/QNsZaBmBf1Sb9xIwETr0i0+e PwCCGXmOEXxtebDGuYTApmqxjQ== X-Google-Smtp-Source: AK7set8YjYo0K+92FNLTrG9hqs43fYFwaLgmI03+1PkXCtYC5rcqX//K5zmq6R1D1PVb6XKlAHvNTg== X-Received: by 2002:a05:600c:1714:b0:3df:dc29:d69 with SMTP id c20-20020a05600c171400b003dfdc290d69mr18574939wmn.36.1676307731606; Mon, 13 Feb 2023 09:02:11 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c42c600b003df245cd853sm13646442wme.44.2023.02.13.09.02.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:02:11 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/6] hw/vfio/ccw: Replace DO_UPCAST(S390CCWDevice) by S390_CCW_DEVICE() Date: Mon, 13 Feb 2023 18:01:43 +0100 Message-Id: <20230213170145.45666-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the S390_CCW_DEVICE() QOM type-checking macro to avoid DO_UPCAST(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Farman Reviewed-by: Thomas Huth --- hw/vfio/ccw.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 2c20e3c202..2ea7b4a63c 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -251,8 +251,7 @@ again: static void vfio_ccw_reset(DeviceState *dev) { - CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev); - S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev); + S390CCWDevice *cdev = S390_CCW_DEVICE(dev); VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET); @@ -657,8 +656,7 @@ static VFIOGroup *vfio_ccw_get_group(S390CCWDevice *cdev, Error **errp) static void vfio_ccw_realize(DeviceState *dev, Error **errp) { VFIOGroup *group; - CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev); - S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev); + S390CCWDevice *cdev = S390_CCW_DEVICE(dev); VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); Error *err = NULL; @@ -729,8 +727,7 @@ out_err_propagate: static void vfio_ccw_unrealize(DeviceState *dev) { - CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev); - S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev); + S390CCWDevice *cdev = S390_CCW_DEVICE(dev); VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); VFIOGroup *group = vcdev->vdev.group; From patchwork Mon Feb 13 17:01:44 2023 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: 1741779 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=PVQlHk5C; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrL60VMSz23h0 for ; Tue, 14 Feb 2023 04:04:46 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcEB-00041F-P2; Mon, 13 Feb 2023 12:02:55 -0500 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 1pRcDc-0002t2-17 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:24 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDa-0007aQ-Dg for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:19 -0500 Received: by mail-wm1-x32b.google.com with SMTP id n13so9159020wmr.4 for ; Mon, 13 Feb 2023 09:02:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=mhQReXuPG7LsDYOszlFQ0XTN6zBYBgflQ/Ni/g9nugY=; b=PVQlHk5CCxg2psY8mGo33PLjxMr9uLpq8lymGXIvXO+1rZSGRJ3/fTpYOaiakX7jMW ppVxBYvyyTKJ8DaVmvWJyHCacuVL6ga5cmAdZsU66J7F47pLxUsVyDWAE6pCM+JvGD9v vvevjqzAtD0Rv7jaGWmUYSpbJcXvgAqXzvmvy78SRItij0fjHZv969KefXDCVbWyHqY8 BvAI8kGEpxHrOhB6d2g6Q9C6jmmY+eAWBPwmHB7z2Mle/9HwWTaDIHNPWFq56T/5Rg5C mjYxhF0lEscgTNgw3ZVIuEq1gqdkTDFNLdklrLEZAY71OXmv1ijCKU5l1mhrRWbmmm4r 4TxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=mhQReXuPG7LsDYOszlFQ0XTN6zBYBgflQ/Ni/g9nugY=; b=hvvrioMV5/EeuxMET1LRsU6uPzrY103G17xPnHcuuh7Ot1wxT8TqQ92TLuZiVdjnwg AhJ6NZR+ndFxIXTBgS+d0omQxA0tjCFIePKZgKWSoj+YnBgRv+6vrM7sSePT1s+NPrEw XJFkpXTeoqgPNxPbztyX+jOMEsNuExCKtINQXp9vzJGhWLoKalyA+Zlw5M1ajvcQnwgD oKuLGm3W+ipVNejrOpgiwpjinFVYxrmMRfuwHe/TJfs8YRNYLKd/t4CK+9SSCkIyEUaO SbqOzmVA72+3OytA7+XTxKPbFHgBF25NuASMMr4o1qDtTDuL4njIsEr2cicW7NvKN254 a6fA== X-Gm-Message-State: AO0yUKXpGJ/wJ4qQQOUOVTNm5H9O2LDo7gkSF+4ew+JHLcvMR/sFOQJy wPCVcvNrpsizwF+ywqyyjl4AWQ== X-Google-Smtp-Source: AK7set9xrKRVdKPOfnNSC8oVRNbODsWtkjchYN3ZP2ny0JUhUsAXcQfbuzaTRdXKvPcuLE5wsOvG3g== X-Received: by 2002:a05:600c:755:b0:3dc:443e:4212 with SMTP id j21-20020a05600c075500b003dc443e4212mr19463252wmn.1.1676307737699; Mon, 13 Feb 2023 09:02:17 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id f24-20020a05600c491800b003dc0cb5e3f1sm13592881wmp.46.2023.02.13.09.02.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:02:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 5/6] hw/vfio/ccw: Remove pointless S390CCWDevice variable Date: Mon, 13 Feb 2023 18:01:44 +0100 Message-Id: <20230213170145.45666-6-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QOM parenthood relationship is: VFIOCCWDevice -> S390CCWDevice -> CcwDevice -> DeviceState No need to double-cast, call CCW_DEVICE() on VFIOCCWDevice. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Farman --- hw/vfio/ccw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 2ea7b4a63c..cd66b66742 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -314,8 +314,7 @@ static void vfio_ccw_io_notifier_handler(void *opaque) { VFIOCCWDevice *vcdev = opaque; struct ccw_io_region *region = vcdev->io_region; - S390CCWDevice *cdev = S390_CCW_DEVICE(vcdev); - CcwDevice *ccw_dev = CCW_DEVICE(cdev); + CcwDevice *ccw_dev = CCW_DEVICE(vcdev); SubchDev *sch = ccw_dev->sch; SCHIB *schib = &sch->curr_status; SCSW s; From patchwork Mon Feb 13 17:01:45 2023 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: 1741778 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=delsgwcb; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PFrKN0c72z23h0 for ; Tue, 14 Feb 2023 04:04:08 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRcE9-0003dx-4x; Mon, 13 Feb 2023 12:02:53 -0500 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 1pRcDi-0002y8-0P for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:31 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRcDg-0007cQ-9k for qemu-devel@nongnu.org; Mon, 13 Feb 2023 12:02:25 -0500 Received: by mail-wm1-x336.google.com with SMTP id m20-20020a05600c3b1400b003e1e754657aso3320079wms.2 for ; Mon, 13 Feb 2023 09:02:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=cYVAD9s/RzYqbHnSs00cSURUQXlKLoiuleQHl0wgJpY=; b=delsgwcb3DNIP7kMSRwjO7Tz0LcKjjy/oR6vZJXvGyO/XUZVgVOSvuI/2QT8OfZFWM 1MTJl83QGFZk1hfLivDLxFrMWNhgaf7H1hGnmb/6KGm4wfPxScBREgvXsq6XNX9a6sz8 LG0Fs0f5Vjo2d+QfNWUup0xbJoVagM2lPKfvUHQTo/Q/9+06+L9sG1Gn9X0wM/nRHi5b cecn3KSZNF+1mb7R5cnTn7oIY0Su7cXm+fmZDfVAGWLFUsPDh9J/ReSc7+hMc6bEi0RH D+Uj87aZhDCYU9RkI9URWqzV6UD416nS36jRpupoV6TrJaAuj8Odtjw0HvGt3Cf+fC1C 2enw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=cYVAD9s/RzYqbHnSs00cSURUQXlKLoiuleQHl0wgJpY=; b=0BoSqORudZkbcq0lgj+uEh10UBYSrhcByWfmoI+u89BSmh14UhjpNIWJ35l73VhBYy fSHL/TXEfY7HcbdiP+AoI3PrraapskJN1dhyo6uR5ShIJjfT0lut1OrJviA2uwu3dTvU szGjD6rBZZo/IEJtmbmpTv89uJ/2q7BSqbgPwaq/16gvoULgnZOukCBBdJcnrN5mXstR hx/EtwJv66UjR77xuLH9Ud3RlmVApKHDkCycXk3Sjxif1WZWgx6ndP9VeWK8MWq/j7po +vE+zAbY4nvMWo751QDURhkUUgfQTuD5Yq5fjt22UPk9TzTXV0EhYcxHq+1QVUt4Ucnx hMiA== X-Gm-Message-State: AO0yUKXXdx/EV9IaNgInb5iS8ogRWMhhmwe3hx68om29Q55/d68o46VE LbZ4wb6MDFoXs49udNOY+JrQzw== X-Google-Smtp-Source: AK7set/ZZEsOQhAjOChBrdP68tpDSj1wy4JcXDEnRr0CV5nRW9Jr+cjPJ00mLVfDx00wQOWn5j+8gA== X-Received: by 2002:a05:600c:a695:b0:3da:1f6a:7b36 with SMTP id ip21-20020a05600ca69500b003da1f6a7b36mr23731084wmb.0.1676307743071; Mon, 13 Feb 2023 09:02:23 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id z4-20020a05600c220400b003dfe8c4c497sm17682712wml.39.2023.02.13.09.02.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 09:02:22 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Eric Farman , qemu-devel@nongnu.org Cc: Richard Henderson , qemu-s390x@nongnu.org, Alex Williamson , David Hildenbrand , Thomas Huth , Matthew Rosato , Christian Borntraeger , Halil Pasic , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 6/6] hw/vfio/ccw: Replace DO_UPCAST(VFIOCCWDevice) by VFIO_CCW() Date: Mon, 13 Feb 2023 18:01:45 +0100 Message-Id: <20230213170145.45666-7-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213170145.45666-1-philmd@linaro.org> References: <20230213170145.45666-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.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=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the VFIO_CCW() QOM type-checking macro to avoid DO_UPCAST(). Reviewed-by: Eric Farman Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/ccw.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index cd66b66742..1e2fce83b0 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -76,8 +76,7 @@ struct VFIODeviceOps vfio_ccw_ops = { static IOInstEnding vfio_ccw_handle_request(SubchDev *sch) { - S390CCWDevice *cdev = sch->driver_data; - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(sch->driver_data); struct ccw_io_region *region = vcdev->io_region; int ret; @@ -125,8 +124,7 @@ again: static IOInstEnding vfio_ccw_handle_store(SubchDev *sch) { - S390CCWDevice *cdev = sch->driver_data; - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(sch->driver_data); SCHIB *schib = &sch->curr_status; struct ccw_schib_region *region = vcdev->schib_region; SCHIB *s; @@ -170,8 +168,7 @@ static IOInstEnding vfio_ccw_handle_store(SubchDev *sch) static int vfio_ccw_handle_clear(SubchDev *sch) { - S390CCWDevice *cdev = sch->driver_data; - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(sch->driver_data); struct ccw_cmd_region *region = vcdev->async_cmd_region; int ret; @@ -210,8 +207,7 @@ again: static int vfio_ccw_handle_halt(SubchDev *sch) { - S390CCWDevice *cdev = sch->driver_data; - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(sch->driver_data); struct ccw_cmd_region *region = vcdev->async_cmd_region; int ret; @@ -251,8 +247,7 @@ again: static void vfio_ccw_reset(DeviceState *dev) { - S390CCWDevice *cdev = S390_CCW_DEVICE(dev); - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(dev); ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET); } @@ -656,7 +651,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) { VFIOGroup *group; S390CCWDevice *cdev = S390_CCW_DEVICE(dev); - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(cdev); S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); Error *err = NULL; @@ -727,7 +722,7 @@ out_err_propagate: static void vfio_ccw_unrealize(DeviceState *dev) { S390CCWDevice *cdev = S390_CCW_DEVICE(dev); - VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev); + VFIOCCWDevice *vcdev = VFIO_CCW(cdev); S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); VFIOGroup *group = vcdev->vdev.group;