From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1G9xJL-0003F3-6r for qemu-devel@nongnu.org; Mon, 07 Aug 2006 01:05:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1G9xJJ-0003Eh-Cq for qemu-devel@nongnu.org; Mon, 07 Aug 2006 01:05:54 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1G9xJJ-0003Eb-8a for qemu-devel@nongnu.org; Mon, 07 Aug 2006 01:05:53 -0400 Received: from [211.5.2.71] (helo=nm01omta013.dion.ne.jp) by monty-python.gnu.org with smtp (Exim 4.52) id 1G9xNT-0003g4-7R for qemu-devel@nongnu.org; Mon, 07 Aug 2006 01:10:11 -0400 Message-ID: <002001c6b9df$2a1124d0$0464a8c0@athlon> From: "Kazu" Subject: [Qemu-devel] Compile fix for win32 Date: Mon, 7 Aug 2006 14:05:55 +0900 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0019_01C6BA2A.998179F0" Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. ------=_NextPart_000_0019_01C6BA2A.998179F0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Hi, An attatched patch fixes compile error for win32. Regards, Kazu ------=_NextPart_000_0019_01C6BA2A.998179F0 Content-Type: application/octet-stream; name="qemu-20060807-compile.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="qemu-20060807-compile.patch" Index: vl.c=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /sources/qemu/qemu/vl.c,v=0A= retrieving revision 1.206=0A= diff -u -r1.206 vl.c=0A= --- vl.c 6 Aug 2006 13:36:11 -0000 1.206=0A= +++ vl.c 7 Aug 2006 03:53:22 -0000=0A= @@ -4539,7 +4539,11 @@=0A= BlockDriverInfo bdi1, *bdi =3D &bdi1;=0A= QEMUFile *f;=0A= int saved_vm_running;=0A= +#ifdef _WIN32=0A= + struct _timeb tb;=0A= +#else=0A= struct timeval tv;=0A= +#endif=0A= =0A= bs =3D get_bs_snapshots();=0A= if (!bs) {=0A= @@ -4567,9 +4571,15 @@=0A= }=0A= =0A= /* fill auxiliary fields */=0A= +#ifdef _WIN32=0A= + _ftime(&tb);=0A= + sn->date_sec =3D tb.time;=0A= + sn->date_nsec =3D tb.millitm * 1000000;=0A= +#else=0A= gettimeofday(&tv, NULL);=0A= sn->date_sec =3D tv.tv_sec;=0A= sn->date_nsec =3D tv.tv_usec * 1000;=0A= +#endif=0A= sn->vm_clock_nsec =3D qemu_get_clock(vm_clock);=0A= =0A= if (bdrv_get_info(bs, bdi) < 0 || bdi->vm_state_offset <=3D 0) {=0A= ------=_NextPart_000_0019_01C6BA2A.998179F0--