From nobody Wed Nov 27 00:24:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1703171383; cv=none; d=zohomail.com; s=zohoarc; b=Ieh+KyD56SWVxaY1gybjdsHsnzASwjUlg9tJYj1MXR6gvA57pOqxEaMuXYvGelogW8uf6AMWsQ/eNpHa1ceMJCRwwXPcQx8N1sSffjVuTxqU++EaHfa0xVW6vrDcRMbqrDjVNve66kJldDcye5f62FkBY7hS6Lq/KdnQT7Z/+xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703171383; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y7ExFl9Onle82wvecw0jGK0kYbFQMh4wlO/YWeYYimY=; b=RkAoDmX5gKpx1BdDsY+glU1xvL5XpvWlRzkSsWlV60FTUZioNyIWCeFZprTI5OIU+lS+wVV8kuEfma6WI87+/mW4lBmV4oyYIAv6XB0We/RQa0GjOI0Chg17BU1CtXpzpFpc3eedPL5VpS/wd207Gg5bTwP7NShwQvT1PQdJp9o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703171383492591.3792002089527; Thu, 21 Dec 2023 07:09:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGKej-00088m-VP; Thu, 21 Dec 2023 10:08:14 -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 1rGKeh-00087V-Mv; Thu, 21 Dec 2023 10:08:11 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rGKeg-0004JD-0H; Thu, 21 Dec 2023 10:08:11 -0500 Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-54cb4fa667bso1147202a12.3; Thu, 21 Dec 2023 07:08:07 -0800 (PST) Received: from archlinux.. (pd95ed842.dip0.t-ipconnect.de. [217.94.216.66]) by smtp.gmail.com with ESMTPSA id t25-20020a056402241900b00553b6b5bb44sm1264264eda.67.2023.12.21.07.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 07:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703171286; x=1703776086; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y7ExFl9Onle82wvecw0jGK0kYbFQMh4wlO/YWeYYimY=; b=lqfYn0DvQmzxnbShtGFKkyW8m6qnDeyBGWbKNsOq8qXbLKVVFExvVCwIDz7aueBgDA QXWRWbVsY8YHEcx08uNburKKn0VH6IDcNIof3/vzyssIKuCFUoIhCEH3epNVuGlfoqu8 LiTjSCUBkaa9Cht0NFgnwdVdaBD/8kYAoRzamuztCTyPmiQ9QsV2yKgaKfxJtilByD2r 8k1ceBbosnJ5xnKEVjbsnvrDguGd19jVULRHp8pXcizl/1/2MP8g9evhnDTHHpIpXMh/ bTpYeORDFEY88lI31y56Fcyy+FtZCiL6NbIanmbKB/e+6eRr6XkLDaJNz0+JfHkvxIuH 5MLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703171286; x=1703776086; 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=y7ExFl9Onle82wvecw0jGK0kYbFQMh4wlO/YWeYYimY=; b=MqzvmQ8aBeZsOwXj49fA8zhZM49aXgh/05AoAaxRU6oddYgZtuffZtK48oJZdjgiQl cGIsT+04nrLGNQrtrlKcStOxz+F5/ZgCGzuTqvNkmshc05i4Ie2ccJxUichCEvsQ+KPO Ta3Tflw71SwGsPit4VWgnbgOWJp2RnrGoq66zPH9Dg/WAscSEi0GMjipVWoayz2TrmtQ EEGeovBKNz1dMoSxLSm4ZabfzuQILpYd0wo6NjEVr3P8QqR72KwFhcZBzFuLhv++PkI9 fm7DL6dzR5oXq8O9oLAWfp9Q5BRP1D5GEOntLNEBRQ1j3lcv7f2oqESvwCbhksaiv2z/ 3qxw== X-Gm-Message-State: AOJu0YxsTcqz2WVXvNsiPDNATmThHymOE7/NK4yDBxKf/vEtnhJnjx6g qbI3l0fn4JNO+klGcmM7PsE2TQvCuKlCoA== X-Google-Smtp-Source: AGHT+IGSFmGciZHdvmJpaFDwiIz0Wf3TU2MabbChsT91kf6bhWGAt7sMyWXyFvBS8nreA3s3wc2M8A== X-Received: by 2002:a50:999a:0:b0:553:6562:be8 with SMTP id m26-20020a50999a000000b0055365620be8mr3156874edb.44.1703171286146; Thu, 21 Dec 2023 07:08:06 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Juan Quintela , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Hanna Reitz , Fabiano Rosas , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Mark Cave-Ayland , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Xu , Jiaxun Yang , qemu-ppc@nongnu.org, Kevin Wolf , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , Sergio Lopez , John Snow , Artyom Tarasenko , David Hildenbrand , Nicholas Piggin , Marcel Apfelbaum , BALATON Zoltan , qemu-block@nongnu.org, Richard Henderson , Leonardo Bras , "Michael S. Tsirkin" , Bernhard Beschow Subject: [PATCH v3 03/11] hw/char/parallel: Move portio_list from ParallelState to ISAParallelState Date: Thu, 21 Dec 2023 16:07:42 +0100 Message-ID: <20231221150750.5435-4-shentey@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221150750.5435-1-shentey@gmail.com> References: <20231221150750.5435-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=shentey@gmail.com; helo=mail-ed1-x530.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1703171383939100001 Content-Type: text/plain; charset="utf-8" ParallelState::portio_list isn't used inside ParallelState context but only inside ISAParallelState context, so move it there. Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan --- include/hw/char/parallel-isa.h | 2 ++ include/hw/char/parallel.h | 2 -- hw/char/parallel.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h index d24ccecf05..3b783bd08d 100644 --- a/include/hw/char/parallel-isa.h +++ b/include/hw/char/parallel-isa.h @@ -12,6 +12,7 @@ =20 #include "parallel.h" =20 +#include "exec/ioport.h" #include "hw/isa/isa.h" #include "qom/object.h" =20 @@ -25,6 +26,7 @@ struct ISAParallelState { uint32_t iobase; uint32_t isairq; ParallelState state; + PortioList portio_list; }; =20 #endif /* HW_PARALLEL_ISA_H */ diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h index 7b5a309a03..cfb97cc7cc 100644 --- a/include/hw/char/parallel.h +++ b/include/hw/char/parallel.h @@ -1,7 +1,6 @@ #ifndef HW_PARALLEL_H #define HW_PARALLEL_H =20 -#include "exec/ioport.h" #include "exec/memory.h" #include "hw/isa/isa.h" #include "hw/irq.h" @@ -22,7 +21,6 @@ typedef struct ParallelState { uint32_t last_read_offset; /* For debugging */ /* Memory-mapped interface */ int it_shift; - PortioList portio_list; } ParallelState; =20 void parallel_hds_isa_init(ISABus *bus, int n); diff --git a/hw/char/parallel.c b/hw/char/parallel.c index 147c900f0d..c1747cbb75 100644 --- a/hw/char/parallel.c +++ b/hw/char/parallel.c @@ -532,7 +532,7 @@ static void parallel_isa_realizefn(DeviceState *dev, Er= ror **errp) s->status =3D dummy; } =20 - isa_register_portio_list(isadev, &s->portio_list, base, + isa_register_portio_list(isadev, &isa->portio_list, base, (s->hw_driver ? &isa_parallel_portio_hw_list[0] : &isa_parallel_portio_sw_list[0]), --=20 2.43.0