[Qemu-devel] More Win32 build fixes

[Qemu-devel] More Win32 build fixes

[Stefan Berger]

[-- Attachment #1: Type: text/plain, Size: 105 bytes --]

This fixes one more current build problem on Win32.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>



[-- Attachment #2: win32_build_fix.diff --]
[-- Type: text/x-patch, Size: 781 bytes --]

Index: work/qemu/hw/pc.c
===================================================================
--- work.orig/qemu/hw/pc.c
+++ work/qemu/hw/pc.c
@@ -33,8 +33,10 @@
 #include "boards.h"
 #include "console.h"
 #include "fw_cfg.h"
+#ifndef _WIN32
 #include "virtio-blk.h"
 #include "virtio-balloon.h"
+#endif
 
 /* output Bochs bios info messages */
 #define DEBUG_BIOS
@@ -1100,6 +1102,7 @@ static void pc_init1(ram_addr_t ram_size
         }
     }
 
+#ifndef _WIN32
     /* Add virtio block devices */
     if (pci_enabled) {
         int index;
@@ -1115,6 +1118,7 @@ static void pc_init1(ram_addr_t ram_size
     /* Add virtio balloon device */
     if (pci_enabled)
         virtio_balloon_init(pci_bus);
+#endif
 }
 
 static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,

Re: [Qemu-devel] More Win32 build fixes

[Anthony Liguori]

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.

Regards,

Anthony Liguori

Re: [Qemu-devel] More Win32 build fixes

[Stefan Berger]

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

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 
-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
> 

[-- Attachment #2: Type: text/html, Size: 2186 bytes --]

Re: [Qemu-devel] More Win32 build fixes

[Anthony Liguori]

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
> >

Re: [Qemu-devel] More Win32 build fixes

[Stefan Berger]

[-- Attachment #1: Type: text/plain, Size: 1117 bytes --]

qemu-devel-bounces+stefanb=us.ibm.com@nongnu.org wrote on 12/05/2008 
02:30:52 PM:

> Anthony Liguori <anthony@codemonkey.ws> 
> Sent by: qemu-devel-bounces+stefanb=us.ibm.com@nongnu.org

> >
> > 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.

   Stefan

[-- Attachment #2: Type: text/html, Size: 1467 bytes --]