From nobody Tue Nov 18 10:38:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609455014; cv=none; d=zohomail.com; s=zohoarc; b=CLwuLTJxIibrxyGh8mXkZwyZVu2cu1Tj4f0hUZ7rikbwUa8MJtUpvuyT8ent5DIARDxZCzwiKIyeVsKalikwijlPzECdork4FSU2J0bJ9ttnx8FLRwHcEfkb0mOc3p+tpFicIEzhfeu1c8jKqAsToiHn9zFTM9w3qfGUFB7z1Bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609455014; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=frcRibRAQPnxHYg1S20zY4t6JJJt53NxCQQDBMLiUO/q5bwBdF7mI3+VUUpbF8ZfWwIbwywx5unIj/44vtgzQ8nbDnPkclXJyIbXUvmW8a40mVEmJ3kGkQgMR/E2vOMa3CK2jxh7VPiN8F4G7fqKjZ0rpxLBPvQYIgk+XicUHhw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1609455014734302.34165731718383; Thu, 31 Dec 2020 14:50:14 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id t30so21073707wrb.0 for ; Thu, 31 Dec 2020 14:50:14 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (239.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.239]) by smtp.gmail.com with ESMTPSA id z6sm13543546wmi.15.2020.12.31.14.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Dec 2020 14:50:12 -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=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=npSCuc/1hjruJrlW02Oq+QrLldqb2szca1XJo4t2M8b1XLorxRwU3qBRFjV4VIXKn4 VAziqQwbDQvAnwJyVyHgh2I0VWk2mCkyLfFg05UK0++lgbBQ9I424IJm6NOOaas4813m A/w7EsmgI4hd8FLfyTS8LnCcyE/+808n/Io3X3gU9fAA4U8UxNN1IqX5TQCmoQVahloe tLuZSSBhWP6YSpZVgZ0TIHthcDHEgCRL99sysGytQMBEF8G6GDLVdSlTLUp4uJM4nfrA PnflhLtkxFUt2w7pv/3vTB9rZcDvLFSPBdXtvChdApFD2UkoRo8B7nVqW6X/cRTcsB5i Af8Q== 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=CkkCkigPnvkDdlnvDUJIeN8a+2TZP6cajuRXrtCGtgw=; b=OnsrMYecjYO3ZHqfq1FBMVxozBf4D3Q9d70zRpCU+bPwW8ZlkvGW1AmlRHt6V8CDb8 cL02dnI6Eq2efWToousi/8k+uMluK7Jq59IybCNNRA71DIV7TPdH1HipmeyYKqCkO3pQ 8ZGSyW4s7mtoSSNdUrUbVuCx0ZvjJOWw3iUgurdCd/CAY8W8oJ3t4H7iBsaByzh0bgZA huhU8+wLCkYf+cVXnDPPD3NH7lQwS/nV8vc4IF+axhCSMnrOz7UotrI9hp12Y33Z+hmg HvjebdOsxBlcGY/VAZNzac3glpduiDuuHVWftge+L2zBWNa9cUxEwH/h/87bz4mibu1L AAKw== X-Gm-Message-State: AOAM530mUAmWKj8D3ROQqWgpaD/jaBTe4suvND2ES4JkUAsYRAwMGQ4a KmW5TmK4v2s8NbaU7CkwM8U= X-Google-Smtp-Source: ABdhPJyV8YR4FTlTCmVi3ndNvh4kOICiBdMBQ/eOrpLHv91aVd36Y1udH3KPtyOr8H9Coct2Kl+rnA== X-Received: by 2002:a5d:4987:: with SMTP id r7mr67758313wrq.352.1609455012945; Thu, 31 Dec 2020 14:50:12 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Rikalo , Aurelien Jarno , Huacai Chen Subject: [PATCH 12/18] hw/pci-host/bonito: Rename PCIBonitoState -> BonitoPciState Date: Thu, 31 Dec 2020 23:49:05 +0100 Message-Id: <20201231224911.1467352-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201231224911.1467352-1-f4bug@amsat.org> References: <20201231224911.1467352-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) As we use BonitoState for the whole device, rename the PCI function device as BonitoPciState. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci-host/bonito.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 06f5e683c81..1c88ccc6af8 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -200,7 +200,7 @@ FIELD(PCIMAP, 2G, 18, 1) =20 typedef struct BonitoState BonitoState; =20 -struct PCIBonitoState { +struct BonitoPciState { PCIDevice dev; =20 BonitoState *pcihost; @@ -229,12 +229,12 @@ struct PCIBonitoState { MemoryRegion bonito_localio; =20 }; -typedef struct PCIBonitoState PCIBonitoState; +typedef struct BonitoPciState BonitoPciState; =20 struct BonitoState { PCIHostState parent_obj; qemu_irq *pic; - PCIBonitoState *pci_dev; + BonitoPciState *pci_dev; MemoryRegion pci_mem; MemoryRegion pcimem_lo_alias[3]; }; @@ -243,9 +243,9 @@ struct BonitoState { OBJECT_DECLARE_SIMPLE_TYPE(BonitoState, BONITO_PCI_HOST_BRIDGE) =20 #define TYPE_PCI_BONITO "Bonito" -OBJECT_DECLARE_SIMPLE_TYPE(PCIBonitoState, PCI_BONITO) +OBJECT_DECLARE_SIMPLE_TYPE(BonitoPciState, PCI_BONITO) =20 -static void bonito_remap(PCIBonitoState *s) +static void bonito_remap(BonitoPciState *s) { static const char *const region_name[3] =3D { "pci.lomem0", "pci.lomem1", "pci.lomem2" @@ -273,7 +273,7 @@ static void bonito_remap(PCIBonitoState *s) static void bonito_northbridge_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t saddr; =20 saddr =3D addr >> 2; @@ -338,7 +338,7 @@ static void bonito_northbridge_write(void *opaque, hwad= dr addr, static uint64_t bonito_northbridge_read(void *opaque, hwaddr addr, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t saddr; =20 saddr =3D addr >> 2; @@ -365,7 +365,7 @@ static const MemoryRegionOps bonito_northbridge_ops =3D= { static void bonito_pciconf_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); =20 DPRINTF("bonito_pciconf_writel "TARGET_FMT_plx" val %lx\n", addr, val); @@ -376,7 +376,7 @@ static uint64_t bonito_pciconf_readl(void *opaque, hwad= dr addr, unsigned size) { =20 - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); =20 DPRINTF("bonito_pciconf_readl "TARGET_FMT_plx"\n", addr); @@ -399,7 +399,7 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr = addr, unsigned size) { uint32_t val; - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->bonldma)) { return 0; @@ -413,7 +413,7 @@ static uint64_t bonito_ldma_readl(void *opaque, hwaddr = addr, static void bonito_ldma_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->bonldma)) { return; @@ -436,7 +436,7 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr a= ddr, unsigned size) { uint32_t val; - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->boncop)) { return 0; @@ -450,7 +450,7 @@ static uint64_t bonito_cop_readl(void *opaque, hwaddr a= ddr, static void bonito_cop_writel(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; =20 if (addr >=3D sizeof(s->boncop)) { return; @@ -471,7 +471,7 @@ static const MemoryRegionOps bonito_cop_ops =3D { =20 static uint32_t bonito_sbridge_pciaddr(void *opaque, hwaddr addr) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t cfgaddr; uint32_t idsel; @@ -509,7 +509,7 @@ static uint32_t bonito_sbridge_pciaddr(void *opaque, hw= addr addr) static void bonito_spciconf_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; @@ -536,7 +536,7 @@ static void bonito_spciconf_write(void *opaque, hwaddr = addr, uint64_t val, =20 static uint64_t bonito_spciconf_read(void *opaque, hwaddr addr, unsigned s= ize) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; PCIDevice *d =3D PCI_DEVICE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); uint32_t pciaddr; @@ -578,7 +578,7 @@ static void bonito_host_set_irq(void *opaque, int irq_n= um, int level) { BonitoState *s =3D opaque; qemu_irq *pic =3D s->pic; - PCIBonitoState *bonito_state =3D s->pci_dev; + BonitoPciState *bonito_state =3D s->pci_dev; int internal_irq =3D irq_num - BONITO_IRQ_BASE; =20 if (bonito_state->regs[BONITO_INTEDGE] & (1 << internal_irq)) { @@ -615,7 +615,7 @@ static int bonito_host_map_irq(PCIDevice *pci_dev, int = irq_num) =20 static void bonito_reset(void *opaque) { - PCIBonitoState *s =3D opaque; + BonitoPciState *s =3D opaque; uint32_t val =3D 0; =20 /* set the default value of north bridge registers */ @@ -645,7 +645,7 @@ static const VMStateDescription vmstate_bonito =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, PCIBonitoState), + VMSTATE_PCI_DEVICE(dev, BonitoPciState), VMSTATE_END_OF_LIST() } }; @@ -666,7 +666,7 @@ static void bonito_host_realize(DeviceState *dev, Error= **errp) =20 static void bonito_pci_realize(PCIDevice *dev, Error **errp) { - PCIBonitoState *s =3D PCI_BONITO(dev); + BonitoPciState *s =3D PCI_BONITO(dev); SysBusDevice *sysbus =3D SYS_BUS_DEVICE(s->pcihost); PCIHostState *phb =3D PCI_HOST_BRIDGE(s->pcihost); BonitoState *bs =3D BONITO_PCI_HOST_BRIDGE(s->pcihost); @@ -760,7 +760,7 @@ PCIBus *bonito_init(qemu_irq *pic) DeviceState *dev; BonitoState *pcihost; PCIHostState *phb; - PCIBonitoState *s; + BonitoPciState *s; PCIDevice *d; =20 dev =3D qdev_new(TYPE_BONITO_PCI_HOST_BRIDGE); @@ -800,7 +800,7 @@ static void bonito_pci_class_init(ObjectClass *klass, v= oid *data) static const TypeInfo bonito_pci_info =3D { .name =3D TYPE_PCI_BONITO, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(PCIBonitoState), + .instance_size =3D sizeof(BonitoPciState), .class_init =3D bonito_pci_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.26.2