mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysbus: remove unused sysbus_try_create*

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Marc-André Lureau 2019-10-22 19:18:12 +02:00
parent 7aca3782d9
commit 7e83a77f96
3 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/core/sysbus.c
View File

@ -250,38 +250,6 @@ DeviceState *sysbus_create_varargs(const char *name,
return dev; return dev;
} }
DeviceState *sysbus_try_create_varargs(const char *name,
hwaddr addr, ...)
{
DeviceState *dev;
SysBusDevice *s;
va_list va;
qemu_irq irq;
int n;
dev = qdev_try_create(NULL, name);
if (!dev) {
return NULL;
}
s = SYS_BUS_DEVICE(dev);
qdev_init_nofail(dev);
if (addr != (hwaddr)-1) {
sysbus_mmio_map(s, 0, addr);
}
va_start(va, addr);
n = 0;
while (1) {
irq = va_arg(va, qemu_irq);
if (!irq) {
break;
}
sysbus_connect_irq(s, n, irq);
n++;
}
va_end(va);
return dev;
}
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent)
{ {
SysBusDevice *s = SYS_BUS_DEVICE(dev); SysBusDevice *s = SYS_BUS_DEVICE(dev);

1
hw/i386/pc.c
View File

@ -1198,7 +1198,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
* when the HPET wants to take over. Thus we have to disable the latter. * when the HPET wants to take over. Thus we have to disable the latter.
*/ */
if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) { if (!no_hpet && (!kvm_irqchip_in_kernel() || kvm_has_pit_state2())) {
/* In order to set property, here not using sysbus_try_create_simple */
hpet = qdev_try_create(NULL, TYPE_HPET); hpet = qdev_try_create(NULL, TYPE_HPET);
if (hpet) { if (hpet) {
/* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7 /* For pc-piix-*, hpet's intcap is always IRQ2. For pc-q35-1.7

9
include/hw/sysbus.h
View File

@ -117,8 +117,7 @@ void foreach_dynamic_sysbus_device(FindSysbusDeviceFunc *func, void *opaque);
/* Legacy helper function for creating devices. */ /* Legacy helper function for creating devices. */
DeviceState *sysbus_create_varargs(const char *name, DeviceState *sysbus_create_varargs(const char *name,
hwaddr addr, ...); hwaddr addr, ...);
DeviceState *sysbus_try_create_varargs(const char *name,
hwaddr addr, ...);
static inline DeviceState *sysbus_create_simple(const char *name, static inline DeviceState *sysbus_create_simple(const char *name,
hwaddr addr, hwaddr addr,
qemu_irq irq) qemu_irq irq)
@ -126,11 +125,5 @@ static inline DeviceState *sysbus_create_simple(const char *name,
return sysbus_create_varargs(name, addr, irq, NULL); return sysbus_create_varargs(name, addr, irq, NULL);
} }
static inline DeviceState *sysbus_try_create_simple(const char *name,
hwaddr addr,
qemu_irq irq)
{
return sysbus_try_create_varargs(name, addr, irq, NULL);
}
#endif /* HW_SYSBUS_H */ #endif /* HW_SYSBUS_H */