c6047e9621
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 710e2d9 and commit 006a5ed.
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: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <1444320700-26260-3-git-send-email-armbru@redhat.com>
20 lines
638 B
Makefile
20 lines
638 B
Makefile
common-obj-$(CONFIG_ADB) += adb.o
|
|
common-obj-y += hid.o
|
|
common-obj-$(CONFIG_LM832X) += lm832x.o
|
|
common-obj-$(CONFIG_PCKBD) += pckbd.o
|
|
common-obj-$(CONFIG_PL050) += pl050.o
|
|
common-obj-y += ps2.o
|
|
common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
|
|
common-obj-$(CONFIG_TSC2005) += tsc2005.o
|
|
common-obj-$(CONFIG_VMMOUSE) += vmmouse.o
|
|
|
|
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
|
|
|
|
obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
|
|
obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
|
|
obj-$(CONFIG_TSC210X) += tsc210x.o
|