From nobody Sun May 19 16:27:55 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=1684667767; cv=none; d=zohomail.com; s=zohoarc; b=OqWAUTKBweTy9P0WgaunCXTF5gLi3W16Tf0FbwuSPBmbSMrA4DIWMcXXPnuZjs1KZmNLKb3qgFZQ3IWCc+g+qMJxq90QSZjHVCwU8NXU6e3EzuQ6yLN1FRwazFuhdSUx9kXivCuDt4WbLbmvBd7BIktGNi5zqDgWksRQjsF+O2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667767; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zAglph6l2Iect/DEGB+rq6Jjk5c3mTKMPl5jFgPSj6Q=; b=hDj4OIjdUITta6mZJ65JQQmGKpI4sAJLw3ipmjFPY+tN1JumUhMlE/cAjALI+5znWM8hy8wMFqaG4bpRI/PbiKgpKOyzthCOeYUFZ0LHbOozd4ThgdjT6SrkRi7bOf+r0x1On57AvEeky4hINNnAeWvSfC1jYpG4hJgzqsYp2cY= 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 1684667767788480.02038033355393; Sun, 21 May 2023 04:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2S-0000WP-D5; Sun, 21 May 2023 07:15:48 -0400 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 1q0h2R-0000Vf-79; Sun, 21 May 2023 07:15:47 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2P-0004jY-NY; Sun, 21 May 2023 07:15:46 -0400 Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-96aae59bbd6so932144666b.3; Sun, 21 May 2023 04:15:44 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667743; x=1687259743; 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=zAglph6l2Iect/DEGB+rq6Jjk5c3mTKMPl5jFgPSj6Q=; b=ZjuzuFpf71SNdeKiDws5Fbsg7adakweYwEH3+FTXJh93RWs+4esBaoxLeK6Y/WiqXI PmueZZCAErKKko9gOsV4lAubq6yqJjZN0LxOgTI46WHiZ51r8nTJVP3Kotp9/SGPJMKl IyD7rGoQSvXn06qp03WBvKjCvaf9+atg2hp+zkqFIA4W0Kk1j2ny3aSypTCdMQqDp8Lo XER8lDPSDKRjbx6CTfm47HdUOlCzrUnRvvrmcZLwt2B3SyHIg+PUhdW965Df98qALL7P sImacXChhuB/cWp1rndzSk66zGpgkN80ofSFDd0ZHLkq93yAHzPepY49F5IJFLK92+49 xeHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667743; x=1687259743; 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=zAglph6l2Iect/DEGB+rq6Jjk5c3mTKMPl5jFgPSj6Q=; b=bj0h1WCu+Veg7EUvLjzm3IPIyOrwzqkvKhX39+UV4+pS7nCUEzXG3PSnHp8uZVw59h IDOmbY1Dl1twwiCFdEjiQDcifsLQEpw29AYOjLtFkbPKukXmViXAXY5/ZiNDeXv3iXsG TpY1KZvultbtA+KJIFtW2fkR7LjNuyIdkLgj5oiuCkrM33RIB4LSf1cuHln4YeJ/Hd50 /g0o+wKZrIVWERvdQxr+xy4Utbb+CXBqZNpKkwfXJxZ3e608QWOAh4kw9KryjYCd2Mlb 6TmYKR0lwt0Cw0rkNaalaBZ4TLHm7TbzC035E9ZEDKRAde8LQr5AfMMai7yVQtNugO+E 5iEQ== X-Gm-Message-State: AC+VfDy8FW08hiEr3nJ57QzKviS7dnkAsAZzoC/F223bqESbV0JbYPl0 8/8CT1pago6ZQBTTNGstlS/tWDlfCMQ= X-Google-Smtp-Source: ACHHUZ5G8/lcMU8ddsv4yHSq/o0u80ZRY62moHgRN+8ALcefnCsBLGbjzfdKDJsn49S96eb6YPKgjA== X-Received: by 2002:a17:907:1c1b:b0:96f:905e:e090 with SMTP id nc27-20020a1709071c1b00b0096f905ee090mr5516177ejc.35.1684667743131; Sun, 21 May 2023 04:15:43 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH 1/6] hw/ide/pci: Expose legacy interrupts as named GPIOs Date: Sun, 21 May 2023 13:15:29 +0200 Message-Id: <20230521111534.207973-2-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-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::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.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: 1684667769966100010 Content-Type: text/plain; charset="utf-8" Exposing the legacy IDE interrupts as GPIOs allows them to be connected in = the parent device through qdev_connect_gpio_out(), i.e. without accessing priva= te data of TYPE_PCI_IDE. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- hw/ide/pci.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/ide/pci.c b/hw/ide/pci.c index fc9224bbc9..9a5a7089d4 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -522,10 +522,19 @@ void bmdma_init(IDEBus *bus, BMDMAState *bm, PCIIDESt= ate *d) bm->pci_dev =3D d; } =20 +static void pci_ide_init(Object *obj) +{ + PCIIDEState *d =3D PCI_IDE(obj); + + qdev_init_gpio_out_named(DEVICE(d), d->isa_irq, "isa-irq", + ARRAY_SIZE(d->isa_irq)); +} + static const TypeInfo pci_ide_type_info =3D { .name =3D TYPE_PCI_IDE, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(PCIIDEState), + .instance_init =3D pci_ide_init, .abstract =3D true, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.40.1 From nobody Sun May 19 16:27:55 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=1684667767; cv=none; d=zohomail.com; s=zohoarc; b=lx4ZS9y92HjehXiq9yqYjL5AseIS1dy4+dSqsYPWygyPFiZBtIM209Y3nJ9rWVm6aLEVDCSbUiMq3bEV9EdspyQ2j45eas+itqi2PsEjLKxp1S4H5lsQXNkn1A5hXkV3tOOE0N/3LOMyyCGtYmksb4bHat3duS4ZxMdI+u+wYkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667767; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+NXyLFwm2rmn2QeCZVS6ECm/FY96EsHB3qjSmeztqjk=; b=RqcuApEZigs0xsefA67PEJbOCbI2as8JHGFCvvsze3JEg/TEv+MwNcAnJZdakOJWW6j5QerOb1EFgrp3c7gxLSaWeJ9dMTZa9bjDl20/hY0t15Ojg0U/5GQCsXYjwIHgoL4Nq4lOOQixR7DdOctbNRdOweyLajLfe+8tbGqfL1k= 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 1684667767877648.4107437725157; Sun, 21 May 2023 04:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2U-0000Yj-K9; Sun, 21 May 2023 07:15:50 -0400 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 1q0h2T-0000Wj-5w; Sun, 21 May 2023 07:15:49 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2R-0004jo-58; Sun, 21 May 2023 07:15:48 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-510d9218506so5134771a12.1; Sun, 21 May 2023 04:15:46 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667745; x=1687259745; 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=+NXyLFwm2rmn2QeCZVS6ECm/FY96EsHB3qjSmeztqjk=; b=q8TvBgIKnQViVU473YF24YsouYO8QcoLJqv3hNZ9pMw+FsvMi6Tvdt00FSLptTsII9 aWt2c5Z2vZeI0trgROpHWfAms4nG7Xi2G82O/qrTVyt9jdLTivZ/4GR9YboRlSr0mFln t0iiA5ZBFZslO3p4Q/6TQ0ya7Klj2/cTKloeOpTLsyX1dvKzgtBUJG4S3gC9wLM5D23c gWKKYK2rtPiNjhoaIjU+A0lE8alKtILjoGw2snXq6p/uFK9QXPmWghDtjwCvrQBvaKrG UjJAyDX2bTZJLp6aJFP7LI0SUu+daF/tebvWXPZU75lpstncqMZ7YJVD4OOz+Goe+Uv0 E8Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667745; x=1687259745; 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=+NXyLFwm2rmn2QeCZVS6ECm/FY96EsHB3qjSmeztqjk=; b=dxHKqNwR84ql9Na2/UGb0laou5qqMKPmtk3K31sqgHd9MKs1QK5v2fMmhdsjs0ExA7 FdqkZMYozBqR2keowEJwEQUjCiL1rlzD/G/HjKUMq2l8Nfgom0QQSQ4VJ/hlHl8W5bNF DOaKoZq3D86aHcwUgUj9KE/3GJxZLznwtDMH1dudrT+XZfxidJezAFLjqrlAI61/zvyc y08biDbJx7MzRBffoiFzkIdY2Ckkx7+FIpgOchNhwhceYRNKKPO00Vl1DXPSnE2PdL0S oV7WKgy1WwMst4HMVfdjHaQEXab+fi0hsenODNdy6KA8/bKXBWr3KnZWEQd4kViR1XiE Jkbw== X-Gm-Message-State: AC+VfDyhCxwVd8Rwnz+TNz4lNCZBamAd4TaxGfpdWhYzwJbBMiR8aPsY zYZidqSVMxUgT2foRC2ok1fbTpzouDU= X-Google-Smtp-Source: ACHHUZ61ZKzH2grKKKrIgBAg0GdCsquLkrJHWBczejZ+oFjTEVxZckRuJxCFTIOpj1efrAHiqQUvXw== X-Received: by 2002:a05:6402:354e:b0:50b:c350:f9ca with SMTP id f14-20020a056402354e00b0050bc350f9camr14684666edd.10.1684667744637; Sun, 21 May 2023 04:15:44 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH 2/6] hw/ide/via: Wire up IDE legacy interrupts in host device Date: Sun, 21 May 2023 13:15:30 +0200 Message-Id: <20230521111534.207973-3-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-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::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.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: 1684667769391100003 Content-Type: text/plain; charset="utf-8" Resolves circular depencency between IDE function and south bridge. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- hw/ide/via.c | 6 ++++-- hw/isa/vt82c686.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 177baea9a7..0caae52276 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -31,6 +31,7 @@ #include "sysemu/dma.h" #include "hw/isa/vt82c686.h" #include "hw/ide/pci.h" +#include "hw/irq.h" #include "trace.h" =20 static uint64_t bmdma_read(void *opaque, hwaddr addr, @@ -104,7 +105,8 @@ static void bmdma_setup_bar(PCIIDEState *d) =20 static void via_ide_set_irq(void *opaque, int n, int level) { - PCIDevice *d =3D PCI_DEVICE(opaque); + PCIIDEState *s =3D opaque; + PCIDevice *d =3D PCI_DEVICE(s); =20 if (level) { d->config[0x70 + n * 8] |=3D 0x80; @@ -112,7 +114,7 @@ static void via_ide_set_irq(void *opaque, int n, int le= vel) d->config[0x70 + n * 8] &=3D ~0x80; } =20 - via_isa_set_irq(pci_get_function_0(d), 14 + n, level); + qemu_set_irq(s->isa_irq[n], level); } =20 static void via_ide_reset(DeviceState *dev) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index ca89119ce0..8016c71315 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -692,6 +692,10 @@ static void via_isa_realize(PCIDevice *d, Error **errp) if (!qdev_realize(DEVICE(&s->ide), BUS(pci_bus), errp)) { return; } + for (i =3D 0; i < 2; i++) { + qdev_connect_gpio_out_named(DEVICE(&s->ide), "isa-irq", i, + s->isa_irqs_in[14 + i]); + } =20 /* Functions 2-3: USB Ports */ for (i =3D 0; i < ARRAY_SIZE(s->uhci); i++) { @@ -814,6 +818,7 @@ static void vt8231_isa_reset(DeviceState *dev) PCI_COMMAND_MASTER | PCI_COMMAND_SPECIAL); pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); =20 + pci_conf[0x4c] =3D 0x04; /* IDE interrupt Routing */ pci_conf[0x58] =3D 0x40; /* Miscellaneous Control 0 */ pci_conf[0x67] =3D 0x08; /* Fast IR Config */ pci_conf[0x6b] =3D 0x01; /* Fast IR I/O Base */ --=20 2.40.1 From nobody Sun May 19 16:27:55 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=1684667811; cv=none; d=zohomail.com; s=zohoarc; b=TiKRRPsiX+0mUhjjDv1CGutTNQIHjKxPQ0xnYqlF1ItABg0YITc/Mh+KA7ZfOG9IRsEAvfjBCT5Be90GOYY8Zu8VXn5Wcw0hJ9bHVplFLf0NHMDH9n9HABrDCVXaROIuu31k99kXLdTI3eUkdjKOf2cbAaPfUf81J1hLeuWw9uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667811; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gAoL9Xwljn85Sw7ICNUech4c35BoMKkS8qS/rd79d7s=; b=nksR1gA3UMp4Hrl5mAz1/BuKyxBBYikxuNiosV6016+nMYz2Da7oYdcndcIxVo9oHxQxhIiCGONFQBGRf1AT1aTPbLNDK16IDmKgvgb1MkBG0pGpTh9Y7+PGgALGnnNkiw6TldYckSAJrj1/ZcreFkRfidzA/BY+ca7xc7mszQM= 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 1684667811388767.9833539554678; Sun, 21 May 2023 04:16:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2V-0000Yt-6u; Sun, 21 May 2023 07:15:51 -0400 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 1q0h2T-0000YK-WF; Sun, 21 May 2023 07:15:50 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2S-0004k8-IR; Sun, 21 May 2023 07:15:49 -0400 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-510b6a249a8so8920348a12.0; Sun, 21 May 2023 04:15:47 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667746; x=1687259746; 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=gAoL9Xwljn85Sw7ICNUech4c35BoMKkS8qS/rd79d7s=; b=N/uPGTeWtBCLKW+S7kufLrKmZ3sYSrLgR0TU4XeIocOL8ioVmdGVP7nqZwr3xEYU4S vn57m4r8cL9NJQxhRG9c3im6cKcQpvfQfS0KzlbeFPYKAaX3by/9GuaU0BSgcBxaG5IV RfGefD0g5sl/f+nIheCnEqqQ8i09OWAWYgoKTZy2pC2EPM/XRjVYpLYAeLjL+K33uUjA /Vue66971loa9xmbjBObk8a+GRGoTxBN7CVBYzH4PieTaW8LYkfPjSXqr3vH711JW4QZ N3UaItrvG9qLlQWfhqmYlWeWywxsVRdbATO6hJoiifZGRQKVOvWrY3F3CLyN32KPnjh9 G+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667746; x=1687259746; 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=gAoL9Xwljn85Sw7ICNUech4c35BoMKkS8qS/rd79d7s=; b=fTt5QBeg2hJ/73ImPiVTdWxKdG7nlz0Ieqvb6KhoNOXE1Wr5b2QtSLjgOUhQ93tD1a jSCn3jkIxRLm96AqWtBxyQcaQTjLI7BtQdWPEcrmHRq6bkE7SUCd3DXU4zPbYd1QBCYh 9H25Hy5bdgSwEHo4AsMNKwbXAE6mPpAHSPsQN/Ioif7UDcMamFR6/bdl8NdZ2OwRIdGK MeFLTna8+jCg5W+sWrc1fNGSIINQal8O1zG2gs5W+2QgAbl2mFJjw0YF7ALapcEMrjaF bEw8Pu5sZMxu6B281A3fv4jrto2J2UxtRKlvv9uMejs9egBWWkGNz4hAIpfvXjQcyxiE XOyw== X-Gm-Message-State: AC+VfDzcNzIJk/nU0w3grkf30UYd5pGDhFXo0recADGyjzozMkKrH5lr KJSao3U4uqnNQG8MOakTkj1OrUBvrXQ= X-Google-Smtp-Source: ACHHUZ4UeRnY+sX19xR9OzEXtRd8fc6GlEZ4S4SAc/ZEHmmnQTHzRHENhwrt/4pkV7kj/k1tziAVnQ== X-Received: by 2002:aa7:d419:0:b0:50c:4b1:8912 with SMTP id z25-20020aa7d419000000b0050c04b18912mr6494323edq.15.1684667745838; Sun, 21 May 2023 04:15:45 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH 3/6] hw/isa/vt82c686: Remove via_isa_set_irq() Date: Sun, 21 May 2023 13:15:31 +0200 Message-Id: <20230521111534.207973-4-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-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::52b; envelope-from=shentey@gmail.com; helo=mail-ed1-x52b.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: 1684667811925100003 Content-Type: text/plain; charset="utf-8" Now that via_isa_set_irq() is unused it can be removed. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- include/hw/isa/vt82c686.h | 2 -- hw/isa/vt82c686.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index da1722daf2..b6e95b2851 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -34,6 +34,4 @@ struct ViaAC97State { uint32_t ac97_cmd; }; =20 -void via_isa_set_irq(PCIDevice *d, int n, int level); - #endif diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 8016c71315..57bdfb4e78 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -592,12 +592,6 @@ static const TypeInfo via_isa_info =3D { }, }; =20 -void via_isa_set_irq(PCIDevice *d, int n, int level) -{ - ViaISAState *s =3D VIA_ISA(d); - qemu_set_irq(s->isa_irqs_in[n], level); -} - static void via_isa_request_i8259_irq(void *opaque, int irq, int level) { ViaISAState *s =3D opaque; --=20 2.40.1 From nobody Sun May 19 16:27:55 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=1684667817; cv=none; d=zohomail.com; s=zohoarc; b=La1DGgs+z49wwkSppSzHtOCfRaTghzbwk0l58u9uYD8NGQj8lxKwg1W83sPAsRNb279CvvAk0OoM2x0FJtZhBe86FIpRNkqkCSd29KoHwtiFMMTASJ0SM2hkq65WUuEYXzMUQg5pCNvmMxGp01tmyaGQMQDFPp7sNXfQbdoo/z8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667817; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P72zQ7woazHMx0qT4VH6jdOKwmBc//e3KdkUSQs+4e0=; b=NHls6T0/WOWs4tCQdQ68ckv7AnwIBz4Uji/4PmoFmbkgCakr8WMxQvS6bpaj2lue9QGNB5s3hKnk/BTEx7W9VJBcg0XB/hrRR9z91YAlbk8AAmXTvyCGlfswmkJbVPCTtAu8hL5s9lOKq/YK32O4iOsqoL9EtgWyPXLsUZIns0E= 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 168466781707082.8421079349672; Sun, 21 May 2023 04:16:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2X-0000aw-CX; Sun, 21 May 2023 07:15:53 -0400 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 1q0h2V-0000Yp-Ca; Sun, 21 May 2023 07:15:51 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2T-0004kQ-GM; Sun, 21 May 2023 07:15:50 -0400 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-510b4e488e4so9059958a12.3; Sun, 21 May 2023 04:15:48 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667747; x=1687259747; 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=P72zQ7woazHMx0qT4VH6jdOKwmBc//e3KdkUSQs+4e0=; b=IkSvhi9TRqCjESXP+NiBcbU/wludHoPKn5PF5QRei1C6QPEMG4SVJNMm5D1hcfhsZb 9Aopw9fsOAkhhP29ZMdB+a8WOZ0YG0p2xo0H7YdbMTob6D9k1P7Z4NBY+it72VqMpjOV +tf+8Qe53DU4enU0e85WKlcHgzSkebozKMZmqPms8+UforGMMzTd6cZKme7FAF+mGF0Q GtKnlwG+Db6LGw7ocSOUGLUmGUTUtfZ8eQhjoTkFvcDj5qAZce6zRgbLMiPWGIlZ3mF6 jKtlXbmJsoF+IZ7lfFCSnsgvUlZIbDtH9Z1SQpAClYpZfWXV2GuB+KONfCz9ALzDOKba PT7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667747; x=1687259747; 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=P72zQ7woazHMx0qT4VH6jdOKwmBc//e3KdkUSQs+4e0=; b=h1NybzCuWdqlCC7/kdSbvi7HT+4IXQPZ1S4xvEV4mcckELjtwhxBkKsiPnMMKNBTHJ rnGsVB03Z2+kjqIWfFUU2lTTDx506dQyr86yJv4oSO2Q6Ut9QfqWvJkzwab3jUjyDMo2 QhqrITUWwLFU3vaov0jA3ROxSA23LGuwl/MGE9tw6OsL1uFYPBwAbyoidd4HEhEYmwaL Kk3Ik4TSNeROPpHj9XWxcLAcStk2E6nM3vCmcJ7zw/wfvaMv4xVoS//llm9+HZQ8tnnw AzLIg1f0hlXdRvFgKM+alsvcKXpkizx2st+lkb8HWYE8m8smwXnq751eE19FF8ylzpaW p4yw== X-Gm-Message-State: AC+VfDyBT4S7vTJuiUHq9aUCLkaWAF8QmLzZjOxC7MNXCQJbQD4Tdz+j oZ+iJ+UFuIPnVj0Y7KPmMeOwcvhQhKI= X-Google-Smtp-Source: ACHHUZ5PcXUSedNBEDiGZjCtEsp7uNX4jwX/NXgmA4ks0Udev554tEeaQS8ymWvLVXOsXrns2BmLMw== X-Received: by 2002:a05:6402:514:b0:50c:d5d:c960 with SMTP id m20-20020a056402051400b0050c0d5dc960mr5528401edv.38.1684667747267; Sun, 21 May 2023 04:15:47 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH 4/6] hw/ide: Extract IDEBus assignment into bmdma_init() Date: Sun, 21 May 2023 13:15:32 +0200 Message-Id: <20230521111534.207973-5-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-1-shentey@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.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: 1684667817956100001 Every invocation of bmdma_init() is followed by `d->bmdma[i].bus =3D &d->bu= s[i]`. Resolve this redundancy by extracting it into bmdma_init(). Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- hw/ide/cmd646.c | 1 - hw/ide/pci.c | 1 + hw/ide/piix.c | 1 - hw/ide/sii3112.c | 1 - hw/ide/via.c | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a68357c1c5..a094a6e12a 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -297,7 +297,6 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Erro= r **errp) ide_bus_init_output_irq(&d->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); - d->bmdma[i].bus =3D &d->bus[i]; ide_bus_register_restart_cb(&d->bus[i]); } } diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 9a5a7089d4..4cf1e9c679 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -519,6 +519,7 @@ void bmdma_init(IDEBus *bus, BMDMAState *bm, PCIIDEStat= e *d) bus->dma =3D &bm->dma; bm->irq =3D bus->irq; bus->irq =3D qemu_allocate_irq(bmdma_irq, bm, 0); + bm->bus =3D bus; bm->pci_dev =3D d; } =20 diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 41d60921e3..a32f7ccece 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -144,7 +144,6 @@ static bool pci_piix_init_bus(PCIIDEState *d, unsigned = i, Error **errp) ide_bus_init_output_irq(&d->bus[i], isa_get_irq(NULL, port_info[i].isa= irq)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); - d->bmdma[i].bus =3D &d->bus[i]; ide_bus_register_restart_cb(&d->bus[i]); =20 return true; diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index f9becdff8e..5dd3d03c29 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -287,7 +287,6 @@ static void sii3112_pci_realize(PCIDevice *dev, Error *= *errp) ide_bus_init_output_irq(&s->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&s->bus[i], &s->bmdma[i], s); - s->bmdma[i].bus =3D &s->bus[i]; ide_bus_register_restart_cb(&s->bus[i]); } } diff --git a/hw/ide/via.c b/hw/ide/via.c index 0caae52276..91253fa4ef 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -196,7 +196,6 @@ static void via_ide_realize(PCIDevice *dev, Error **err= p) ide_bus_init_output_irq(&d->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); - d->bmdma[i].bus =3D &d->bus[i]; ide_bus_register_restart_cb(&d->bus[i]); } } --=20 2.40.1 From nobody Sun May 19 16:27:55 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=1684667823; cv=none; d=zohomail.com; s=zohoarc; b=DQJ1WW2kUu6sulx6ecTpt5+ycd5Pr+bVFQKa3FV4wegp/L6xMxWWLj7flNtM/IzP61lRrOodq/kYBIQRGCHZESX3AXqbwJmXeLYKvtVnvRknlD2YInxY3n0WRQGZ39WpqP7B43QxsGxQzILrwlD5ImNdt02bty2r1JljJ0B9adA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667823; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jb9/PH3+ROUueEJCvRpM/20RsfD2Ir+RnGDElnLm8gY=; b=Lq0FP8/6rk6N7mMQ8v/EARVuxsqJeU6f7dECEDjJW/go5KAmbImPw6ozPQW9pgu3E9Uw4QG9e9GLVSM+za9AW+hWlykCGHLEETNweE5d5JDeP2mV48l2IUa8Kkr7Ggmal43w10rrqqCt9GjmuiJFFw2M9J+S1aZIHQG7BE3zVSw= 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 1684667823702953.5259284848647; Sun, 21 May 2023 04:17:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2Y-0000dK-QC; Sun, 21 May 2023 07:15:54 -0400 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 1q0h2W-0000aO-BI; Sun, 21 May 2023 07:15:52 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2U-0004kg-Lw; Sun, 21 May 2023 07:15:52 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-510f3db1cd8so5069527a12.1; Sun, 21 May 2023 04:15:49 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667748; x=1687259748; 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=Jb9/PH3+ROUueEJCvRpM/20RsfD2Ir+RnGDElnLm8gY=; b=MUPchkRsKsRB1nMdVGCTfm/0cQAotglufMB0JWqijFNpmqv8qNFNQ/QIpMv/UpQZn6 FSjRZK6AqIM7yv4/qjIMjyLq622FetZWGuRGshzwWyl7lqvGcCMuvG27Q5w6eg3FeLRC y083CLXpmciycYcWfPWDC6sjNnPopQVBZ86f+qi9+Gs80QNuPNtOO83HWiVYC8iduQkP AjzDYFrAossGQyD5p5o1yDQn24M8UpElZ/ylTwKsU8prNx0Kb8HRLPeOeWOIli3om3/i C6CznTJrndnpdUY1qENyOYeUJS0EyImvvGONpro3Upt6Unmle1SeljfrvifykiW2F/gP MOdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667748; x=1687259748; 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=Jb9/PH3+ROUueEJCvRpM/20RsfD2Ir+RnGDElnLm8gY=; b=hmL79mSzLoTkevhVYsxA4x4wsWU/l17Q9CEo1Co4iRlQfDoZNIwzeqIOI7PJ/dLkt0 FzDepmmWk9LdUnfAAAx9phyW15u4In34wBVI3CgOTYF/KV2ZeGrYbPAUvVIpPfQKm+N2 Lrx8e6RQOanwJ3sdzspRzsZP3pyiOK6w0mXazsP7qR/ynryuoMcw64VWeE1gQMPraeeQ NJFoTNYQZx20WFic26qlC5DXCPxm6WLu5AUvu4F+lDeXOKedto8r+iGp0QsGwesI9Vuo i7RN/phLQh7nTPmSjvcsZgRAF9xhdSJ9ytg/y8R6WXl9JqS7Xi3VGiueE+e7TqW5QBwK My3w== X-Gm-Message-State: AC+VfDwPNikcsDEeVZsugvp940EvYtFZpmryKMvuua61VX1sR48fnIOh KdfQ3UeD+StwDeSyCeU5AekrvTVq1bw= X-Google-Smtp-Source: ACHHUZ6sY9Qrz72hoslKouqWcK6LlLFsRQ8ROwB0XCOZ1kBFVME4vyCKC6nB6tucs6+Hvaqu2mV32g== X-Received: by 2002:aa7:c619:0:b0:50b:d18c:620a with SMTP id h25-20020aa7c619000000b0050bd18c620amr5636852edq.25.1684667748337; Sun, 21 May 2023 04:15:48 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH 5/6] hw/ide: Extract bmdma_status_writeb() Date: Sun, 21 May 2023 13:15:33 +0200 Message-Id: <20230521111534.207973-6-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-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::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.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: 1684667823945100001 Content-Type: text/plain; charset="utf-8" Every TYPE_PCI_IDE device performs the same not-so-trivial bit manipulation= by copy'n'paste code. Extract this into bmdma_status_writeb(), mirroring bmdma_cmd_writeb(). Signed-off-by: Bernhard Beschow Reviewed-by: BALATON Zoltan Reviewed-by: Mark Cave-Ayland --- include/hw/ide/pci.h | 1 + hw/ide/cmd646.c | 2 +- hw/ide/pci.c | 5 +++++ hw/ide/piix.c | 2 +- hw/ide/sii3112.c | 6 ++---- hw/ide/via.c | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index 74c127e32f..1ff469de87 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -58,6 +58,7 @@ struct PCIIDEState { =20 void bmdma_init(IDEBus *bus, BMDMAState *bm, PCIIDEState *d); void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val); +void bmdma_status_writeb(BMDMAState *bm, uint32_t val); extern MemoryRegionOps bmdma_addr_ioport_ops; void pci_ide_create_devs(PCIDevice *dev); =20 diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index a094a6e12a..cabe9048b1 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -144,7 +144,7 @@ static void bmdma_write(void *opaque, hwaddr addr, cmd646_update_irq(pci_dev); break; case 2: - bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~va= l & 0x06); + bmdma_status_writeb(bm, val); break; case 3: if (bm =3D=3D &bm->pci_dev->bmdma[0]) { diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 4cf1e9c679..b258fd2f50 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -318,6 +318,11 @@ void bmdma_cmd_writeb(BMDMAState *bm, uint32_t val) bm->cmd =3D val & 0x09; } =20 +void bmdma_status_writeb(BMDMAState *bm, uint32_t val) +{ + bm->status =3D (val & 0x60) | (bm->status & BM_STATUS_DMAING) | (bm->s= tatus & ~val & 0x06); +} + static uint64_t bmdma_addr_read(void *opaque, hwaddr addr, unsigned width) { diff --git a/hw/ide/piix.c b/hw/ide/piix.c index a32f7ccece..47e0b474c3 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -76,7 +76,7 @@ static void bmdma_write(void *opaque, hwaddr addr, bmdma_cmd_writeb(bm, val); break; case 2: - bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~va= l & 0x06); + bmdma_status_writeb(bm, val); break; } } diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 5dd3d03c29..63dc4a0494 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -149,8 +149,7 @@ static void sii3112_reg_write(void *opaque, hwaddr addr, break; case 0x02: case 0x12: - d->i.bmdma[0].status =3D (val & 0x60) | (d->i.bmdma[0].status & 1)= | - (d->i.bmdma[0].status & ~val & 6); + bmdma_status_writeb(&d->i.bmdma[0], val); break; case 0x04 ... 0x07: bmdma_addr_ioport_ops.write(&d->i.bmdma[0], addr - 4, val, size); @@ -165,8 +164,7 @@ static void sii3112_reg_write(void *opaque, hwaddr addr, break; case 0x0a: case 0x1a: - d->i.bmdma[1].status =3D (val & 0x60) | (d->i.bmdma[1].status & 1)= | - (d->i.bmdma[1].status & ~val & 6); + bmdma_status_writeb(&d->i.bmdma[1], val); break; case 0x0c ... 0x0f: bmdma_addr_ioport_ops.write(&d->i.bmdma[1], addr - 12, val, size); diff --git a/hw/ide/via.c b/hw/ide/via.c index 91253fa4ef..fff23803a6 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -75,7 +75,7 @@ static void bmdma_write(void *opaque, hwaddr addr, bmdma_cmd_writeb(bm, val); break; case 2: - bm->status =3D (val & 0x60) | (bm->status & 1) | (bm->status & ~va= l & 0x06); + bmdma_status_writeb(bm, val); break; default:; } --=20 2.40.1 From nobody Sun May 19 16:27:55 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=1684667826; cv=none; d=zohomail.com; s=zohoarc; b=GhmEcQbZ5rNa6DFt4pgUW8qeiI6arNGxXgQfirUfeTte3vxH7aiJ7ccMiHccK7p1VppFIku5sFwkqyoEU64AQIrqA8tr53Cb70+4PZfXpvudyAvvR6hCY/edVY8uK+6elZqwtAZwhVhoUhuQA3QH8aShItyYEhSset+UCZzbEPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684667826; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JKcA9Q9vCTMVD2ekonIMizpHtUeqWWMtxHhtpg96PAg=; b=IjNCMI9ZwfYA2l0Pj3z270KhCxjhOAYYq+8lWF4qjvCGU1iI/OqhqkrLaXuVjBjYbE8c86tev6K94awpNqSSnDl8REEQk3uNOWX4377IXDRJyAfjMeyf1ISYldCV9gcknwcjM6SYx/FXtlNUgir/sB7caLDSe5OL4LeL6zgPGpc= 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 1684667826901377.4198768434477; Sun, 21 May 2023 04:17:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0h2Z-0000ed-2B; Sun, 21 May 2023 07:15:55 -0400 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 1q0h2X-0000bb-Sk; Sun, 21 May 2023 07:15:53 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0h2W-0004l7-2F; Sun, 21 May 2023 07:15:53 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-510d6b939bfso8416434a12.0; Sun, 21 May 2023 04:15:51 -0700 (PDT) Received: from Provence.localdomain (dynamic-077-191-145-122.77.191.pool.telefonica.de. [77.191.145.122]) by smtp.gmail.com with ESMTPSA id l5-20020a056402124500b0050dfb9fc499sm1757123edw.39.2023.05.21.04.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 04:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684667749; x=1687259749; 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=JKcA9Q9vCTMVD2ekonIMizpHtUeqWWMtxHhtpg96PAg=; b=Z04KrhWBChotZNqnqeE/6wcwQzB/NEFTPxRCgfKs11Q4qc0NmYaRg7VMp1PPFxtAPv 89X9c1PFfeyK07YzOv1Z62evgZcq51H/n2UaPtvvhew7wKPhuotELwkfMSSwUzQOF+aD OiREEd5BckV4zTzneFLpbP1ZghSHwjEizv4e++655CGaUY23g6f/g/vAnu7ILpcoroZ/ 6P5OpjIPBdN592mIcpHcTCAPOyDHCxCQEhshSFr9SMVTGHinxCkActnmAoiTppdm/i5/ EGQE+DUJ3x0mEoJMFVS7YnPFgnet3+b3YT1UZ43i0Yxhskm+19fUYQZUZJjKq6VqPYhJ Vx0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684667749; x=1687259749; 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=JKcA9Q9vCTMVD2ekonIMizpHtUeqWWMtxHhtpg96PAg=; b=fsDxOIj5PA0qE/8mFDmaaIiU/5Svo/RF5PEF1Ue0Kk5Fua5pZHQv4vvCjHtaWJuUZL VfvYbFIoQ8cGNcS7x5LI9GjnmEHb7eaiSmYObhTwGuM2a1NkGptFe/PG9dhV3K6duy+e alP1X79pOTAsZXWhZFUV/INAX5ShAbNN/19tddA6/fbV1o7OARl4jMF2lz6FnTm2EqIw z3PBFgXQzqYLFW3bxDw/LdWBX9x3qpe5zQT1+mLiFBFe4FF+c+2PhdvZp/SDi3K0Ps2N WADIpnqt9+6cYz9eHzY7dtqvPCYHfRybzMh8zPiEStn6xfSbF0FHV4OA0q6xi8PdxJNh G8rA== X-Gm-Message-State: AC+VfDzXDqx9zGvfO4zuERaaSgKAivULNd6iFKQlu4g9ermcJPSWWcGV GDUM8WwCVLyNzxhTOA37wv38rgVj9NA= X-Google-Smtp-Source: ACHHUZ4DSgIxc8SPd+jrvUmKM1dt+0uCuMoI2GnvReGrCKjoJ3rn3bcftH7r13i8fzkcEJkN2omN/g== X-Received: by 2002:aa7:dd18:0:b0:510:82b4:844d with SMTP id i24-20020aa7dd18000000b0051082b4844dmr6400395edv.2.1684667749711; Sun, 21 May 2023 04:15:49 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Huacai Chen , qemu-ppc@nongnu.org, Jiaxun Yang , John Snow , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH 6/6] hw/ide/piix: Move registration of VMStateDescription to DeviceClass Date: Sun, 21 May 2023 13:15:34 +0200 Message-Id: <20230521111534.207973-7-shentey@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230521111534.207973-1-shentey@gmail.com> References: <20230521111534.207973-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::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.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: 1684667827706100005 Content-Type: text/plain; charset="utf-8" The modern, declarative way to set up VM state handling is to assign to DeviceClass::vmsd attribute. There shouldn't be any change in behavior since dc->vmsd causes vmstate_register_with_alias_id() to be called on the instance during the instance init phase. vmstate_register() was also called during the instance init phase which forwards to vmstate_register_with_alias_id() internally. Checking the migration schema before and after this patch confi= rms: before: > qemu-system-x86_64 -S > qemu > migrate -d exec:cat>before.mig after: > qemu-system-x86_64 -S > qemu > migrate -d exec:cat>after.mig > analyze-migration.py -d desc -f before.mig > before.json > analyze-migration.py -d desc -f after.mig > after.json > diff before.json after.json -> empty Reviewed-by: Mark Cave-Ayland --- hw/ide/piix.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 47e0b474c3..151f206046 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -28,7 +28,6 @@ */ =20 #include "qemu/osdep.h" -#include "migration/vmstate.h" #include "qapi/error.h" #include "hw/pci/pci.h" #include "hw/ide/piix.h" @@ -159,8 +158,6 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error = **errp) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 - vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_pci, d); - for (unsigned i =3D 0; i < 2; i++) { if (!pci_piix_init_bus(d, i, errp)) { return; @@ -186,6 +183,7 @@ static void piix3_ide_class_init(ObjectClass *klass, vo= id *data) PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 dc->reset =3D piix_ide_reset; + dc->vmsd =3D &vmstate_ide_pci; k->realize =3D pci_piix_ide_realize; k->exit =3D pci_piix_ide_exitfn; k->vendor_id =3D PCI_VENDOR_ID_INTEL; @@ -208,6 +206,7 @@ static void piix4_ide_class_init(ObjectClass *klass, vo= id *data) PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 dc->reset =3D piix_ide_reset; + dc->vmsd =3D &vmstate_ide_pci; k->realize =3D pci_piix_ide_realize; k->exit =3D pci_piix_ide_exitfn; k->vendor_id =3D PCI_VENDOR_ID_INTEL; --=20 2.40.1