From nobody Fri May 17 09:38:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632679017; cv=none; d=zohomail.com; s=zohoarc; b=IFSywECJTuhs/U3A8BSFfDR/ZU6Bq4maPhopGBtEsIOmePocJSPrfcxti6tGtm7YgHSF2oogog8UAC3vTS6uM0d8NGyZaFGdQmekOUd/95X0EddQM3bS4OwtYcC1PvcX6wyx7ftwvtphm2GRm05BTwFDzMqMXdctrRc1va5YAtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632679017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FPXJV62TB4NXEKfsor64tTCoCfKx12CzkiEiOU9oIyg=; b=fTZXFIQcMOo0xcdhODvTf5eJV1G0uFHatWnnHqbHjvPgMvsTWDMpyjflL0frgl4Qx16z40uOCmhZl0jKWQxk1vmtXD+uBiF19gQgrvqyr6u0tafs0Ilmc/YJlIXaHkE10ZGiS/FdpqrmsJ9K6purCWh3MjnsOgmE/mm46K08igw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632679017698769.4967176998983; Sun, 26 Sep 2021 10:56:57 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id x20so355422wrg.10 for ; Sun, 26 Sep 2021 10:56:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id h15sm14078043wrc.19.2021.09.26.10.56.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 10:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FPXJV62TB4NXEKfsor64tTCoCfKx12CzkiEiOU9oIyg=; b=n426p2QUEZN0NeqLFCHuwTjYbV1lo2Pt5wPaAl8uWIXEmV+G3H8y14eDH1ulXtTcZP OPG8RjsIW6XHbytC+QJkcmXuQHruvj5wudRVq3CLtKOoCI9Zacfuk6yiJb7np2WjwDua ANzf/iZRObT94EZeEHQDvUNaGJFNxup+Lo/SlrYTEb/igtb+rM2FLm3red0aoXyBEWwN YI1lli8xVhaeNyWBztGERz2hDhdYHa8x3izoEg0+xgFPNlg3qlzv7h+4pv6jb5T9PmxP yLkVyNLZx/RisK5IVYKu1qiv93upM/ebOdycECCISRcmxGNB0K/YjxnDx2vwHdVega07 ldsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FPXJV62TB4NXEKfsor64tTCoCfKx12CzkiEiOU9oIyg=; b=075xS5L/oILpq03QX5Ooan66sx2Qmqoc3M0iYeaAOR3oSKNQ81H6FUFrPyt8+WnDaN 0PcU+5SiASlAMUqep6kvzG+5nEbR9MXRKzGKjnErKCewlNrKqzL2eyuxM0QBfB14ZIUF h/waOEmZe7E+EbRfU/8Mi0B3Aq7Ac5EbWZ4r1dyXCPWSCZx0/VtauVWGPBx8cvjXyseY Qbk5vF8RGqMTuGa9YyQ88v4t9sc2dfbWj70fhEbWJuNBM7D7Mn+kfcCxzvM2KFKEBCHl RF2VROKm4yjuEVPpN+mzbJPlW8XmBX5+nuWLLeoYtNmilR24bqsaTh0TO833H8HQN1Nh 6fRA== X-Gm-Message-State: AOAM530Dpijd1Ue2C0haUZRhMREs0csWm2KmNLTUjOn1Rm5SxAyLxjDK fJki38Au7uXaW7GiNQEKrMk= X-Google-Smtp-Source: ABdhPJya9SLaApBfx9w4Anq2k8ycX+H/1l3rL6DmjaH3tEFegBQGw/0Vvia6FacUtcjGP6653OSQtQ== X-Received: by 2002:a05:6000:1844:: with SMTP id c4mr22712676wri.355.1632679015944; Sun, 26 Sep 2021 10:56:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Paolo Bonzini , Eduardo Habkost , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/i386/amd_iommu: Rename amdviPCI TypeInfo Date: Sun, 26 Sep 2021 19:56:46 +0200 Message-Id: <20210926175648.1649075-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926175648.1649075-1-f4bug@amsat.org> References: <20210926175648.1649075-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) X-ZM-MESSAGEID: 1632679018900100001 Per 'QEMU Coding Style': Naming =3D=3D=3D=3D=3D=3D Variables are lower_case_with_underscores; easy to type and read. Rename amdviPCI variable as amdvi_pci. amdviPCI_register_types() register more than PCI types: TYPE_AMD_IOMMU_DEVICE inherits TYPE_X86_IOMMU_DEVICE which itself inherits TYPE_SYS_BUS_DEVICE. Rename it more generically as amdvi_register_types(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/amd_iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 2801dff97cd..0c994facde9 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1621,7 +1621,7 @@ static const TypeInfo amdvi =3D { .class_init =3D amdvi_class_init }; =20 -static const TypeInfo amdviPCI =3D { +static const TypeInfo amdvi_pci =3D { .name =3D TYPE_AMD_IOMMU_PCI, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(AMDVIPCIState), @@ -1645,11 +1645,11 @@ static const TypeInfo amdvi_iommu_memory_region_inf= o =3D { .class_init =3D amdvi_iommu_memory_region_class_init, }; =20 -static void amdviPCI_register_types(void) +static void amdvi_register_types(void) { - type_register_static(&amdviPCI); + type_register_static(&amdvi_pci); type_register_static(&amdvi); type_register_static(&amdvi_iommu_memory_region_info); } =20 -type_init(amdviPCI_register_types); +type_init(amdvi_register_types); --=20 2.31.1 From nobody Fri May 17 09:38:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632679022; cv=none; d=zohomail.com; s=zohoarc; b=BZW/rnqB9wB4X95BwSsa6aIVGK9uavn6JZiElRdHXOi0aWbxrg1XhvxKLtI3yziPg0zpdPmVPg56Yh1QSU5+XgHQxDpbH7nfTa4pL+6kk0tv9rWu6TP9AkUTPhVG4Htps3YuLFhEV4TuCsQDS+kuPylwzNFnbveJaP+DfnwPRag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632679022; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9YUN00M5wKMJ+847wyzLLmd2IsVZb71HnbACubJCRK4=; b=jsZ1GbmFmdBcwMXODbPV5bH7/nT1knnawctrLky2KS6RYUXO8WlHIg+qNymAzg4OHQN3F50NcMSGIzt+QAb610qLYgP17n9QFI0bP3dUPrJfFoO3w77aCaw/ycDqrRrAZnWgKbjrxodg1BJca+5kOHA3GDLIUve6nCdUaM7O2cQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632679022728191.94031656132017; Sun, 26 Sep 2021 10:57:02 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id s21so5032994wra.7 for ; Sun, 26 Sep 2021 10:57:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a3sm1734158wrn.16.2021.09.26.10.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 10:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9YUN00M5wKMJ+847wyzLLmd2IsVZb71HnbACubJCRK4=; b=cIyLuyx1aVviM9BoEQzToHvV2LcvxRl+tb9AHPT5dkRgBZ8Wqn1MP8ULhVOMfd/QBO zKTPWBsSkhl1k44R7gIGmU18XrX+o5G4FWnQ0EWeqfGnRH67FxEzP5bWfMMOZ2tsnght 4WVzP4Iu+cjt4P4rdJyoOGmaVDk+8N3ETCoYbLN28udb5+YjHf+I5bRyl2PHAs+7Qbjm rD6nFjG4vAoZphXrq4XN+IkwkxGIUW22vZCUJJfzjDhMsNfPBgMvnGojE0XnzrH6/+WX ecyWzuMGRrvMEdIMCc2a77luGnNSt6nhwvQweIMCZufrIynxh3069WF61RKm0FLWcXdK 19fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9YUN00M5wKMJ+847wyzLLmd2IsVZb71HnbACubJCRK4=; b=PpzsShbnZMH4+NqKnEURhZUjmLRO3DuguxTYgk2zcQPrNbDIiQWjGYu9OmqANgDV/D JSNLjQkSudDJNjeFt3HIAbzewZadCQ05VKMDf8NwgpNcqCBx9mdmc2RGLI2zP3m40iMz KpwSUi3h0nTsaGmodSqE5/3F5KMZEyVq2T/VCG3+fzhe4DRiPzu7rqiSuxxeXHa81diN r3H6vW8s14kadPXiAY7VRnJ9CWcvUtZmSkNWC3zw2jVkP2T2deWKiXI8507Sla+RwPZz konOQZk1DadvMg9fiPeG8pLhD0nYnzp1/6rnFxdI5Zff1gRhvVEBa3etFq6QpiBt5AC/ XTiw== X-Gm-Message-State: AOAM5301LK3TQfDLFskrRFEdhc9g5Ao8q5iALFOflNldk2fpK4I92FGu kSapNhA26HF6wW9ebRSr2qY= X-Google-Smtp-Source: ABdhPJx9rg9I2S3wjmIYQA2UnBhC/3+FF4XwEfngp31Wb/+AQ9uuDPe3rMxewlOvjLpfybjW2CU8hw== X-Received: by 2002:a1c:7e10:: with SMTP id z16mr12539543wmc.141.1632679020715; Sun, 26 Sep 2021 10:57:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Paolo Bonzini , Eduardo Habkost , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hw/i386/amd_iommu: Rename SysBus specific functions as amdvi_sysbus_X() Date: Sun, 26 Sep 2021 19:56:47 +0200 Message-Id: <20210926175648.1649075-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926175648.1649075-1-f4bug@amsat.org> References: <20210926175648.1649075-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) X-ZM-MESSAGEID: 1632679023306100001 Various functions are SysBus specific. Rename them using the consistent amdvi_sysbus_XXX() pattern, to differentiate them from PCI specific functions (which we'll add in the next commit). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/amd_iommu.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 0c994facde9..9014690ba3a 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1526,7 +1526,7 @@ static void amdvi_init(AMDVIState *s) AMDVI_MAX_PH_ADDR | AMDVI_MAX_GVA_ADDR | AMDVI_MAX_VA_ADDR); } =20 -static void amdvi_reset(DeviceState *dev) +static void amdvi_sysbus_reset(DeviceState *dev) { AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); =20 @@ -1534,7 +1534,7 @@ static void amdvi_reset(DeviceState *dev) amdvi_init(s); } =20 -static void amdvi_realize(DeviceState *dev, Error **errp) +static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { int ret =3D 0; AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); @@ -1585,27 +1585,27 @@ static void amdvi_realize(DeviceState *dev, Error *= *errp) amdvi_init(s); } =20 -static const VMStateDescription vmstate_amdvi =3D { +static const VMStateDescription vmstate_amdvi_sysbus =3D { .name =3D "amd-iommu", .unmigratable =3D 1 }; =20 -static void amdvi_instance_init(Object *klass) +static void amdvi_sysbus_instance_init(Object *klass) { AMDVIState *s =3D AMD_IOMMU_DEVICE(klass); =20 object_initialize(&s->pci, sizeof(s->pci), TYPE_AMD_IOMMU_PCI); } =20 -static void amdvi_class_init(ObjectClass *klass, void* data) +static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); X86IOMMUClass *dc_class =3D X86_IOMMU_DEVICE_CLASS(klass); =20 - dc->reset =3D amdvi_reset; - dc->vmsd =3D &vmstate_amdvi; + dc->reset =3D amdvi_sysbus_reset; + dc->vmsd =3D &vmstate_amdvi_sysbus; dc->hotpluggable =3D false; - dc_class->realize =3D amdvi_realize; + dc_class->realize =3D amdvi_sysbus_realize; dc_class->int_remap =3D amdvi_int_remap; /* Supported by the pc-q35-* machine types */ dc->user_creatable =3D true; @@ -1613,12 +1613,12 @@ static void amdvi_class_init(ObjectClass *klass, vo= id* data) dc->desc =3D "AMD IOMMU (AMD-Vi) DMA Remapping device"; } =20 -static const TypeInfo amdvi =3D { +static const TypeInfo amdvi_sysbus =3D { .name =3D TYPE_AMD_IOMMU_DEVICE, .parent =3D TYPE_X86_IOMMU_DEVICE, .instance_size =3D sizeof(AMDVIState), - .instance_init =3D amdvi_instance_init, - .class_init =3D amdvi_class_init + .instance_init =3D amdvi_sysbus_instance_init, + .class_init =3D amdvi_sysbus_class_init }; =20 static const TypeInfo amdvi_pci =3D { @@ -1648,7 +1648,7 @@ static const TypeInfo amdvi_iommu_memory_region_info = =3D { static void amdvi_register_types(void) { type_register_static(&amdvi_pci); - type_register_static(&amdvi); + type_register_static(&amdvi_sysbus); type_register_static(&amdvi_iommu_memory_region_info); } =20 --=20 2.31.1 From nobody Fri May 17 09:38:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632679027; cv=none; d=zohomail.com; s=zohoarc; b=ieCiySMvzk1Yq4cCxXDKfE7a28VDL5Hf6OutImsJ6je0W6XCxhteZ9rFeB4SgVGLl1YGduMfu1ou4Q8ep9BqnktAGFIyO7jt4Sz8fwaf07OYdKgKNZDsUcQwIGy+PDO/ALLjdsGTtXpAP5bLMCkiyvevWwE4V44jKA9RlyGdMj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632679027; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jvqRK4Z3bdPv/1YidtRVaHsIt5mmLgAbnxJvc6rWeOY=; b=cKi3mLvfcYdvwQI6KxqwOnDjDWd25zRqLa8cmTStTDroSQMurSbWOm1Yl8UllizRLkHOkJonCQIm2iV3KRszRYnUPeLpAg64wbSMlTA2CQEBqu/jjwSudEgru6m0RAj+3JuhFpu8IIhJN45vAwUvjadicZc+IIEmFT7skFohfOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632679027217366.7534771690116; Sun, 26 Sep 2021 10:57:07 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id t18so45110985wrb.0 for ; Sun, 26 Sep 2021 10:57:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a72sm18919583wme.5.2021.09.26.10.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 10:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jvqRK4Z3bdPv/1YidtRVaHsIt5mmLgAbnxJvc6rWeOY=; b=cIn7FVQh4RMmE1zr384PbkA3Wi06HLIFp3QYRDMUUOgesCR6HszXWE7xPedMuadbAP Y5321Imtl+QWLbWbrDvUS+AEoVA9plMRRLUKt+ENF+BLrIKxZPeUD/JZE/t6rnezjoQK nAqudy74ASh177PkUxNsxjjJmbFSF55jG8c+XaeNg4xqQK2IMxXeLas7O+8oztXM9H+o ampaDFV9+6CIF+UiFpVKqCrLFaGGtzRNPOngZvK03Xs9uJDUw6Wo40g6TlfGbj/hSz6y y2KkIUOOAqUdvEMo7DyU0I7CBw4PM49UUE8YVglwukwrX7lgTu9viiydgLP+yHmFz67T 3zHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jvqRK4Z3bdPv/1YidtRVaHsIt5mmLgAbnxJvc6rWeOY=; b=564bfBqJzcR/p0LE7t6dvC7mB4feUAlDvK1xHIQkvc77j+XN/mq0/8sLsNNB588wfb SHEsonRkuFd7gmFQqtx0YmLpyJzOg+NrkbshlQhGHZTHPFNHHXwITcy3c3sB1aUBt2eN UljbvV/SySdNdUgh3xRZI2X0GNhtUd0wLcEQUKLcvaReLyawdpEtGTuqAQ/EC9hwZQzR q7WibTE+4EkC9kBTHfQSWl+8e/ZBoUdizRlW1aGZJ5+D1UYup8kOd5MvYPBXEvo6JH6L 7I23aGdlS/opJTjN7R0JEboEct7nYajHgje/ClUwS9+QvKMMWID9bWCXr975xO5SZefY z4Fg== X-Gm-Message-State: AOAM533N1wcAAz20FlmhGorE7uV2TWO2MX6zZJpo85s9F+Z68dYbSxoE bbTpc/q1h/P0dMGLcbDeElY= X-Google-Smtp-Source: ABdhPJzWFaeXI2saIAKE36Kv6vIhdV77FZdm4oDd973pjzBRub5olz1xPpNpAmF08NjPS3aRXNRFKw== X-Received: by 2002:a5d:63d2:: with SMTP id c18mr22599828wrw.311.1632679025490; Sun, 26 Sep 2021 10:57:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Richard Henderson , Paolo Bonzini , Eduardo Habkost , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] hw/i386/amd_iommu: Add description/category to TYPE_AMD_IOMMU_PCI Date: Sun, 26 Sep 2021 19:56:48 +0200 Message-Id: <20210926175648.1649075-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926175648.1649075-1-f4bug@amsat.org> References: <20210926175648.1649075-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) X-ZM-MESSAGEID: 1632679029283100001 TYPE_AMD_IOMMU_PCI is user-creatable but not well described. Implement its class_init() handler to add it to the 'Misc devices' category, and add a description. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/amd_iommu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 9014690ba3a..9242a0d3ed8 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1621,10 +1621,19 @@ static const TypeInfo amdvi_sysbus =3D { .class_init =3D amdvi_sysbus_class_init }; =20 +static void amdvi_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc =3D "AMD IOMMU (AMD-Vi) DMA Remapping device"; +} + static const TypeInfo amdvi_pci =3D { .name =3D TYPE_AMD_IOMMU_PCI, .parent =3D TYPE_PCI_DEVICE, .instance_size =3D sizeof(AMDVIPCIState), + .class_init =3D amdvi_pci_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { }, --=20 2.31.1