Message ID | 540305dcf3f38f86f6ff1a3706a65684f25e7b04.1442380656.git.zhugh.fnst@cn.fujitsu.com |
---|---|
State | New |
Headers | show |
On Wed, 16 Sep 2015 17:19:15 +0800 Zhu Guihua <zhugh.fnst@cn.fujitsu.com> wrote: > ICC bus impl has been droped, so all icc related files are not useful > any more; delete them. > > Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > default-configs/i386-softmmu.mak | 1 - > default-configs/x86_64-softmmu.mak | 1 - > hw/cpu/Makefile.objs | 1 - > hw/cpu/icc_bus.c | 118 ------------------------------------- > include/hw/cpu/icc_bus.h | 82 -------------------------- > 5 files changed, 203 deletions(-) > delete mode 100644 hw/cpu/icc_bus.c > delete mode 100644 include/hw/cpu/icc_bus.h > > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index 9393cf0..43c96d1 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > CONFIG_APIC=y > CONFIG_IOAPIC=y > -CONFIG_ICC_BUS=y > CONFIG_PVPANIC=y > CONFIG_MEM_HOTPLUG=y > CONFIG_XIO3130=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 28e2099..dfb8095 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > CONFIG_APIC=y > CONFIG_IOAPIC=y > -CONFIG_ICC_BUS=y > CONFIG_PVPANIC=y > CONFIG_MEM_HOTPLUG=y > CONFIG_XIO3130=y > diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs > index 6381238..0954a18 100644 > --- a/hw/cpu/Makefile.objs > +++ b/hw/cpu/Makefile.objs > @@ -2,5 +2,4 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o > obj-$(CONFIG_REALVIEW) += realview_mpcore.o > obj-$(CONFIG_A9MPCORE) += a9mpcore.o > obj-$(CONFIG_A15MPCORE) += a15mpcore.o > -obj-$(CONFIG_ICC_BUS) += icc_bus.o > > diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c > deleted file mode 100644 > index 6646ea2..0000000 > --- a/hw/cpu/icc_bus.c > +++ /dev/null > @@ -1,118 +0,0 @@ > -/* icc_bus.c > - * emulate x86 ICC (Interrupt Controller Communications) bus > - * > - * Copyright (c) 2013 Red Hat, Inc > - * > - * Authors: > - * Igor Mammedov <imammedo@redhat.com> > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, see <http://www.gnu.org/licenses/> > - */ > -#include "hw/cpu/icc_bus.h" > -#include "hw/sysbus.h" > - > -/* icc-bridge implementation */ > - > -static const TypeInfo icc_bus_info = { > - .name = TYPE_ICC_BUS, > - .parent = TYPE_BUS, > - .instance_size = sizeof(ICCBus), > -}; > - > - > -/* icc-device implementation */ > - > -static void icc_device_realize(DeviceState *dev, Error **errp) > -{ > - ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev); > - > - /* convert to QOM */ > - if (idc->realize) { > - idc->realize(dev, errp); > - } > - > -} > - > -static void icc_device_class_init(ObjectClass *oc, void *data) > -{ > - DeviceClass *dc = DEVICE_CLASS(oc); > - > - dc->realize = icc_device_realize; > - dc->bus_type = TYPE_ICC_BUS; > -} > - > -static const TypeInfo icc_device_info = { > - .name = TYPE_ICC_DEVICE, > - .parent = TYPE_DEVICE, > - .abstract = true, > - .instance_size = sizeof(ICCDevice), > - .class_size = sizeof(ICCDeviceClass), > - .class_init = icc_device_class_init, > -}; > - > - > -/* icc-bridge implementation */ > - > -typedef struct ICCBridgeState { > - /*< private >*/ > - SysBusDevice parent_obj; > - /*< public >*/ > - > - ICCBus icc_bus; > - MemoryRegion apic_container; > -} ICCBridgeState; > - > -#define ICC_BRIDGE(obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE) > - > -static void icc_bridge_init(Object *obj) > -{ > - ICCBridgeState *s = ICC_BRIDGE(obj); > - SysBusDevice *sb = SYS_BUS_DEVICE(obj); > - > - qbus_create_inplace(&s->icc_bus, sizeof(s->icc_bus), TYPE_ICC_BUS, > - DEVICE(s), "icc"); > - > - /* Do not change order of registering regions, > - * APIC must be first registered region, board maps it by 0 index > - */ > - memory_region_init(&s->apic_container, obj, "icc-apic-container", > - APIC_SPACE_SIZE); > - sysbus_init_mmio(sb, &s->apic_container); > - s->icc_bus.apic_address_space = &s->apic_container; > -} > - > -static void icc_bridge_class_init(ObjectClass *oc, void *data) > -{ > - DeviceClass *dc = DEVICE_CLASS(oc); > - > - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); > -} > - > -static const TypeInfo icc_bridge_info = { > - .name = TYPE_ICC_BRIDGE, > - .parent = TYPE_SYS_BUS_DEVICE, > - .instance_init = icc_bridge_init, > - .instance_size = sizeof(ICCBridgeState), > - .class_init = icc_bridge_class_init, > -}; > - > - > -static void icc_bus_register_types(void) > -{ > - type_register_static(&icc_bus_info); > - type_register_static(&icc_device_info); > - type_register_static(&icc_bridge_info); > -} > - > -type_init(icc_bus_register_types) > diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h > deleted file mode 100644 > index 98a979f..0000000 > --- a/include/hw/cpu/icc_bus.h > +++ /dev/null > @@ -1,82 +0,0 @@ > -/* icc_bus.h > - * emulate x86 ICC (Interrupt Controller Communications) bus > - * > - * Copyright (c) 2013 Red Hat, Inc > - * > - * Authors: > - * Igor Mammedov <imammedo@redhat.com> > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, see <http://www.gnu.org/licenses/> > - */ > -#ifndef ICC_BUS_H > -#define ICC_BUS_H > - > -#include "exec/memory.h" > -#include "hw/qdev-core.h" > - > -#define TYPE_ICC_BUS "icc-bus" > - > -#ifndef CONFIG_USER_ONLY > - > -/** > - * ICCBus: > - * > - * ICC bus > - */ > -typedef struct ICCBus { > - /*< private >*/ > - BusState parent_obj; > - /*< public >*/ > - > - MemoryRegion *apic_address_space; > -} ICCBus; > - > -#define ICC_BUS(obj) OBJECT_CHECK(ICCBus, (obj), TYPE_ICC_BUS) > - > -/** > - * ICCDevice: > - * > - * ICC device > - */ > -typedef struct ICCDevice { > - /*< private >*/ > - DeviceState qdev; > - /*< public >*/ > -} ICCDevice; > - > -/** > - * ICCDeviceClass: > - * @init: Initialization callback for derived classes. > - * > - * ICC device class > - */ > -typedef struct ICCDeviceClass { > - /*< private >*/ > - DeviceClass parent_class; > - /*< public >*/ > - > - DeviceRealize realize; > -} ICCDeviceClass; > - > -#define TYPE_ICC_DEVICE "icc-device" > -#define ICC_DEVICE(obj) OBJECT_CHECK(ICCDevice, (obj), TYPE_ICC_DEVICE) > -#define ICC_DEVICE_CLASS(klass) \ > - OBJECT_CLASS_CHECK(ICCDeviceClass, (klass), TYPE_ICC_DEVICE) > -#define ICC_DEVICE_GET_CLASS(obj) \ > - OBJECT_GET_CLASS(ICCDeviceClass, (obj), TYPE_ICC_DEVICE) > - > -#define TYPE_ICC_BRIDGE "icc-bridge" > - > -#endif /* CONFIG_USER_ONLY */ > -#endif
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 9393cf0..43c96d1 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 28e2099..dfb8095 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs index 6381238..0954a18 100644 --- a/hw/cpu/Makefile.objs +++ b/hw/cpu/Makefile.objs @@ -2,5 +2,4 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o obj-$(CONFIG_REALVIEW) += realview_mpcore.o obj-$(CONFIG_A9MPCORE) += a9mpcore.o obj-$(CONFIG_A15MPCORE) += a15mpcore.o -obj-$(CONFIG_ICC_BUS) += icc_bus.o diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c deleted file mode 100644 index 6646ea2..0000000 --- a/hw/cpu/icc_bus.c +++ /dev/null @@ -1,118 +0,0 @@ -/* icc_bus.c - * emulate x86 ICC (Interrupt Controller Communications) bus - * - * Copyright (c) 2013 Red Hat, Inc - * - * Authors: - * Igor Mammedov <imammedo@redhat.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/> - */ -#include "hw/cpu/icc_bus.h" -#include "hw/sysbus.h" - -/* icc-bridge implementation */ - -static const TypeInfo icc_bus_info = { - .name = TYPE_ICC_BUS, - .parent = TYPE_BUS, - .instance_size = sizeof(ICCBus), -}; - - -/* icc-device implementation */ - -static void icc_device_realize(DeviceState *dev, Error **errp) -{ - ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev); - - /* convert to QOM */ - if (idc->realize) { - idc->realize(dev, errp); - } - -} - -static void icc_device_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(oc); - - dc->realize = icc_device_realize; - dc->bus_type = TYPE_ICC_BUS; -} - -static const TypeInfo icc_device_info = { - .name = TYPE_ICC_DEVICE, - .parent = TYPE_DEVICE, - .abstract = true, - .instance_size = sizeof(ICCDevice), - .class_size = sizeof(ICCDeviceClass), - .class_init = icc_device_class_init, -}; - - -/* icc-bridge implementation */ - -typedef struct ICCBridgeState { - /*< private >*/ - SysBusDevice parent_obj; - /*< public >*/ - - ICCBus icc_bus; - MemoryRegion apic_container; -} ICCBridgeState; - -#define ICC_BRIDGE(obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE) - -static void icc_bridge_init(Object *obj) -{ - ICCBridgeState *s = ICC_BRIDGE(obj); - SysBusDevice *sb = SYS_BUS_DEVICE(obj); - - qbus_create_inplace(&s->icc_bus, sizeof(s->icc_bus), TYPE_ICC_BUS, - DEVICE(s), "icc"); - - /* Do not change order of registering regions, - * APIC must be first registered region, board maps it by 0 index - */ - memory_region_init(&s->apic_container, obj, "icc-apic-container", - APIC_SPACE_SIZE); - sysbus_init_mmio(sb, &s->apic_container); - s->icc_bus.apic_address_space = &s->apic_container; -} - -static void icc_bridge_class_init(ObjectClass *oc, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(oc); - - set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); -} - -static const TypeInfo icc_bridge_info = { - .name = TYPE_ICC_BRIDGE, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_init = icc_bridge_init, - .instance_size = sizeof(ICCBridgeState), - .class_init = icc_bridge_class_init, -}; - - -static void icc_bus_register_types(void) -{ - type_register_static(&icc_bus_info); - type_register_static(&icc_device_info); - type_register_static(&icc_bridge_info); -} - -type_init(icc_bus_register_types) diff --git a/include/hw/cpu/icc_bus.h b/include/hw/cpu/icc_bus.h deleted file mode 100644 index 98a979f..0000000 --- a/include/hw/cpu/icc_bus.h +++ /dev/null @@ -1,82 +0,0 @@ -/* icc_bus.h - * emulate x86 ICC (Interrupt Controller Communications) bus - * - * Copyright (c) 2013 Red Hat, Inc - * - * Authors: - * Igor Mammedov <imammedo@redhat.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/> - */ -#ifndef ICC_BUS_H -#define ICC_BUS_H - -#include "exec/memory.h" -#include "hw/qdev-core.h" - -#define TYPE_ICC_BUS "icc-bus" - -#ifndef CONFIG_USER_ONLY - -/** - * ICCBus: - * - * ICC bus - */ -typedef struct ICCBus { - /*< private >*/ - BusState parent_obj; - /*< public >*/ - - MemoryRegion *apic_address_space; -} ICCBus; - -#define ICC_BUS(obj) OBJECT_CHECK(ICCBus, (obj), TYPE_ICC_BUS) - -/** - * ICCDevice: - * - * ICC device - */ -typedef struct ICCDevice { - /*< private >*/ - DeviceState qdev; - /*< public >*/ -} ICCDevice; - -/** - * ICCDeviceClass: - * @init: Initialization callback for derived classes. - * - * ICC device class - */ -typedef struct ICCDeviceClass { - /*< private >*/ - DeviceClass parent_class; - /*< public >*/ - - DeviceRealize realize; -} ICCDeviceClass; - -#define TYPE_ICC_DEVICE "icc-device" -#define ICC_DEVICE(obj) OBJECT_CHECK(ICCDevice, (obj), TYPE_ICC_DEVICE) -#define ICC_DEVICE_CLASS(klass) \ - OBJECT_CLASS_CHECK(ICCDeviceClass, (klass), TYPE_ICC_DEVICE) -#define ICC_DEVICE_GET_CLASS(obj) \ - OBJECT_GET_CLASS(ICCDeviceClass, (obj), TYPE_ICC_DEVICE) - -#define TYPE_ICC_BRIDGE "icc-bridge" - -#endif /* CONFIG_USER_ONLY */ -#endif
ICC bus impl has been droped, so all icc related files are not useful any more; delete them. Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com> --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- include/hw/cpu/icc_bus.h | 82 -------------------------- 5 files changed, 203 deletions(-) delete mode 100644 hw/cpu/icc_bus.c delete mode 100644 include/hw/cpu/icc_bus.h