Commit dfeb8679 authored by Zhu Guihua's avatar Zhu Guihua Committed by Eduardo Habkost
Browse files

icc_bus: drop the unused files 



ICC bus impl has been droped, so all icc related files are not useful
any more; delete them.

Signed-off-by: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 46232aaa

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -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

default-configs/x86_64-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -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

hw/cpu/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -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

hw/cpu/icc_bus.c

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
/* 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)

include/hw/cpu/icc_bus.h

deleted100644 → 0
+0 −82
Original line number Diff line number Diff line 
/* 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