Commit 25f8f6b4 authored by Juergen Gross's avatar Juergen Gross Committed by Stefano Stabellini
Browse files

xen: move xen_sysdev to xen_backend.c 



Commit 9432e53a added xen_sysdev as a
system device to serve as an anchor for removable virtual buses. This
introduced a build failure for non-x86 builds with CONFIG_XEN_BACKEND
set, as xen_sysdev was defined in a x86 specific file while being
consumed in an architecture independent source.

Move the xen_sysdev definition and initialization to xen_backend.c to
avoid the build failure.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarAnthony PERARD <anthony.perard@citrix.com>
Acked-by: default avatarStefano Stabellini <sstabellini@kernel.org>
Signed-off-by: default avatarStefano Stabellini <sstabellini@kernel.org>
parent 16246018

hw/xen/xen_backend.c

+41 −0
Original line number Diff line number Diff line
@@ -26,12 +26,17 @@ 
#include <sys/signal.h>



#include "hw/hw.h"

#include "hw/sysbus.h"

#include "sysemu/char.h"

#include "qemu/log.h"

#include "hw/xen/xen_backend.h"



#include <xen/grant_table.h>



#define TYPE_XENSYSDEV "xensysdev"



DeviceState *xen_sysdev;



/* ------------------------------------------------------------- */



/* public */
@@ -762,6 +767,10 @@ int xen_be_init(void) 
        /* Check if xen_init() have been called */

        goto err;

    }



    xen_sysdev = qdev_create(NULL, TYPE_XENSYSDEV);

    qdev_init_nofail(xen_sysdev);



    return 0;



err:
@@ -862,3 +871,35 @@ void xen_be_printf(struct XenDevice *xendev, int msg_level, const char *fmt, ... 
    }

    qemu_log_flush();

}



static int xen_sysdev_init(SysBusDevice *dev)

{

    return 0;

}



static Property xen_sysdev_properties[] = {

    {/* end of property list */},

};



static void xen_sysdev_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = xen_sysdev_init;

    dc->props = xen_sysdev_properties;

}



static const TypeInfo xensysdev_info = {

    .name          = TYPE_XENSYSDEV,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .class_init    = xen_sysdev_class_init,

};



static void xenbe_register_types(void)

{

    type_register_static(&xensysdev_info);

}



type_init(xenbe_register_types);

hw/xenpv/xen_machine_pv.c

+0 −40
Original line number Diff line number Diff line
@@ -25,15 +25,10 @@ 
#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/boards.h"

#include "hw/sysbus.h"

#include "hw/xen/xen_backend.h"

#include "xen_domainbuild.h"

#include "sysemu/block-backend.h"



#define TYPE_XENSYSDEV "xensysdev"



DeviceState *xen_sysdev;



static void xen_init_pv(MachineState *machine)

{

    DriveInfo *dinfo;
@@ -72,9 +67,6 @@ static void xen_init_pv(MachineState *machine) 
        break;

    }



    xen_sysdev = qdev_create(NULL, TYPE_XENSYSDEV);

    qdev_init_nofail(xen_sysdev);



    xen_be_register("console", &xen_console_ops);

    xen_be_register("vkbd", &xen_kbdmouse_ops);

    xen_be_register("vfb", &xen_framebuffer_ops);
@@ -112,38 +104,6 @@ static void xen_init_pv(MachineState *machine) 
    xen_init_display(xen_domid);

}



static int xen_sysdev_init(SysBusDevice *dev)

{

    return 0;

}



static Property xen_sysdev_properties[] = {

    {/* end of property list */},

};



static void xen_sysdev_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = xen_sysdev_init;

    dc->props = xen_sysdev_properties;

}



static const TypeInfo xensysdev_info = {

    .name          = TYPE_XENSYSDEV,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(SysBusDevice),

    .class_init    = xen_sysdev_class_init,

};



static void xenpv_register_types(void)

{

    type_register_static(&xensysdev_info);

}



type_init(xenpv_register_types);



static void xenpv_machine_init(MachineClass *mc)

{

    mc->desc = "Xen Para-virtualized PC";