From patchwork Fri Dec 18 07:57:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cao jin X-Patchwork-Id: 558772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 623071401AF for ; Fri, 18 Dec 2015 18:56:35 +1100 (AEDT) Received: from localhost ([::1]:58862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9ptx-0002J8-B1 for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2015 02:56:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pti-0001yZ-CO for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:56:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9ptf-00018N-6J for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:56:18 -0500 Received: from [59.151.112.132] (port=13478 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pte-00016D-RS; Fri, 18 Dec 2015 02:56:15 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="1733273" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 18 Dec 2015 15:55:39 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 48230409257A; Fri, 18 Dec 2015 15:55:25 +0800 (CST) Received: from G08FNSTD140223.g08.fujitsu.local (10.167.226.86) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 18 Dec 2015 15:58:40 +0800 From: Cao jin To: Date: Fri, 18 Dec 2015 15:57:34 +0800 Message-ID: <1450425454-12274-1-git-send-email-caoj.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 X-Originating-IP: [10.167.226.86] X-yoursite-MailScanner-ID: 48230409257A.A7009 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: caoj.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH] Use macro instead of plain text X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There is TYPE_ICH9_AHCI definition in ahci.h when QOMify it, seems these two places are missed. Signed-off-by: Cao jin --- hw/i386/pc_q35.c | 2 +- qdev-monitor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9a12068..aa34a07 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -249,7 +249,7 @@ static void pc_q35_init(MachineState *machine) ahci = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_SATA1_DEV, ICH9_SATA1_FUNC), - true, "ich9-ahci"); + true, TYPE_ICH9_AHCI); idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0"); idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1"); g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports); diff --git a/qdev-monitor.c b/qdev-monitor.c index a35098f..f249603 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -48,7 +48,7 @@ static const QDevAlias qdev_alias_table[] = { { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, { "lsi53c895a", "lsi" }, - { "ich9-ahci", "ahci" }, + { TYPE_ICH9_AHCI, "ahci" }, { "kvm-pci-assign", "pci-assign" }, { "e1000", "e1000-82540em" }, { }