From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L8gOA-0001uV-Qx
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 14:30:58 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L8gOA-0001uE-6q
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 14:30:58 -0500
Received: from [199.232.76.173] (port=36201 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L8gO9-0001uB-V9
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 14:30:58 -0500
Received: from yx-out-1718.google.com ([74.125.44.152]:31225)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <anthony@codemonkey.ws>) id 1L8gO9-0007UQ-K7
	for qemu-devel@nongnu.org; Fri, 05 Dec 2008 14:30:57 -0500
Received: by yx-out-1718.google.com with SMTP id 3so108690yxi.82
	for <qemu-devel@nongnu.org>; Fri, 05 Dec 2008 11:30:57 -0800 (PST)
Message-ID: <4939816C.7040106@codemonkey.ws>
Date: Fri, 05 Dec 2008 13:30:52 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] More Win32 build fixes
References: <1228486273.1245.1.camel@gsal-3.watson.ibm.com>
	<49393AAD.6020908@codemonkey.ws>
	<OF295B866B.B03121B3-ON85257516.00556B35-85257516.005583FD@us.ibm.com>
In-Reply-To: <OF295B866B.B03121B3-ON85257516.00556B35-85257516.005583FD@us.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Berger <stefanb@us.ibm.com>
Cc: qemu-devel@nongnu.org

Stefan Berger wrote:
>
> Anthony Liguori <anthony@codemonkey.ws> wrote on 12/05/2008 09:29:01 AM:
>
> > Anthony Liguori <anthony@codemonkey.ws>
> > 12/05/2008 09:29 AM
> >
> > To
> >
> > Stefan Berger/Watson/IBM@IBMUS, qemu-devel@nongnu.org
> >
> > cc
> >
> > Subject
> >
> > Re: [Qemu-devel] More Win32 build fixes
> >
> > Stefan Berger wrote:
> > > This fixes one more current build problem on Win32.
> > >
> > > Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
> > >  
> >
> > Are you using the latest SVN?  QEMU builds fine on Win32 for me with 
> the
> > latest SVN.
>
> 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.

Regards,

Anthony Liguori

>  -L/usr/local/lib -lmingw32 -lSDLmain -lSDL -mconsole     -lgmp
> pc.o: In function `pc_init1':
> C:/msys/1.0/work/qemu/hw/pc.c:1109: undefined reference to 
> `virtio_blk_init'
> C:/msys/1.0/work/qemu/hw/pc.c:1117: undefined reference to 
> `virtio_balloon_init'
>
>   Stefan
>
> >
> > Regards,
> >
> > Anthony Liguori
> >