From patchwork Sun Oct 30 22:27:51 2022 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: 620018 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2450841pvb; Sun, 30 Oct 2022 15:32:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YvAlfWK6UX0u0G8cVgAyNlDZX5y9c6wd6e4cLByrZc2JXUCgboFf2TLObYOxFVRs69ZoB X-Received: by 2002:a05:620a:298d:b0:6ea:58bd:51a5 with SMTP id r13-20020a05620a298d00b006ea58bd51a5mr7273392qkp.493.1667169165007; Sun, 30 Oct 2022 15:32:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667169165; cv=none; d=google.com; s=arc-20160816; b=c2BrKziUFXviax3e02+F8mRznyXfVrDB4k0e0pizADtTknc6L9R6l51YYSEFM7kFhw +IZdHChk66UOD7f7fROcIy0upTE2Yj2h7aAcaRJQ2OgO1mvQkBQ9bYvfe2twPcj0VFl8 hmts9u5DCP4BbnewKyj2XM6qK1jox6iwGmc2wbPtX96Pcmw7VP2kJNvQeGaONhUuT75y OgmoMe9Mssu1ULG3xBqgD+c3itl1fYnQPt0RgT/j3S2l0xiTEps320n391fSQNsVQ8Ck M6IxF8hTjKjcRXb0F9CjqrIyt45MYYy6mxqPpMNE/j7JUzAEDS3J45EhXkb2Y6Fipldi woYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=n7QaJwgd7/+E/h1CKCmxp7Ly4mdpqr+k/rS/2LY+KMc=; b=k8ptwI12BuT5t1CONovPF0oDB/98V+N3OxZ2yWiI74twW5dhaZPcCmJ7B15n6dSSLO 5LxHV1Ydt4VkivtFuNegIKARnD/DgRJ78WYOo+bgyTV+aXe62GhaTkzc3feGubHIH0TH jRIru34LWlgFE48sCaax0ybD4bBAO90w8DoQnaNt6HxVo2YtI9DrH6e4ZkMahL6WwSiC Dj5IUapqvYQ5EFoc663mxvWe9GIoiyTPbijyD/Go4MBgLDaOzfrIQRF7N2hQEVLDEm3m L4ZfTlq4OShBkhGAPwPV1Crdvypo7mu5t+cjOI9O/9//bQSfnBlaI89gV6yvvu9FhPl6 a6Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L8urBlPR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bb41-20020a05622a1b2900b003a525d6dd77si857749qtb.440.2022.10.30.15.32.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Oct 2022 15:32:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L8urBlPR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opGo1-0000AY-8E; Sun, 30 Oct 2022 18:29:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opGnz-00008L-Ih for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:29:23 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opGnx-0007Av-Ub for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:29:23 -0400 Received: by mail-wm1-x329.google.com with SMTP id c3-20020a1c3503000000b003bd21e3dd7aso9794234wma.1 for ; Sun, 30 Oct 2022 15:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n7QaJwgd7/+E/h1CKCmxp7Ly4mdpqr+k/rS/2LY+KMc=; b=L8urBlPRUiWgCqZEeuXp/Ln2usIgqhcZoiyXxyBBEO4wcZsgftSIIstZtTBHTv3ttw RC+QIOZheuN/X47doDXXV7L2Kr0iOZY97PsrMsTYdWoqytydMzNAmndjtAbwIlbJCGnL sYP8lNS/2TEp8EOL7OyN8enV5+Q784cfro1hpAlm89VdAjRpgGG7vvpHniI2lzvZV+uK lDh1oWqSWVc4IJPkXbLIaXo+XZQdAT9gnK44b5PZ7JUqbnOWgltEQwsJmZNwafRSPMfk t7OFt+/ZjAKazMAdiEgNUK/QYLIyPD+b2tTKVwG8/+H9fKOsZRRg7HbkGcjYGz14wa/Q caDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n7QaJwgd7/+E/h1CKCmxp7Ly4mdpqr+k/rS/2LY+KMc=; b=ApDapGmeK3h7jngrcMASQThZtUGzNCB7W07OfqT3Kzz0D0nR8zCDMQ671/8GM66oPP DJX+mCR083dZlnGBVKJ4YhvY6DiQXOwTiATc+b5EVQ/U+ZRPo8G190UBtI1vLrE3kzFg uu0RkoFRLKLdQysXRs7vof+B1XzTVO6NvWrOGoABNHYsDep2dOW7ZYuzKJ0z1mtL+6H3 ahw3pvNgrBWPVYpz6OPC9RKoan9O+39W1a4BuXy5JutqgU7g94upzxlAtRg3vhafQZDR /ED/IBD1p3U48vN7BQR3SkCUw/gV0e82pAcAgfU93B6ASpaeYRaXSUCLb43rhwpprcCW lgwg== X-Gm-Message-State: ACrzQf2ubzEh8JzbpgIAyi+/v6s7G5tE5EbvGZVqMMW3cqhPd691WIMq aSPh5kk4mLdTRWX34fz80macUVGytzD+dw== X-Received: by 2002:a05:600c:2116:b0:3cf:69ff:5da2 with SMTP id u22-20020a05600c211600b003cf69ff5da2mr3971043wml.16.1667168960090; Sun, 30 Oct 2022 15:29:20 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id bs14-20020a056000070e00b0023647841c5bsm5240543wrb.60.2022.10.30.15.29.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 30 Oct 2022 15:29:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Stefan Pejic , Jiaxun Yang , Aurelien Jarno , Paul Burton , Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Daniel Henrique Barboza Subject: [PULL 05/55] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define Date: Sun, 30 Oct 2022 23:27:51 +0100 Message-Id: <20221030222841.42377-6-philmd@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221030222841.42377-1-philmd@linaro.org> References: <20221030222841.42377-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow Establishes consistency with other (VIA) devices. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Acked-by: Daniel Henrique Barboza Message-Id: <20220901114127.53914-6-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/via.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/ppc/pegasos2.c | 2 +- include/hw/isa/vt82c686.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 82def819c4..e1a429405d 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -230,7 +230,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data) } static const TypeInfo via_ide_info = { - .name = "via-ide", + .name = TYPE_VIA_IDE, .parent = TYPE_PCI_IDE, .class_init = via_ide_class_init, }; diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 5ee546f5f6..44225fbe33 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -205,7 +205,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, TYPE_VT82C686B_ISA); qdev_connect_gpio_out(DEVICE(dev), 0, intc); - dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); + dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), TYPE_VIA_IDE); pci_ide_create_devs(dev); pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index ecf682b148..0ccc130b88 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -166,7 +166,7 @@ static void pegasos2_init(MachineState *machine) qdev_get_gpio_in_named(pm->mv, "gpp", 31)); /* VT8231 function 1: IDE Controller */ - dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), "via-ide"); + dev = pci_create_simple(pci_bus, PCI_DEVFN(12, 1), TYPE_VIA_IDE); pci_ide_create_devs(dev); /* VT8231 function 2-3: USB Ports */ diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 56ac141be3..87aca3e5bb 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -8,6 +8,7 @@ #define TYPE_VT8231_ISA "vt8231-isa" #define TYPE_VT8231_PM "vt8231-pm" #define TYPE_VIA_AC97 "via-ac97" +#define TYPE_VIA_IDE "via-ide" #define TYPE_VIA_MC97 "via-mc97" void via_isa_set_irq(PCIDevice *d, int n, int level);