From 6665cdadf07a7dc49d8e128fc8cdd368751c2bef Mon Sep 17 00:00:00 2001
From: Roger Pau Monne <roger.pau@citrix.com>
Date: Thu, 18 Apr 2013 16:26:26 +0200
Subject: main/xen: security fixes
 (CVE-2013-1917,CVE-2013-1919,CVE-2013-1920,CVE-2013-1922)

CVE-2013-1917 / XSA-44
CVE-2013-1919 / XSA-46
CVE-2013-1920 / XSA-47
CVE-2013-1922 / XSA-48

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
 ...x-generating-qemu-doc.html-with-texinfo-5.patch | 55 ++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 main/xen/docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch

(limited to 'main/xen/docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch')

diff --git a/main/xen/docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch b/main/xen/docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
new file mode 100644
index 0000000000..e442e3d8c3
--- /dev/null
+++ b/main/xen/docs-Fix-generating-qemu-doc.html-with-texinfo-5.patch
@@ -0,0 +1,55 @@
+From patchwork Wed Feb 20 17:20:31 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: docs: Fix generating qemu-doc.html with texinfo 5
+Date: Wed, 20 Feb 2013 07:20:31 -0000
+From: Cole Robinson <crobinso@redhat.com>
+X-Patchwork-Id: 222131
+Message-Id: <97218cb913b6b91072f7e6f21d1de39ec5a137dd.1361380831.git.crobinso@redhat.com>
+To: qemu-devel@nongnu.org
+Cc: qemu-stable@nongnu.org, Cole Robinson <crobinso@redhat.com>
+
+LC_ALL=C makeinfo --no-headers --no-split --number-sections --html qemu-doc.texi -o qemu-doc.html
+./qemu-options.texi:1521: unknown command `list'
+./qemu-options.texi:1521: table requires an argument: the formatter for @item
+./qemu-options.texi:1521: warning: @table has text but no @item
+
+CC: qemu-stable@nongnu.org
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+
+---
+qemu-options.hx | 19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/qemu-options.hx b/qemu-options.hx
+index 4bc9c85..3af60bf 100644
+--- a/tools/qemu-xen/qemu-options.hx
++++ b/tools/qemu-xen/qemu-options.hx
+@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked
+ devices.
+ 
+ Syntax for specifying a sheepdog device
+-@table @list
+-``sheepdog:<vdiname>''
+-
+-``sheepdog:<vdiname>:<snapid>''
+-
+-``sheepdog:<vdiname>:<tag>''
+-
+-``sheepdog:<host>:<port>:<vdiname>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
+-
+-``sheepdog:<host>:<port>:<vdiname>:<tag>''
++@table @code
++@item sheepdog:<vdiname>
++@item sheepdog:<vdiname>:<snapid>
++@item sheepdog:<vdiname>:<tag>
++@item sheepdog:<host>:<port>:<vdiname>
++@item sheepdog:<host>:<port>:<vdiname>:<snapid>
++@item sheepdog:<host>:<port>:<vdiname>:<tag>
+ @end table
+ 
+ Example
-- 
cgit v1.2.3