From patchwork Sun Sep 26 17:56:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1533006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=n426p2QU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HHYQs6nmbz9sW8 for ; Mon, 27 Sep 2021 03:58:13 +1000 (AEST) Received: from localhost ([::1]:55240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUYPj-0003hw-FA for incoming@patchwork.ozlabs.org; Sun, 26 Sep 2021 13:58:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUYOZ-00039M-83; Sun, 26 Sep 2021 13:56:59 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUYOX-0007In-St; Sun, 26 Sep 2021 13:56:59 -0400 Received: by mail-wr1-x429.google.com with SMTP id s21so5032577wra.7; Sun, 26 Sep 2021 10:56:57 -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=NI2TbLldwKdSfSsECmi7/HAEGXEmTwh5R5dg2OZKWHCYfWINsoCX4xfZ9Ul8gOgGxR O77kdkShmRuPFyardJKp/N6sMVA/ODKM0kQqPHv/0itJ4VECiKtDaP/U8yxol9UixMnb gj+d4/WuqZkxMJL016RS36BEO3oRlHKhYyxrZGFoFIBqJfzwUQ9pgdzIsmvQLlfCY2wu c1BeM6Y2DKxgryrfVxluVDOCuOH/PovDGkbkmGoiZcxRRjjtAxZvxmLOF6nwfevuywzW HhI1Gr+VA0sqG2pWk8++IapCmJruEpTFY7loHkN6YBzUgyY6/T868c44WBYk+yprBv2J rGhQ== X-Gm-Message-State: AOAM533AXUsWK96k5vhIQDi1C9iut8ZwqesTT/vwYJ5rU9kE/ULSWHLX 7qPnrKGxHgHEFgdKQ4WN2Uds8wdXsjk= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Per 'QEMU Coding Style': Naming ====== 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é --- 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 = { .class_init = amdvi_class_init }; -static const TypeInfo amdviPCI = { +static const TypeInfo amdvi_pci = { .name = TYPE_AMD_IOMMU_PCI, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(AMDVIPCIState), @@ -1645,11 +1645,11 @@ static const TypeInfo amdvi_iommu_memory_region_info = { .class_init = amdvi_iommu_memory_region_class_init, }; -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); } -type_init(amdviPCI_register_types); +type_init(amdvi_register_types); From patchwork Sun Sep 26 17:56:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1533005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cIyLuyx1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HHYQP2RQHz9sW8 for ; Mon, 27 Sep 2021 03:57:49 +1000 (AEST) Received: from localhost ([::1]:54656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUYPL-0003Jt-4b for incoming@patchwork.ozlabs.org; Sun, 26 Sep 2021 13:57:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUYOe-0003GI-31; Sun, 26 Sep 2021 13:57:04 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35377) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUYOc-0007MY-HH; Sun, 26 Sep 2021 13:57:03 -0400 Received: by mail-wr1-x42d.google.com with SMTP id i23so45139008wrb.2; Sun, 26 Sep 2021 10:57:01 -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=7baecXjTLJG23uH3W9/VyZeY38/+vVQl9su2flU9xETJk/5FV/D6KVLi0XVe96aNI9 1inVvLU91HGiu0sREeUOyKKZZwYGulJwlUMUxiteSqINo/sxIA5gsjYD/10pTvAA8Arb zG6/A7YViNrMcRkUAVGnxK03CkK2MFs7l4kqyvXQfNiHNnSV0g0G6QRlvf0Dw5Jagjyu VX60KaW/OhkucdmvaN4cv1MS8E6COCXDty2dqt8yOLsmCVc5VBpQAEqAsAScRgv5GXM/ QFL+eOkmeRM+j+xS+5Gn3StVfBIfZiEktim2bjoLIGYU2jW5RKy7/IOOjaxeiQ9iryCY W1iQ== X-Gm-Message-State: AOAM532WzdGpbNsGNMHb6t6oXnrXPjCgqBiImNBL4npbDLfIQKAJoTIl aRJ2Od65heHRD7ydM48UYiOktZA+ZcY= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é --- 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); } -static void amdvi_reset(DeviceState *dev) +static void amdvi_sysbus_reset(DeviceState *dev) { AMDVIState *s = AMD_IOMMU_DEVICE(dev); @@ -1534,7 +1534,7 @@ static void amdvi_reset(DeviceState *dev) amdvi_init(s); } -static void amdvi_realize(DeviceState *dev, Error **errp) +static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { int ret = 0; AMDVIState *s = AMD_IOMMU_DEVICE(dev); @@ -1585,27 +1585,27 @@ static void amdvi_realize(DeviceState *dev, Error **errp) amdvi_init(s); } -static const VMStateDescription vmstate_amdvi = { +static const VMStateDescription vmstate_amdvi_sysbus = { .name = "amd-iommu", .unmigratable = 1 }; -static void amdvi_instance_init(Object *klass) +static void amdvi_sysbus_instance_init(Object *klass) { AMDVIState *s = AMD_IOMMU_DEVICE(klass); object_initialize(&s->pci, sizeof(s->pci), TYPE_AMD_IOMMU_PCI); } -static void amdvi_class_init(ObjectClass *klass, void* data) +static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); X86IOMMUClass *dc_class = X86_IOMMU_DEVICE_CLASS(klass); - dc->reset = amdvi_reset; - dc->vmsd = &vmstate_amdvi; + dc->reset = amdvi_sysbus_reset; + dc->vmsd = &vmstate_amdvi_sysbus; dc->hotpluggable = false; - dc_class->realize = amdvi_realize; + dc_class->realize = amdvi_sysbus_realize; dc_class->int_remap = amdvi_int_remap; /* Supported by the pc-q35-* machine types */ dc->user_creatable = true; @@ -1613,12 +1613,12 @@ static void amdvi_class_init(ObjectClass *klass, void* data) dc->desc = "AMD IOMMU (AMD-Vi) DMA Remapping device"; } -static const TypeInfo amdvi = { +static const TypeInfo amdvi_sysbus = { .name = TYPE_AMD_IOMMU_DEVICE, .parent = TYPE_X86_IOMMU_DEVICE, .instance_size = sizeof(AMDVIState), - .instance_init = amdvi_instance_init, - .class_init = amdvi_class_init + .instance_init = amdvi_sysbus_instance_init, + .class_init = amdvi_sysbus_class_init }; static const TypeInfo amdvi_pci = { @@ -1648,7 +1648,7 @@ static const TypeInfo amdvi_iommu_memory_region_info = { 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); } From patchwork Sun Sep 26 17:56:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1533007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cIn7FVQh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4HHYT44tc7z9t14 for ; Mon, 27 Sep 2021 04:00:08 +1000 (AEST) Received: from localhost ([::1]:33432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUYRa-00080t-Fe for incoming@patchwork.ozlabs.org; Sun, 26 Sep 2021 14:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUYOj-0003bj-R6; Sun, 26 Sep 2021 13:57:09 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUYOh-0007Qq-DV; Sun, 26 Sep 2021 13:57:09 -0400 Received: by mail-wr1-x42e.google.com with SMTP id d6so44901974wrc.11; Sun, 26 Sep 2021 10:57:06 -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=b/RiIpkdzp/fUeTsN5B6WLQU4x4Ht5HjfBeO5+DODCjvgPz4FWPf/QHgjD6Qv5Y+ZD 4kzUUjTO9W/Ps/luXIyCrEHrgX+l2wj9pvktUCYqrCvYBSfbcaWca6Yn4YTAZ2Qo4ruI 62tveP3lELz0BEg7mW7Udl711rMP8e1ONtJJURSVrDI5j17ZFX7JU3rKu7+PVmvcAJBr KKAcR/Md+IS/6hefKCgzw/OXKX4SKg/SHaS7f6m8e2vYL+Hcd5zahClbPVGop4IQMqgE 7L1g7Py/gGLz/m+3unka4rXEXcVqyB6hWYlo0KKk2hvvUCHhP1nbYmvpZDnAASpaDAT4 RNBA== X-Gm-Message-State: AOAM532iQAuWSWoSuOLCHZs8jeh94ZjGbCXP0k7ok/y7wtbhee6MxzsT 0ZrcO/P5pbfjqJKDjNT6RPXsUpNYmrc= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é --- 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 = { .class_init = amdvi_sysbus_class_init }; +static void amdvi_pci_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc = "AMD IOMMU (AMD-Vi) DMA Remapping device"; +} + static const TypeInfo amdvi_pci = { .name = TYPE_AMD_IOMMU_PCI, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(AMDVIPCIState), + .class_init = amdvi_pci_class_init, .interfaces = (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { },