Commit 86d86414 authored by Blue Swirl's avatar Blue Swirl
Browse files

x86: make vmmouse optional 



Compile vmmouse in hwlib. Ignore failure if vmmouse device can't be
created.

Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 86f4a9a5

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ hw-obj-$(CONFIG_VGA_PCI) += vga-pci.o 
hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o

hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o

hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o

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



hw-obj-$(CONFIG_RC4030) += rc4030.o

hw-obj-$(CONFIG_DP8393X) += dp8393x.o

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ obj-$(CONFIG_KVM) += ivshmem.o 
obj-i386-y += vga.o

obj-i386-y += mc146818rtc.o i8259.o pc.o

obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o

obj-i386-y += vmmouse.o vmport.o hpet.o applesmc.o

obj-i386-y += vmport.o hpet.o applesmc.o

obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o

obj-i386-y += debugcon.o multiboot.o

obj-i386-y += pc_piix.o

default-configs/i386-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include pci.mak 
CONFIG_VGA_PCI=y

CONFIG_VGA_ISA=y

CONFIG_VMWARE_VGA=y

CONFIG_VMMOUSE=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y

default-configs/x86_64-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ include pci.mak 
CONFIG_VGA_PCI=y

CONFIG_VGA_ISA=y

CONFIG_VMWARE_VGA=y

CONFIG_VMMMOUSE=y

CONFIG_SERIAL=y

CONFIG_PARALLEL=y

CONFIG_I8254=y

hw/pc.c

+4 −2
Original line number Diff line number Diff line
@@ -1134,8 +1134,10 @@ void pc_basic_device_init(qemu_irq *isa_irq, 
    i8042 = isa_create_simple("i8042");

    i8042_setup_a20_line(i8042, &a20_line[0]);

    vmport_init();

    vmmouse = isa_create("vmmouse");

    vmmouse = isa_try_create("vmmouse");

    if (vmmouse) {

        qdev_prop_set_ptr(&vmmouse->qdev, "ps2_mouse", i8042);

    }

    port92 = isa_create_simple("port92");

    port92_init(port92, &a20_line[1]);