[Qemu-devel] Compile fix for win32

[Qemu-devel] Compile fix for win32

[Kazu]

Hi,

It is comile fix for win32.

Regards,
Kazu

Index: block-vvfat.c
===================================================================
RCS file: /sources/qemu/qemu/block-vvfat.c,v
retrieving revision 1.3
diff -u -r1.3 block-vvfat.c
--- block-vvfat.c 18 Dec 2005 18:29:50 -0000 1.3
+++ block-vvfat.c 19 Dec 2005 06:23:15 -0000
@@ -2351,8 +2351,13 @@
      mapping_t* mapping;
      int j, parent_path_len;
 
+#ifdef _WIN32
+        if (mkdir(commit->path))
+            return -5;
+#else
      if (mkdir(commit->path, 0755))
   return -5;
+#endif
 
      mapping = insert_mapping(s, commit->param.mkdir.cluster,
       commit->param.mkdir.cluster + 1);

Re: [Qemu-devel] Compile fix for win32

[Johannes Schindelin]

Hi,

On Mon, 19 Dec 2005, Kazu wrote:

> It is comile fix for win32.

Sorry... I "fixed" the headers of my installation. I think that MinGW 
should be fixed, really. Everybody passes down a mode when creating a 
directory.

But you're correct, as long as they don't get their act together, we 
should work around it. See below for my (shorter) patch.

Ciao,
Dscho

diff --git a/block-vvfat.c b/block-vvfat.c
index b73a6f6..991635d 100644
--- a/block-vvfat.c
+++ b/block-vvfat.c
@@ -2351,7 +2351,11 @@ static int handle_renames_and_mkdirs(BDR
            mapping_t* mapping;
            int j, parent_path_len;
 
+#ifdef __MINGW32__
+           if (mkdir(commit->path))
+#else
            if (mkdir(commit->path, 0755))
+#endif
                return -5;
 
            mapping = insert_mapping(s, commit->param.mkdir.cluster,

[Qemu-devel] Compile fix for win32

[Kazu]

Hi,

It is compile fix for win32.

Regards,
Kazu

Index: tap-win32.c
===================================================================
RCS file: /sources/qemu/qemu/tap-win32.c,v
retrieving revision 1.1
diff -u -r1.1 tap-win32.c
--- tap-win32.c 1 Feb 2006 23:06:55 -0000 1.1
+++ tap-win32.c 7 Feb 2006 07:25:02 -0000
@@ -671,7 +671,7 @@
         return -1;
     }
 
-    s->vc = qemu_new_vlan_client(vlan, tap_receive, s);
+    s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
     
     snprintf(s->vc->info_str, sizeof(s->vc->info_str),
              "tap: ifname=%s", ifname);

[Qemu-devel] Compile fix for win32

[Kazu]

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

Hi,

An attatched patch fixes compile error for win32.

Regards,
Kazu

[-- Attachment #2: qemu-20060807-compile.patch --]
[-- Type: application/octet-stream, Size: 919 bytes --]

Index: vl.c
===================================================================
RCS file: /sources/qemu/qemu/vl.c,v
retrieving revision 1.206
diff -u -r1.206 vl.c
--- vl.c	6 Aug 2006 13:36:11 -0000	1.206
+++ vl.c	7 Aug 2006 03:53:22 -0000
@@ -4539,7 +4539,11 @@
     BlockDriverInfo bdi1, *bdi = &bdi1;
     QEMUFile *f;
     int saved_vm_running;
+#ifdef _WIN32
+    struct _timeb tb;
+#else
     struct timeval tv;
+#endif
 
     bs = get_bs_snapshots();
     if (!bs) {
@@ -4567,9 +4571,15 @@
     }
 
     /* fill auxiliary fields */
+#ifdef _WIN32
+    _ftime(&tb);
+    sn->date_sec = tb.time;
+    sn->date_nsec = tb.millitm * 1000000;
+#else
     gettimeofday(&tv, NULL);
     sn->date_sec = tv.tv_sec;
     sn->date_nsec = tv.tv_usec * 1000;
+#endif
     sn->vm_clock_nsec = qemu_get_clock(vm_clock);
     
     if (bdrv_get_info(bs, bdi) < 0 || bdi->vm_state_offset <= 0) {

[Qemu-devel] Compile fix for win32

[Kazu]

Hi,

A patch below fixes compile for win32.

Regards,
Kazu

Index: block-raw.c
===================================================================
RCS file: /sources/qemu/qemu/block-raw.c,v
retrieving revision 1.10
diff -u -r1.10 block-raw.c
--- block-raw.c 3 Sep 2006 12:08:37 -0000 1.10
+++ block-raw.c 5 Sep 2006 05:06:14 -0000
@@ -1134,6 +1134,10 @@
 {
 }
 
+void qemu_aio_flush(void)
+{
+}
+
 void qemu_aio_wait_start(void)
 {
 }