> Anthony Liguori <address@hidden> > Sent by: address@hidden
> >
> > Yes, as checked out a few hours ago. I get this here if the patch
is
> > not applied:
> >
> > gcc -g -Wl,--warn-common -m32 -o qemu.exe vl.o /work/qemu/osdep.o
> > monitor.o pci.o loader.o isa_mmio.o machine.o fw_cfg.o
> > /work/qemu/block-raw-win32.o lsi53c895a.o esp.o usb-ohci.o
> > eeprom93xx.o eepro100.o ne2000.o pcnet.o rtl8139.o e1000.o ide.o
> > pckbd.o ps2.o vga.o sb16.o es1370.o dma.o fdc.o mc146818rtc.o
serial.o
> > i8259.o i8254.o pcspk.o pc.o cirrus_vga.o apic.o parallel.o acpi.o
> > piix_pci.o usb-uhci.o vmmouse.o vmport.o vmware_vga.o tpm_tis.o
> > tpm_emu.o gdbstub.o gdbstub-xml.o ../libqemu_common.a libqemu.a
-lm
> > -lwinmm -lws2_32 -liphlpapi -lz
>
> You've got a merge conflict. tpm_tis and tpm_emu.o are not in
upstream
> QEMU. You should see virtio.o and virtio-blk.o right after vmware_vga.o.
> I also did not do a 'make clean' and that's what broke
it. My bad.