From nobody Tue Nov 18 10:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609707107; cv=none; d=zohomail.com; s=zohoarc; b=gqUlAsNScOLcyw25Ko17MMUXRmWWOZgXLGKgd3HIL0OFrgQfFUGh2srJdS+uER00UtDxOKRtRJJNKZFon+GUOKQbFcwlntCQAoPILDUf+Afr3fhvsq5C/Quh4CApbqGScoeT/TGYTSTtSKzZTbDKabmUFjBn2oFeN8DOY2LT2Fg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707107; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=okh/tsWUEfl+thMVnF4caC8TcGYG7BGDE6eyhBrKnR8=; b=Ji3pRbhCkBKJCu194oiALZi4sK9/BA++lbabjNJCqUgjD8Cb1nbI0Y2Qg/GN5qVSpbGWpynhyHhiBZ2KQ+KeSVO71RvtQFeD7KqpQDJHejBZBAfHhqvWee9iBRHpFAtrITuh4a+sEJs/LSLiq2AJUBf6TaqiAvZDkougF5VOCmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1609707107481633.9785978363681; Sun, 3 Jan 2021 12:51:47 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id c124so15932940wma.5 for ; Sun, 03 Jan 2021 12:51:46 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id w8sm87247015wrl.91.2021.01.03.12.51.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=okh/tsWUEfl+thMVnF4caC8TcGYG7BGDE6eyhBrKnR8=; b=uOULFtzk2LqU+nCD0+X0AiaIaiMdBfpBOEYAstrqDhFENKOEfjvmfEc9TrgomJyp1s yZWj2TpeTYShKn7I8vJw8h/zIP67DWIsGZiDbKzOpxxPnffo37h+T5b4z2xqEvxUPPbB CYmy8H5SM7ebVZsbWhhQPbV1VanpgFgd8xOCj9zXvg81Wp/ceh0GQ+MelgT5RC1d+SVV /T1yoo3dr8oGFwxUcy1RvGttYaK6jQn86WOJUTeOl5nsTqEiT2YiGtQNNJJgeBIYv8d5 zm964FpD58XhnuSPTZZ2PqhDXVUt0va/xaS3TzTZNORAQZD+F3UnCDTS9j1e+J31QpFI twsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=okh/tsWUEfl+thMVnF4caC8TcGYG7BGDE6eyhBrKnR8=; b=qCQOlXBDUGkOcuy3Lri2Ee91xSiAOwU0JQsJoD90DOFMxymgfpxzLNFe3izmzJL8vE 4zi2udeU7Sp53vjfe9NeMfokvMMieEcQqvh9ghduN1xsEehGJaedt4a8jJCT/KoNbxJc ++jI87iNKXsS0I7OrvvoYenjTdruvoyL9JFTaZ6nblwSyIOAH+Gn+q4jlmmqUU4h1ipL DeuZUlhyo+pU+6KysDuwwodtqn3BiFQ/uw+csla5LqBl2psoCUgmOrvK7TRObpoVr1Td L80eDx8I9Z5imPzNPij+cWE6oReOxsUFZeBUuFLBD6FGL0OPnFc9IGx9/G1pspdeYHTL qKKA== X-Gm-Message-State: AOAM532j70IYahAe8/toQABdNBrNT1ptBoItR6XssptcStTH6qMQLtMk 6EsbFMwYi6IyjQEJ0rxSFCk= X-Google-Smtp-Source: ABdhPJwflvWW1+9AxuLmyLQ1em4cAoL1K/ipCisVffnnAXzESVLUmuNSWD3Se2L/p6Zt67gwXpVA4w== X-Received: by 2002:a7b:cb93:: with SMTP id m19mr23887611wmi.128.1609707105672; Sun, 03 Jan 2021 12:51:45 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 17/35] vt82c686: Use shorter name for local variable holding object state Date: Sun, 3 Jan 2021 21:50:03 +0100 Message-Id: <20210103205021.2837760-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan Rename local variable holding object state for readability and consistency. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <69655b23df2ecebbf0aff29726f4b4746f5b74de.1609584216.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 02d6759c00b..2633cfe7dc7 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -95,8 +95,8 @@ static const MemoryRegionOps superio_ops =3D { =20 static void vt82c686b_isa_reset(DeviceState *dev) { - VT82C686BISAState *vt82c =3D VT82C686B_ISA(dev); - uint8_t *pci_conf =3D vt82c->dev.config; + VT82C686BISAState *s =3D VT82C686B_ISA(dev); + uint8_t *pci_conf =3D s->dev.config; =20 pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMO= RY | @@ -112,24 +112,24 @@ static void vt82c686b_isa_reset(DeviceState *dev) pci_conf[0x5f] =3D 0x04; pci_conf[0x77] =3D 0x10; /* GPIO Control 1/2/3/4 */ =20 - vt82c->superio_conf.config[0xe0] =3D 0x3c; - vt82c->superio_conf.config[0xe2] =3D 0x03; - vt82c->superio_conf.config[0xe3] =3D 0xfc; - vt82c->superio_conf.config[0xe6] =3D 0xde; - vt82c->superio_conf.config[0xe7] =3D 0xfe; - vt82c->superio_conf.config[0xe8] =3D 0xbe; + s->superio_conf.config[0xe0] =3D 0x3c; + s->superio_conf.config[0xe2] =3D 0x03; + s->superio_conf.config[0xe3] =3D 0xfc; + s->superio_conf.config[0xe6] =3D 0xde; + s->superio_conf.config[0xe7] =3D 0xfe; + s->superio_conf.config[0xe8] =3D 0xbe; } =20 /* write config pci function0 registers. PCI-ISA bridge */ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len) { - VT82C686BISAState *vt686 =3D VT82C686B_ISA(d); + VT82C686BISAState *s =3D VT82C686B_ISA(d); =20 trace_via_isa_write(addr, val, len); pci_default_write_config(d, addr, val, len); if (addr =3D=3D 0x85) { /* enable or disable super IO configure */ - memory_region_set_enabled(&vt686->superio, val & 0x2); + memory_region_set_enabled(&s->superio, val & 0x2); } } =20 @@ -289,7 +289,7 @@ static const VMStateDescription vmstate_via =3D { /* init the PCI-to-ISA bridge */ static void vt82c686b_realize(PCIDevice *d, Error **errp) { - VT82C686BISAState *vt82c =3D VT82C686B_ISA(d); + VT82C686BISAState *s =3D VT82C686B_ISA(d); uint8_t *pci_conf; ISABus *isa_bus; uint8_t *wmask; @@ -311,15 +311,15 @@ static void vt82c686b_realize(PCIDevice *d, Error **e= rrp) } } =20 - memory_region_init_io(&vt82c->superio, OBJECT(d), &superio_ops, - &vt82c->superio_conf, "superio", 2); - memory_region_set_enabled(&vt82c->superio, false); + memory_region_init_io(&s->superio, OBJECT(d), &superio_ops, + &s->superio_conf, "superio", 2); + memory_region_set_enabled(&s->superio, false); /* * The floppy also uses 0x3f0 and 0x3f1. * But we do not emulate a floppy, so just set it here. */ memory_region_add_subregion(isa_bus->address_space_io, 0x3f0, - &vt82c->superio); + &s->superio); } =20 static void via_class_init(ObjectClass *klass, void *data) --=20 2.26.2