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: 653200 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2526307wrr; Mon, 13 Feb 2023 09:03:28 -0800 (PST) X-Google-Smtp-Source: AK7set85F1GqH79BsyfcjCX2VqnKO8mJwZDEeZs3Xl5e3vk7k+OtJkChGgibGOrLyUjXRmkOjCxN X-Received: by 2002:a05:622a:1753:b0:3b6:43ae:d5a3 with SMTP id l19-20020a05622a175300b003b643aed5a3mr43664153qtk.26.1676307808497; Mon, 13 Feb 2023 09:03:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307808; cv=none; d=google.com; s=arc-20160816; b=FPeij61zawbqmOE65O9C2IRTWm/0y0rcfgz+PRS0U/Q3p6EWDRfXvJ4N9GRtSZXcVh CblAYD3xFXA8ekpcAb7P7zoVLYkPf84R3Ey/VrGkn5xkBb8DRTHo6HPj11z3zCykL+gG k0q8StZulqO4K5s3VD/Wr0EUZFkYIQDszqs5dZRNVE9Ab80rL8s/NVwvLs/EGnXBZdtf Jt0Ww/8gG3cH6pfPszlucvoJ6EBImk5JMeYB6smoMsV/1dKsP5QSqjR/ErHjtYYB/eIx lRYoLUOLVtqa+tiy76CPeassDyWIBtNMsXhvIjfXf5JHA0pjnhXN+U/nMCuL7MI0tmL3 1eFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=nyLbjeolJt6ZW4phcgy63TammsHqUZyvpx842CmDisc=; b=ifg1S4pfxosHHnlWR62O4vSUmuLuRwSXpio+0cdgeDU/DMioLZaaMDmuUP01hPMF12 C2znpWYPE6qqFk1xUo6bqskAS2fJy5GG862vjlySWeKZA0fAHdRzmyBW9EUNKYsLE4Iw D6pcMaucPMyOXFWmiz4OcU5gYCpHS8xSsZUrM2DtosEkLQpUBUTXVuXSBCI3S/uMTTMZ erNVijlxjko0Bmt1y4z1tUyins+tLOM+r0q15hNtd+Z0k1omsN4DfsOxxN+lnSeW5+1V 7OoSrTxL+Q3OIhNKNlVivCWvQNnhN1+ciVkJFZa/JR4A1aKuJ4lYw2Fd7S5QhurB28BD zzeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QWZY9Cry; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a14-20020ac8434e000000b003b9b4d9091asi8965648qtn.531.2023.02.13.09.03.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:03:28 -0800 (PST) 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=QWZY9Cry; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 653206 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2527666wrr; Mon, 13 Feb 2023 09:05:19 -0800 (PST) X-Google-Smtp-Source: AK7set/ItCZxzg1zWGm0JZkUiPrv3lhh4+LrNhkLOdtpaMq2hTKRxKxky9HKfDfB/KwtS75mnWk+ X-Received: by 2002:ac8:4989:0:b0:3b9:bc8c:c200 with SMTP id f9-20020ac84989000000b003b9bc8cc200mr22759670qtq.11.1676307918870; Mon, 13 Feb 2023 09:05:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307918; cv=none; d=google.com; s=arc-20160816; b=Cy0Ivt5C8xfSvEJUGi6R+uRshmWFpBV9zaZ3VBDuJ4zV3c3u81JbRaWvqd4XWV/bit Sm5yQ4NWmqo7VDO49hKZtzZs+221HRJiTiSJjUOnHbcrpUZCEE7WrCoH58IrJ9/r79Zt RVAOLGiAaNcVgV4xVkLCYCXbUStYQgQguh3PMqrFRBWFiZ04Jaty1K9iexg4lBTs+UdR b3WFcm8JJJ0iQSJZ54jqUaFL14bxv21CCKj4zjeWcRlih5e76yVS8WNPsg/Sl/1UQR9r GHI9zCIO4fz/lIqJUbilhNyLjFe5PFUQBdhwEMQI5Swd/ybDK20aIFkF7RQp4wvKsg78 /kPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=mzRrE5rjXmOyZOi/ZezrjP3KF0ocZr49iG/FcJhUhr8=; b=Yvueu9qPQRo9h3wsZJm1G8Ok6IYZZ9dbPX31af3R6uaKGk7SFaxkCAMg+1q7396Fi6 n7a4gEgtisWJxhAkTLAbino374sN6ZqwblcoEH7qTR64ffp0p46d/bkD8DUjFQZ4Sw6b 0IBjQnHp3fhuhuv7LqJr5ov9PQooqvUfwNVWLDb/xG8g4L95Ae385x538o4Qp82RFOi7 oxm64c8Uu70CFjdQcLY3Ej5H8+fAQfHegEiOkrBOUCOd/n+F9EQykbpbNzCa6VwAVF/+ Zi4iH3432ICVx+B3I1uCCEX0oghq43M+cjBz2qcUUNPlRgCfUtST0WILSyjBXM7Ts8+4 na2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ff77CIRv; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d11-20020ac85d8b000000b003b9a5ba03c0si9570634qtx.65.2023.02.13.09.05.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:05:18 -0800 (PST) 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=ff77CIRv; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 653205 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2527586wrr; Mon, 13 Feb 2023 09:05:12 -0800 (PST) X-Google-Smtp-Source: AK7set9vaaEa56q5QFYcCRDWzGlucrhRcCfHwow7u5ZawA0+dzguHA1S4PINVuEvuNd2nHTe3V3u X-Received: by 2002:a05:6214:202d:b0:56e:a301:70f4 with SMTP id 13-20020a056214202d00b0056ea30170f4mr15966533qvf.48.1676307911613; Mon, 13 Feb 2023 09:05:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307911; cv=none; d=google.com; s=arc-20160816; b=U61piV9oL9aW37qtz5MiDtEGNrFxOgP6PlMoazdn/7e5zoWVoNDpSr2HkgSVsTnnys qz6eOMp31+MzF4qdvBhR7fxLVdIKgkm6LG7WGYx5pPnMKa/uAbNXVyJeVD4r3l+ELdDU bJf09QyInDPEtTWxLBiHYL55cKgvJBEEsgyucbocrKHdU8Eq8ZRjlrFQ/GUhsTgIIhY9 Fv86QTbigBg2gOD3goomp1NigrJOFXYcZU+xJCTdZl8OGs8w7niHEgFcvt9XrSXnH8KP mZHH2+GEZ5G3ri24wh4cAN3d+aWZYPdN0A/ibivyW+UyD+MVmSiMZ3uSqvtiLRkEBhq2 NINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=mQaGN2ZmTjyrZEnHrp959iGgJeokZoc0TpE2rWnYg0s=; b=xoJP2irSZsKY9fD9bCZTBBVFWy2UubtfXOQpEusHnL8B9tXMplzZ5U8KyyyRjZ1Tcy qYb/XoK3QgPsgro7pOa58xE7UWJWMFH82RilvwBhE6wcFKvPJReRGpHComCWK5uLNGvy f65aj3LwgcZ8H0wSU5OfvrDY5ykgcMcznw2hk4QZsMH4APkLSnuf+PrzlI+blmA4B7FG Z2Ol7D7H/dXqXi2s2FVufcjNzzo4aoYLjquB+k7THvU/XYlTJg9q+NcQM7i4ru4t/RoY LODaaedk2GNeMQk+b4LoudzAHj5/T5828SLvWOuMq6LqrvVcefe4it/a9GE0+oGZRCB/ zLXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UP3p++YP; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u4-20020a0cf1c4000000b0056ea94f2164si3738777qvl.30.2023.02.13.09.05.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:05:11 -0800 (PST) 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=UP3p++YP; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 653202 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2526309wrr; Mon, 13 Feb 2023 09:03:28 -0800 (PST) X-Google-Smtp-Source: AK7set8c6dTSQrkzMCv69PmycznYvTVSZGsLh8KjzIezEYMxPQmCEfz8td5/ARpYVlXTdVJSWnJ7 X-Received: by 2002:a05:6214:508c:b0:569:abb6:f09 with SMTP id kk12-20020a056214508c00b00569abb60f09mr43702576qvb.40.1676307808505; Mon, 13 Feb 2023 09:03:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307808; cv=none; d=google.com; s=arc-20160816; b=K26z7bc/sWpJL3kDKQDjXPhjRDLSUlgCfYwZ14683DQlPpU2K48kBiFyeoNKlDyp+0 e3l6gQ5TGG3xKGxC3zaDBgbdBfbLW8iC7CpysHGvjakXapMzgJl/ID8SBGL03Cf2nTcq 9WgyQpK3rX4NQhojlakpnKGLUkwcz5ir9g7Eu64kE2yJ1kwdHiA5yifz7T0St6DB22S+ 3RptscxlHvGtEOnFuCQoepvYLSq/WDrmCMAM+gbGKYcnx8gW3m3B7aNQK10KPrwhI/wH 3jCb41Ko/65U3S7jmzu1GqMkP50u4ueDO72k/Kgxq9XqdV/tSeM0QAmOZOsLOAszo28V DaBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=NE9DmmuW1MdiTRa7txeyB+Xb80CvmASbM5xSHtXSVRY=; b=LN4Tw5LzEu4RCi43ZHcxmU7ylZW/ntVOMOTlIW9WI03eBFq+WQOhuOxDMdMjZl5D1b nKs/zctd3azxn53lo2x0FfiO0btdzAxltdX3bVCOyunWTfvR0Dl56Wi0wbIkNabkvkYT jzr1iFzecMc0EIszQRiCfMkzOZi0xmjXSyuXDJnf31EVv6ZrJDfYTL4qyqhMlxcZEIuJ jFwqOv510jYP+hbi25YiaiTJAHRDQO1DGUcQXUcM0yAaW96AR+BvZtah/AGFDJdKcG3n sKVuzZwC8bn5sNRARqBBlzK5NfRhox+X7lCHayULGpcM/JYTXuUGLInhImU81x7eGiDc FlDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pgTLrzb1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bi30-20020a05620a319e00b0072431b662d9si10401821qkb.31.2023.02.13.09.03.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:03:28 -0800 (PST) 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=pgTLrzb1; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 653204 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2527293wrr; Mon, 13 Feb 2023 09:04:45 -0800 (PST) X-Google-Smtp-Source: AK7set/lCNCqVAItNPYmdK6fvUXSpuQgZ9rf1k+458/vbfgUboBrKjnNocYp6BspMyoz8wFDGzzt X-Received: by 2002:a05:651c:103a:b0:293:4ffa:a697 with SMTP id w26-20020a05651c103a00b002934ffaa697mr794153ljm.16.1676307885123; Mon, 13 Feb 2023 09:04:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307885; cv=none; d=google.com; s=arc-20160816; b=TyehRiTiXDnspm9wn7V9cqUl1hlYUXcsE21NJbkUCLq664rxUOSrWlNcOb8Dpxo0jY xzC4NpzZEHCU5/pOR1IWj8rG6AqQig15/uZ9xAZfLKJ37Oi52zX4kujVkPwFMC4B98+6 VQ0Q4pOvrCD5WXVQYgLgUYYramNIjewtRp8j+sc1LfsDI6iivnOUoNum3z9KEJpbaMwi Y1Om9zV1h6MnFBOWiEBGeatkO28qygR4WvjgjdZ2fFKs8bpBxqxDUNrbVNM+iifP73x9 OQzz4wDoNmHJTVgus9RKGXKiPExXIPnQqLz6NIMtB/t5mY2YY0jnewNPhxDk5j42u3Tg Ts+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=mhQReXuPG7LsDYOszlFQ0XTN6zBYBgflQ/Ni/g9nugY=; b=MbkUuPknW+5PpGgDy2qfa4bjdPyYG6J3bkA+IYohQTd87AhgZJNxR+SYcVeMUoqUdb crWvBv9nHehNbNWKWg+U0WZnk4iZLUNUwb1H2ejoD1ytql9QJE1OZx13deU5z1yLzI+T ByHpSNFBn/Tc8x065DNt5vLn7FvRBhkWva/3oSzXH1HqAT6Js1ODY3Qy4RhgKyIhw5UV 3I+j1kgsGQbbModW0xhUUK6tD1GCBdVQtWQra6UmcwnMRLEdtOfB/9hccw71EslfpY2x Uv/kgvuJ3yfUhBycfy+tEguaD9dP/Js/ModNhFUAaXsZu7hZtEOVOg75yOtdNvhQctlD StXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PVQlHk5C; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v18-20020a2e7a12000000b0028fd04829fdsi5182327ljc.372.2023.02.13.09.04.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:04:45 -0800 (PST) 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=PVQlHk5C; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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: 653203 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2526777wrr; Mon, 13 Feb 2023 09:04:06 -0800 (PST) X-Google-Smtp-Source: AK7set/RupPi+oos6WSF3//GC8k327ig4utlyPsUska/ZI1CIpBFOI9uog2UjyWTKZ/3VloZscLg X-Received: by 2002:a05:622a:5ca:b0:3b9:b70f:b6da with SMTP id d10-20020a05622a05ca00b003b9b70fb6damr42563730qtb.34.1676307846505; Mon, 13 Feb 2023 09:04:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676307846; cv=none; d=google.com; s=arc-20160816; b=XvUmgj83ILY58iXxjtmPztqTEIEZHJ7b4RRfCpVYpN1mieUPM8Oi0YK1p5VB5Bgy6w SgTeK9oqKr1ReS5wCKf6bmkdO+9ss3q7NLFZHMeTMYFplAKLkJXotAW4OwS+7Ox2j4JN hEAd7kVEZp/jtvqp5oTVXDzcAsCHXeo4s4RPZQu0S2TIcwB8l8eAlErVtXNp2eRFP1m9 0zIVsCO6/0cPrv09ky8P3iWEADDQJ8MGcwsnethDntp382M9c/cs4qg383dq402tFhcA G+h9T1uPBaNwSKJ9aV8g01QNRntZPEIxTxm0z1M0ToDRLbJe4CSlo1hUGRISZFtq6cHZ BQkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=cYVAD9s/RzYqbHnSs00cSURUQXlKLoiuleQHl0wgJpY=; b=UJuctg2oIC4ulReZh+K0X70Rhyzs1Q2sHs7d921nLBAhmpknQfP507PN1HJbdd5D0r Fhw0Tuu1B84m5Qb18qys7xB1sSTymrPBWdTabu7Q/MPITQjWvtPTN11X8eYoAa3fFlyY f3vO6WcRDhY1V2ORccScB1An/IF5aaIM4WmQVtaFlL85D6/oAFR/tTKGz/YTQfhayPGZ jMgpPNsdLxvIPLoWXMzUYMxI5Kumejf5dPmAd8Oig3KeWAgnSc0UqXY1CJVlJEZ6/aC3 HV7Mf+BNx+Yn+LSPpbwvs7t+46sT5UCqTjMbcXnI53pnf7omaOpA7ijz7KXJotpJUojg IInA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=delsgwcb; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t21-20020ac85895000000b003b9dddcbe8dsi9903019qta.26.2023.02.13.09.04.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 09:04:06 -0800 (PST) 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=delsgwcb; 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 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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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;