Commit c6047e96 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

virtio-input: Fix device introspection on non-Linux hosts 



When CONFIG_LINUX is off, devices "virtio-keyboard-device",
"virtio-mouse-device", "virtio-tablet-device" and
"virtio-input-host-device" aren't compiled in, yet
"virtio-keyboard-pci", "virtio-mouse-pci", "virtio-tablet-pci" and
"virtio-input-host-pci" still are.  Attempts to introspect them crash,
e.g.

    $ qemu-system-x86_64 -device virtio-tablet-pci,help
    **
    ERROR:/work/armbru/qemu/qom/object.c:333:object_initialize_with_type: assertion failed: (type != NULL)

Broken in commit 710e2d90 and commit 006a5ede.

Fix by compiling the "virtio-FOO-pci" exactly when compiling the
"virtio-FOO-device": compile "virtio-keyboard-device",
"virtio-mouse-device", "virtio-tablet-device" regardless of
CONFIG_LINUX, and compile "virtio-input-host-pci" only for
CONFIG_LINUX.

Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-Id: <1444320700-26260-3-git-send-email-armbru@redhat.com>
parent ac98fa84

hw/input/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o 
common-obj-$(CONFIG_TSC2005) += tsc2005.o

common-obj-$(CONFIG_VMMOUSE) += vmmouse.o



ifeq ($(CONFIG_LINUX),y)

common-obj-$(CONFIG_VIRTIO) += virtio-input.o

common-obj-$(CONFIG_VIRTIO) += virtio-input-hid.o

ifeq ($(CONFIG_LINUX),y)

common-obj-$(CONFIG_VIRTIO) += virtio-input-host.o

endif

hw/virtio/virtio-pci.c

+12 −8
Original line number Diff line number Diff line
@@ -2134,14 +2134,6 @@ static void virtio_tablet_initfn(Object *obj) 
                                TYPE_VIRTIO_TABLET);

}



static void virtio_host_initfn(Object *obj)

{

    VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_INPUT_HOST);

}



static const TypeInfo virtio_input_pci_info = {

    .name          = TYPE_VIRTIO_INPUT_PCI,

    .parent        = TYPE_VIRTIO_PCI,
@@ -2180,12 +2172,22 @@ static const TypeInfo virtio_tablet_pci_info = { 
    .instance_init = virtio_tablet_initfn,

};



#ifdef CONFIG_LINUX

static void virtio_host_initfn(Object *obj)

{

    VirtIOInputHostPCI *dev = VIRTIO_INPUT_HOST_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_INPUT_HOST);

}



static const TypeInfo virtio_host_pci_info = {

    .name          = TYPE_VIRTIO_INPUT_HOST_PCI,

    .parent        = TYPE_VIRTIO_INPUT_PCI,

    .instance_size = sizeof(VirtIOInputHostPCI),

    .instance_init = virtio_host_initfn,

};

#endif



/* virtio-pci-bus */
@@ -2233,7 +2235,9 @@ static void virtio_pci_register_types(void) 
    type_register_static(&virtio_keyboard_pci_info);

    type_register_static(&virtio_mouse_pci_info);

    type_register_static(&virtio_tablet_pci_info);

#ifdef CONFIG_LINUX

    type_register_static(&virtio_host_pci_info);

#endif

    type_register_static(&virtio_pci_bus_info);

    type_register_static(&virtio_pci_info);

#ifdef CONFIG_VIRTFS

hw/virtio/virtio-pci.h

+4 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ struct VirtIOInputHIDPCI { 
    VirtIOInputHID vdev;

};



#ifdef CONFIG_LINUX



#define TYPE_VIRTIO_INPUT_HOST_PCI "virtio-input-host-pci"

#define VIRTIO_INPUT_HOST_PCI(obj) \

        OBJECT_CHECK(VirtIOInputHostPCI, (obj), TYPE_VIRTIO_INPUT_HOST_PCI)
@@ -276,6 +278,8 @@ struct VirtIOInputHostPCI { 
    VirtIOInputHost vdev;

};



#endif



/*

 * virtio-gpu-pci: This extends VirtioPCIProxy.

 */