| Message ID | 1362417107-27069-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, March 4, 2013 18:11, Paolo Bonzini wrote: > The milkymist-minimac device in fact does not exist at all. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Michael Walle <michael@walle.cc> > --- > hw/milkymist-hw.h | 16 ---------------- > 1 file changed, 16 deletions(-) > > diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h > index c8bd7e9..5def311 100644 > --- a/hw/milkymist-hw.h > +++ b/hw/milkymist-hw.h > @@ -170,22 +170,6 @@ static inline DeviceState > *milkymist_ac97_create(hwaddr base, > return dev; > } > > -static inline DeviceState *milkymist_minimac_create(hwaddr base, > - qemu_irq rx_irq, qemu_irq tx_irq) > -{ > - DeviceState *dev; > - > - qemu_check_nic_model(&nd_table[0], "minimac"); > - dev = qdev_create(NULL, "milkymist-minimac"); > - qdev_set_nic_properties(dev, &nd_table[0]); > - qdev_init_nofail(dev); > - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); > - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); > - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); > - > - return dev; > -} > - > static inline DeviceState *milkymist_minimac2_create(hwaddr base, > hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq) > {
On Mon, Mar 04, 2013 at 06:11:47PM +0100, Paolo Bonzini wrote: > The milkymist-minimac device in fact does not exist at all. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/milkymist-hw.h | 16 ---------------- > 1 file changed, 16 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index c8bd7e9..5def311 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -170,22 +170,6 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base, return dev; } -static inline DeviceState *milkymist_minimac_create(hwaddr base, - qemu_irq rx_irq, qemu_irq tx_irq) -{ - DeviceState *dev; - - qemu_check_nic_model(&nd_table[0], "minimac"); - dev = qdev_create(NULL, "milkymist-minimac"); - qdev_set_nic_properties(dev, &nd_table[0]); - qdev_init_nofail(dev); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq); - - return dev; -} - static inline DeviceState *milkymist_minimac2_create(hwaddr base, hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq) {
The milkymist-minimac device in fact does not exist at all. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/milkymist-hw.h | 16 ---------------- 1 file changed, 16 deletions(-)