3 files changed, 29 insertions, 11 deletions
diff --git a/emulators/qemu/files/patch-qemu-img.c b/emulators/qemu/files/patch-qemu-img.c
new file mode 100644
index 000000000000..b525b50a3bcb
--- /dev/null
+++ b/emulators/qemu/files/patch-qemu-img.c
@@ -0,0 +1,10 @@
+Index: qemu/qemu-img.c
+@@ -134,7 +134,7 @@
+            "Command syntax:\n"
+            "  create [-e] [-b base_image] [-f fmt] filename [size]\n"
+            "  commit [-f fmt] filename\n"
+-           "  convert [-c] [-e] [-f fmt] filename [-O output_fmt] output_filename\n"
++           "  convert [-c] [-e] [-f fmt] [-O output_fmt] filename output_filename\n"
+            "  info [-f fmt] filename\n"
+            "\n"
+            "Command parameters:\n"
diff --git a/emulators/qemu/files/patch-qemu-img.texi b/emulators/qemu/files/patch-qemu-img.texi
new file mode 100644
index 000000000000..79693026dd2d
--- /dev/null
+++ b/emulators/qemu/files/patch-qemu-img.texi
@@ -0,0 +1,19 @@
+Index: qemu/qemu-img.texi
+@@ -10,7 +10,7 @@
+ @table @option
+ @item create [-e] [-b @var{base_image}] [-f @var{fmt}] @var{filename} [@var{size}]
+ @item commit [-f @var{fmt}] @var{filename}
+-@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
++@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename}
+ @item info [-f @var{fmt}] @var{filename}
+ @end table
+ 
+@@ -83,7 +83,7 @@
+ 
+ Commit the changes recorded in @var{filename} in its base image.
+ 
+-@item convert [-c] [-e] [-f @var{fmt}] @var{filename} [-O @var{output_fmt}] @var{output_filename}
++@item convert [-c] [-e] [-f @var{fmt}] [-O @var{output_fmt}] @var{filename} @var{output_filename}
+ 
+ Convert the disk image @var{filename} to disk image @var{output_filename}
+ using format @var{output_fmt}. It can be optionnaly encrypted
diff --git a/emulators/qemu/files/patch-vl.c b/emulators/qemu/files/patch-vl.c
index 5eff6568373b..adf052460e28 100644
--- a/emulators/qemu/files/patch-vl.c
+++ b/emulators/qemu/files/patch-vl.c
@@ -1,16 +1,5 @@
 --- vl.c.orig	Mon Nov 14 15:55:56 2005
 +++ vl.c	Mon Nov 14 15:57:25 2005
-@@ -40,6 +40,10 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <dirent.h>
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <libutil.h>
-+#endif
- #ifdef _BSD
- #include <sys/stat.h>
- #ifndef __APPLE__
 @@ -1363,7 +1367,7 @@
      return chr;
  }