From: Cao jin <caoj.fnst@cn.fujitsu.com>
To: <qemu-devel@nongnu.org>
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mst@redhat.com,
ehabkost@redhat.com, rth@twiddle.net
Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH] Use macro instead of plain text
Date: Fri, 18 Dec 2015 16:26:58 +0800 [thread overview]
Message-ID: <5673C352.70006@cn.fujitsu.com> (raw)
In-Reply-To: <1450425454-12274-1-git-send-email-caoj.fnst@cn.fujitsu.com>
Sorry, it can`t pass compilation...
I will give v2 soon.
On 12/18/2015 03:57 PM, Cao jin wrote:
> There is TYPE_ICH9_AHCI definition in ahci.h when QOMify it, seems these two
> places are missed.
>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> 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" },
> { }
>
--
Yours Sincerely,
Cao Jin
WARNING: multiple messages have this Message-ID (diff)
From: Cao jin <caoj.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mst@redhat.com,
ehabkost@redhat.com, rth@twiddle.net
Subject: Re: [Qemu-devel] [PATCH] Use macro instead of plain text
Date: Fri, 18 Dec 2015 16:26:58 +0800 [thread overview]
Message-ID: <5673C352.70006@cn.fujitsu.com> (raw)
In-Reply-To: <1450425454-12274-1-git-send-email-caoj.fnst@cn.fujitsu.com>
Sorry, it can`t pass compilation...
I will give v2 soon.
On 12/18/2015 03:57 PM, Cao jin wrote:
> There is TYPE_ICH9_AHCI definition in ahci.h when QOMify it, seems these two
> places are missed.
>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> 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" },
> { }
>
--
Yours Sincerely,
Cao Jin
next prev parent reply other threads:[~2015-12-18 8:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-18 7:57 [Qemu-trivial] [PATCH] Use macro instead of plain text Cao jin
2015-12-18 7:57 ` [Qemu-devel] " Cao jin
2015-12-18 8:26 ` Cao jin [this message]
2015-12-18 8:26 ` Cao jin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5673C352.70006@cn.fujitsu.com \
--to=caoj.fnst@cn.fujitsu.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.