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; }