From nobody Tue Nov 18 10:37:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707083; cv=none; d=zohomail.com; s=zohoarc; b=VFfbpm8Xp1KDYkBhaCPLmWloHxHeK2FlenNQROCDkFvXWE2SrSZT8Q0ZmCs6XIaimUFWZzsnDWrI95TKamJG8UfkrAWgjyGiYj1JC0XySgzLAlctmcmTL8qYiS1es8vFa1flD8X31WnTTypoTJDDvzaoF+DWvrezckzcKYBB+Sg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RGc4PmwDJUY2QF+j34alJTh7Sm+vszH5LRr0q8NCyew=; b=UT5ddVTibHyEa/valj0UDC9BHtP8i6W30gH2blfcPFKwHNXIqnhyWmfn/yngZu7y9LxhCMMNZ+T1L+913QxrH9bYd7xLNcGgRbZR/IPnhEtOJOm40OKFjXtBGDazTa3ze9BI51sGumzTC7OXT3E1KHSFs/mxF2phb16TMMDG7JY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1609707083591207.82200178651294; Sun, 3 Jan 2021 12:51:23 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id 3so16637440wmg.4 for ; Sun, 03 Jan 2021 12:51:23 -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 c16sm65638470wrx.51.2021.01.03.12.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:21 -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=RGc4PmwDJUY2QF+j34alJTh7Sm+vszH5LRr0q8NCyew=; b=bYJWn38kCuUHBNggzd9rpovN13G8cx52I4Xl5uD2wmFJqBwkEGEAIRLem2Za1gGiAB AvswtiSQOYkSBuyd7T4q1Arm+y9ALJhzHvTbC3gSw/KA41kYk5auMVH6raLjWLM0uT/g +2MMKrVRgYwK0nRcXb6joMoRh1UnWGklokrIzHd27vZt3Jk3pUhByJutjSlcWqWXLadt H7mUl6qD0Vx5lImo3jDndxTq0Yljs6OL5Il8yArP3DiPmlU8ujJycVneIgdrU00LPypA i2oY5r2U6U6wozW9UxA4OXYTzsuf0Gs6neZkN4ptLunBSzLDYkCZPG8LUjgF/hsoERj1 PKXQ== 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=RGc4PmwDJUY2QF+j34alJTh7Sm+vszH5LRr0q8NCyew=; b=Ki1rO+jg1Yd2ynASd+Nj/NYKj4aA11BTmkMmtFXUbL8lhgTzFSc0h0QgxHssA7fX8k MnDEt54JZ2+3r4U4oTq4RtTHV0NicG5VhErqXOVt3IJDT5ps1P24CYkwbFNfevRtw7di vJqWmB7WNBhn/a1tAIesTubJw8AsiWJh87x3NeTUhhdq70pN3TBBl9RlncLstNqHHCiJ UqFExZ597ZYTx3SQpH1iMI6RfPuekAC6ROYH8pJZVp8Jia0nqrYVadcRqpGcmoKt/QNY 1dl6yFGzm0g0jJ8TCOM+zFX9Y3bT4D35jMhuLLosjviwfSm+gJttZRSd+uKjISvL5q/r xi/A== X-Gm-Message-State: AOAM530+3qoxjWPSB42ju0j1WQFGD4tdMwFjw6egRyiI4hWzP68NEFcw UeKTRp9K4tZTGc/gdNlN+dE= X-Google-Smtp-Source: ABdhPJw8BPqVtZQ01ieEAc934Sjb5eHx2Q7vdYFX5kWjzOQ3nQppCGBavS9Jc8B12GlSbUidLb69Ug== X-Received: by 2002:a1c:6856:: with SMTP id d83mr25172660wmc.119.1609707081844; Sun, 03 Jan 2021 12:51:21 -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 12/35] audio/via-ac97: Simplify code and set user_creatable to false Date: Sun, 3 Jan 2021 21:49:58 +0100 Message-Id: <20210103205021.2837760-13-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 Remove some unneded, empty code and set user_creatable to false (besides being not implemented yet, so does nothing anyway) it's also normally part of VIA south bridge chips so no need to confuse users showing them these devices. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/via-ac97.c | 51 +++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/hw/audio/via-ac97.c b/hw/audio/via-ac97.c index e617416ff76..6d556f74fc9 100644 --- a/hw/audio/via-ac97.c +++ b/hw/audio/via-ac97.c @@ -13,27 +13,13 @@ #include "hw/isa/vt82c686.h" #include "hw/pci/pci.h" =20 -struct VIAAC97State { - PCIDevice dev; -}; - -struct VIAMC97State { - PCIDevice dev; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) - -static void via_ac97_realize(PCIDevice *dev, Error **errp) +static void via_ac97_realize(PCIDevice *pci_dev, Error **errp) { - VIAAC97State *s =3D VIA_AC97(dev); - uint8_t *pci_conf =3D s->dev.config; - - pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | - PCI_COMMAND_PARITY); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST | - PCI_STATUS_DEVSEL_MEDIUM); - pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); + pci_set_word(pci_dev->config + PCI_COMMAND, + PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY); + pci_set_word(pci_dev->config + PCI_STATUS, + PCI_STATUS_CAP_LIST | PCI_STATUS_DEVSEL_MEDIUM); + pci_set_long(pci_dev->config + PCI_INTERRUPT_PIN, 0x03); } =20 static void via_ac97_class_init(ObjectClass *klass, void *data) @@ -47,13 +33,15 @@ static void via_ac97_class_init(ObjectClass *klass, voi= d *data) k->revision =3D 0x50; k->class_id =3D PCI_CLASS_MULTIMEDIA_AUDIO; set_bit(DEVICE_CATEGORY_SOUND, dc->categories); - dc->desc =3D "AC97"; + dc->desc =3D "VIA AC97"; + /* Reason: Part of a south bridge chip */ + dc->user_creatable =3D false; } =20 static const TypeInfo via_ac97_info =3D { .name =3D TYPE_VIA_AC97, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VIAAC97State), + .instance_size =3D sizeof(PCIDevice), .class_init =3D via_ac97_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, @@ -61,15 +49,12 @@ static const TypeInfo via_ac97_info =3D { }, }; =20 -static void via_mc97_realize(PCIDevice *dev, Error **errp) +static void via_mc97_realize(PCIDevice *pci_dev, Error **errp) { - VIAMC97State *s =3D VIA_MC97(dev); - uint8_t *pci_conf =3D s->dev.config; - - pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | - PCI_COMMAND_VGA_PALETTE); - pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); - pci_set_long(pci_conf + PCI_INTERRUPT_PIN, 0x03); + pci_set_word(pci_dev->config + PCI_COMMAND, + PCI_COMMAND_INVALIDATE | PCI_COMMAND_VGA_PALETTE); + pci_set_word(pci_dev->config + PCI_STATUS, PCI_STATUS_DEVSEL_MEDIUM); + pci_set_long(pci_dev->config + PCI_INTERRUPT_PIN, 0x03); } =20 static void via_mc97_class_init(ObjectClass *klass, void *data) @@ -83,13 +68,15 @@ static void via_mc97_class_init(ObjectClass *klass, voi= d *data) k->class_id =3D PCI_CLASS_COMMUNICATION_OTHER; k->revision =3D 0x30; set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); - dc->desc =3D "MC97"; + dc->desc =3D "VIA MC97"; + /* Reason: Part of a south bridge chip */ + dc->user_creatable =3D false; } =20 static const TypeInfo via_mc97_info =3D { .name =3D TYPE_VIA_MC97, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VIAMC97State), + .instance_size =3D sizeof(PCIDevice), .class_init =3D via_mc97_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.26.2