From nobody Mon Feb 9 20:35:21 2026 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=1670180961; cv=none; d=zohomail.com; s=zohoarc; b=KTF/k1rBj64v0PbAwK3MaLSmFxP79y3h25vnkxB9RjVpTr5SPgb/UtVb+NjTS72uVaUeJuGgJlYHn1qRhB6zqpX+dQ7cCgo7ni+Nv3FyEcdXWMUH3Ri+uvCjK+W8V2a5hXbHHpiJ96FQf9rOBKX3LOmqOvy6pnw05cC9GdHsJNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670180961; 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=6bEoXUi/0cGyemox/YexAdXHKvZb4lgz+qOxjSUJWxU=; b=Cfpyczzu2C7X7jVu8dNQSdoxbeaJq0uYCEhOVJFRCyHTfz12O14dJpxhlll4KDRK3iGD1funRO8l/bSunpjNxvtWzjNIv2VOqgqhPkUZoXpU12Pbl4r41qVtaGEG1E/qeit+TO7EZB4mZMucMUFsFWgRfPQ3CzEcFnRnj3gYeWo= 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 167018096115279.71046534808374; Sun, 4 Dec 2022 11:09:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1uLS-0002Ee-Pp; Sun, 04 Dec 2022 14:08:10 -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 1p1uLQ-0002Bc-4v; Sun, 04 Dec 2022 14:08:08 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1uLN-0001dF-KV; Sun, 04 Dec 2022 14:08:07 -0500 Received: by mail-ed1-x52e.google.com with SMTP id c17so4514105edj.13; Sun, 04 Dec 2022 11:08:01 -0800 (PST) Received: from localhost.localdomain (dynamic-089-012-182-051.89.12.pool.telefonica.de. [89.12.182.51]) by smtp.gmail.com with ESMTPSA id j10-20020a17090623ea00b00782ee6b34f2sm5359835ejg.183.2022.12.04.11.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Dec 2022 11:08:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=6bEoXUi/0cGyemox/YexAdXHKvZb4lgz+qOxjSUJWxU=; b=JIe2VzI+/xdLDRNjNpuLHpsXg5JvTHssEMn8r2GVvttcOcrxDQ7pJP2oFTPynq50TV pty5SPfAaIfLQES1/hra35YQgfKNOIXDP98nq3PJ+VswLVoUEjlBHWPwm99JAZw8QffQ Q00fZc6YNacm+e7yBTWqAf7Mfxrz6NKeINtN6OhIH9UuDxMqKAqLl7cMY+La9MfueBQL Xr20W5mj/eaVzbpQ6k67da2QP7kk55/uxxe2pf8y3z5C/lLTAfdXI7Qn3M9tGO67AeYr TNyUg4Iozhf3r2t62GB+jtYkoD7wD2YJ8j85pP1Z4D+lNoM1h+EPihBDeepZ2RUMH2Jf RzZA== 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=6bEoXUi/0cGyemox/YexAdXHKvZb4lgz+qOxjSUJWxU=; b=jAetG7Y2CqImcyzt11SLv4MOpRSoXG+sBleXikNiWWOEInmx8p/cc+8j9nsjvOV6HO m5pTIKIIioUZor2tjxeHW5Z2Whpf/Sm47+/5LMZPLTieXezTlVvyFEN9eOOzRe3DHnOI pnF+l8ps9iRZ2Xj7aenjP59irxsztQw9fbPNgyWcQ4GfIPksDslvv5apLWhVqpfSaqvQ xUM+89KBo0MwPp7kmK2RVaAot5/RCZke1+ejLZyIm/uGsGpvQoM+lhU5XiQ3I4uDgeaW MTBw1cGN7ZTEQAyN49IZxCr8E7eNufvu0D0VyTL5t5DyW04rIO4dK1HLb9tKnjO8tyc5 DZpw== X-Gm-Message-State: ANoB5pleuejInq4LTewikMWQu7ryta5Kg3GEm4feXN05fimWvLz66PXX Fko7I9mzNPNNf5t3OlLIGVXl68bXPWI= X-Google-Smtp-Source: AA0mqf7Qj+0Jt+yHAd3ULaMHzk9BKfzRP6/hDABX9gBSpaKSLR/DvBJp71FOsxAr8TFh7Pgnw8VqMA== X-Received: by 2002:a05:6402:449b:b0:459:2b41:3922 with SMTP id er27-20020a056402449b00b004592b413922mr2615093edb.160.1670180880740; Sun, 04 Dec 2022 11:08:00 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Marcel Apfelbaum , John Snow , qemu-block@nongnu.org, Igor Mammedov , Gerd Hoffmann , Aurelien Jarno , Richard Henderson , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Ani Sinha , Jiaxun Yang , Bernhard Beschow Subject: [PATCH 24/32] hw/isa/piix4: Rename reset control operations to match PIIX3 Date: Sun, 4 Dec 2022 20:05:45 +0100 Message-Id: <20221204190553.3274-25-shentey@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221204190553.3274-1-shentey@gmail.com> References: <20221204190553.3274-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::52e; envelope-from=shentey@gmail.com; helo=mail-ed1-x52e.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 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: 1670180962834100003 Both implementations are the same and will be shared upon merging. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20221022150508.26830-35-shentey@gmail.com> --- hw/isa/piix4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index c12388ddac..13ec2503d0 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -152,7 +152,7 @@ static const VMStateDescription vmstate_piix4 =3D { } }; =20 -static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val, +static void rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned int len) { PIIXState *s =3D opaque; @@ -165,16 +165,16 @@ static void piix4_rcr_write(void *opaque, hwaddr addr= , uint64_t val, s->rcr =3D val & 2; /* keep System Reset type only */ } =20 -static uint64_t piix4_rcr_read(void *opaque, hwaddr addr, unsigned int len) +static uint64_t rcr_read(void *opaque, hwaddr addr, unsigned int len) { PIIXState *s =3D opaque; =20 return s->rcr; } =20 -static const MemoryRegionOps piix4_rcr_ops =3D { - .read =3D piix4_rcr_read, - .write =3D piix4_rcr_write, +static const MemoryRegionOps rcr_ops =3D { + .read =3D rcr_read, + .write =3D rcr_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .impl =3D { .min_access_size =3D 1, @@ -194,7 +194,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) return; } =20 - memory_region_init_io(&s->rcr_mem, OBJECT(dev), &piix4_rcr_ops, s, + memory_region_init_io(&s->rcr_mem, OBJECT(dev), &rcr_ops, s, "reset-control", 1); memory_region_add_subregion_overlap(pci_address_space_io(dev), PIIX_RCR_IOPORT, &s->rcr_mem, 1); --=20 2.38.1