From patchwork Mon Feb 27 11:35:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 656948 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2299566wrb; Mon, 27 Feb 2023 03:38:00 -0800 (PST) X-Google-Smtp-Source: AK7set+UkzVFQNJJ4VAl+uxI4w6kzg3K4GOaXB0ZetbjLvhUGOxre336E0tYhhPk7WPnyL050kHR X-Received: by 2002:ad4:5946:0:b0:53c:4375:22f4 with SMTP id eo6-20020ad45946000000b0053c437522f4mr39872930qvb.26.1677497880228; Mon, 27 Feb 2023 03:38:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677497880; cv=none; d=google.com; s=arc-20160816; b=V55h9ZEHjs/lPm6p6C5ndQkHGMEFzdVFda+3CxHgaLepmm2vI6f5qb3nPRYcduLEcM m4Ah58P4vx8PwNAFigKn3xcQj1igBMG4/Lej5cZKxLcd4KyONir0Ka1L0GOPDDNfPxXy Ho5W2q275ZdJcQBgnN1VZQcI1GFBtox7OB1GJJEQHgTGYz1G87p6Vwm34jnqem88W4ZD kNmsREfroVA6deNeg73UtBgQ4FWvxjCVl38gVTQd5z8kEuynkRoNpmduXt36ttica3UP /KrOQevnWx1eoDRJwfsBNoMqjpC599c12yB+MiEtPRI2zTLsCFe1if2ubM70rod8wpcR rPhA== 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=glytSs2pWzm45dgiOYImbDeuuZoq6m1kxVGdLQjZoqk=; b=msVYuOh/uVXy1Xz52o7aadk0cw4/fNp54mhC+a7aZ/QXCtpjDJIX25/oLfep1l2eDE tpPCaTx9zwSTK6pJXnnXkT1zt7t0/biA6QHn6HDT0oqAU+8Sq+ZYqUk0zYe+xSCIbLXG XVtwzdoQNfF6V/I54WQWdDGpmJnfjD9WJjkCIjlbo+nGm9aG4hDcZQHO4BJTSVRKV4lW 9jprYJFX9DImmRKKbNk0zkQXVifjF33iF8IH7ujTkpfnpG27CH7U1emIpcdzth8GAOhy UjBPTdtFR8uX+GgLr5y+eiB2Bok0Uo2JgWlnDNNw8/M+YNqxv8nASP4NVAHxQlIBcET9 GlhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SLpjYVLU; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i3-20020a0cf483000000b0057115385fd7si6204447qvm.477.2023.02.27.03.38.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 03:38:00 -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=@redhat.com header.s=mimecast20190719 header.b=SLpjYVLU; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWbo9-0005UI-2l; Mon, 27 Feb 2023 06:36:41 -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 1pWbo3-0005Ps-GV for qemu-devel@nongnu.org; Mon, 27 Feb 2023 06:36:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWbo1-0005eb-7z for qemu-devel@nongnu.org; Mon, 27 Feb 2023 06:36:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677497792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=glytSs2pWzm45dgiOYImbDeuuZoq6m1kxVGdLQjZoqk=; b=SLpjYVLUp63Q2BjrbCk0jwx4at3TvTwJIXE4/xpkb3hWl8Hnh2G/+RerYvsI5t6XFDQh04 Lm/SMaA2ijorcplMt50DFOAWMtSH+LipNkBW1jRHEprtTLQTRy31wnEyLkZ5gdXr97IIIB 0yaaLUbuhp/pSCqcdbY2qR0VX63PC4U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-417-chJp-IYOOja_ZqGXsNoJsw-1; Mon, 27 Feb 2023 06:36:31 -0500 X-MC-Unique: chJp-IYOOja_ZqGXsNoJsw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DF7FE830F81; Mon, 27 Feb 2023 11:36:30 +0000 (UTC) Received: from thuth.com (unknown [10.45.227.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 022BD1121314; Mon, 27 Feb 2023 11:36:29 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 06/33] hw/vfio/ccw: Remove pointless S390CCWDevice variable Date: Mon, 27 Feb 2023 12:35:54 +0100 Message-Id: <20230227113621.58468-7-thuth@redhat.com> In-Reply-To: <20230227113621.58468-1-thuth@redhat.com> References: <20230227113621.58468-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé 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 Message-Id: <20230213170145.45666-6-philmd@linaro.org> Signed-off-by: Thomas Huth --- 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;