From patchwork Sat Dec 16 21:30:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 849568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=reactos.org header.i=@reactos.org header.b="GxGYuqDt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yzgkN4n8Dz9t1t for ; Sun, 17 Dec 2017 08:42:20 +1100 (AEDT) Received: from localhost ([::1]:52259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQKDq-0006fT-Pk for incoming@patchwork.ozlabs.org; Sat, 16 Dec 2017 16:42:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eQK9E-000382-7E for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eQK9D-0008Qh-D1 for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:32 -0500 Received: from iserv.reactos.org ([2a01:4f8:221:4c5::3]:40228) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eQK98-0008AN-7n for qemu-devel@nongnu.org; Sat, 16 Dec 2017 16:37:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=reactos.org; s=25047; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=X7JSpwcb+ThvYLyvOqXgM9DcISAf6MGonEFOifvgatQ=; b=GxGYuqDtyh1CcGwfsKnUMWtV/H2UditNjbB0XNwPGPDyLjn9X/D/XFWpPY8cvOS1UC0fuYTIL/1VvR+kUInm/AFPLR5rGpcMyQJGqZ4DPGY6J2WBEXRxuip+94rN2eGO79Tn4XIDIED6oEgzg3wTmXVNdhKLx+fs+eZqBwcIW+4=; Received: from [2a01:e34:ee6b:9c80:6267:20ff:fe65:a488] (helo=localhost.localdomain) by iserv.reactos.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1eQK8z-0002si-2S; Sat, 16 Dec 2017 21:37:17 +0000 From: =?utf-8?q?Herv=C3=A9_Poussineau?= To: Aurelien Jarno , Yongbok Kim , "Michael S . Tsirkin" , Paolo Bonzini , qemu-devel@nongnu.org Date: Sat, 16 Dec 2017 22:30:03 +0100 Message-Id: <20171216213004.30393-15-hpoussin@reactos.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216213004.30393-1-hpoussin@reactos.org> References: <20171216213004.30393-1-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:4f8:221:4c5::3 Subject: [Qemu-devel] [PATCH v2 14/15] piix4: rename PIIX4 object to piix4-isa X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Herv=C3=A9_Poussineau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Other piix4 parts are already named piix4-ide and piix4-usb-uhci. Signed-off-by: Hervé Poussineau Reviewed-by: Philippe Mathieu-Daudé --- hw/isa/piix4.c | 2 +- hw/mips/mips_malta.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index dc7146ee14..8bf260594f 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -52,7 +52,7 @@ typedef struct PIIX4State { uint8_t rcr; } PIIX4State; -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" +#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" #define PIIX4_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 3d304a6e0a..28d91c9668 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1178,7 +1178,7 @@ void mips_malta_init(MachineState *machine) ide_drive_get(hd, ARRAY_SIZE(hd)); pci = pci_create_multifunction(pci_bus, PCI_DEVFN(10, 0), - true, "PIIX4"); + true, "piix4-isa"); dev = DEVICE(pci); /* Floppy */