| Message ID | 1450425454-12274-1-git-send-email-caoj.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
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" }, > { } >
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" }, { }
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(-)