From 3319c35ea194510ee90985d99cf3b4e6822564af Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: Mar 16 2010 02:28:00 +0000
Subject: Detect cdrom via ioctl (#473154) re add increased buffer for USB control

    requests (#546483)

---

diff --git a/0003-raw-posix-Detect-CDROM-via-ioctl-on-linux.patch b/0003-raw-posix-Detect-CDROM-via-ioctl-on-linux.patch
new file mode 100644
index 0000000..2481e2a
--- /dev/null
+++ b/0003-raw-posix-Detect-CDROM-via-ioctl-on-linux.patch
@@ -0,0 +1,61 @@
+From 78a27b6a8f394c5a987c31aaf308e11556280f6a Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Thu, 14 Jan 2010 16:19:40 +0000
+Subject: [PATCH] raw-posix: Detect CDROM via ioctl on linux
+
+Current CDROM detection is hardcoded based on source file name.
+Make this smarter on linux by attempting a CDROM specific ioctl.
+
+This makes '-cdrom /dev/sr0' succeed with no media present.
+
+v2:
+    Give ioctl check higher priority than filename check.
+
+v3:
+    Actually initialize 'prio' variable.
+    Check for ioctl success rather than absence of specific failure.
+
+v4:
+    Explicitly mention that change is linux specific.
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
+---
+ block/raw-posix.c |   20 ++++++++++++++++++--
+ 1 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/block/raw-posix.c b/block/raw-posix.c
+index c204cf9..1c777a1 100644
+--- a/block/raw-posix.c
++++ b/block/raw-posix.c
+@@ -1142,9 +1142,25 @@ static int cdrom_open(BlockDriverState *bs, const char *filename, int flags)
+
+ static int cdrom_probe_device(const char *filename)
+ {
++    int fd, ret;
++    int prio = 0;
++
+     if (strstart(filename, "/dev/cd", NULL))
+-        return 100;
+-    return 0;
++        prio = 50;
++
++    fd = open(filename, O_RDONLY | O_NONBLOCK);
++    if (fd < 0) {
++        goto out;
++    }
++
++    /* Attempt to detect via a CDROM specific ioctl */
++    ret = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
++    if (ret >= 0)
++        prio = 100;
++
++    close(fd);
++out:
++    return prio;
+ }
+
+ static int cdrom_is_inserted(BlockDriverState *bs)
+-- 
+1.6.6.1
+
diff --git a/0004-usb-linux-increase-buffer-for-USB-control-requests.patch b/0004-usb-linux-increase-buffer-for-USB-control-requests.patch
new file mode 100644
index 0000000..210d4cc
--- /dev/null
+++ b/0004-usb-linux-increase-buffer-for-USB-control-requests.patch
@@ -0,0 +1,33 @@
+From 67e6ab59a04db24c4c947b7653d0f9e3078192bd Mon Sep 17 00:00:00 2001
+From: Christian Krause <chkr@plauener.de>
+Date: Sun, 24 Jan 2010 16:34:52 +0000
+Subject: [PATCH] usb-linux: increase buffer for USB control requests
+
+The WLAN USB stick ZyXEL NWD271N (0586:3417) uses very large
+usb control transfers of more than 2048 bytes which won't fit
+into the buffer of the ctrl_struct. This results in an error message
+"husb: ctrl buffer too small" and a non-working device.
+Increasing the buffer size to 8192 seems to be a safe choice.
+
+Signed-off-by: Christian Krause <chkr@plauener.de>
+Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
+---
+ usb-linux.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/usb-linux.c b/usb-linux.c
+index 5619b30..e6cd432 100644
+--- a/usb-linux.c
++++ b/usb-linux.c
+@@ -113,7 +113,7 @@ struct ctrl_struct {
+     uint16_t offset;
+     uint8_t  state;
+     struct   usb_ctrlrequest req;
+-    uint8_t  buffer[2048];
++    uint8_t  buffer[8192];
+ };
+
+ struct USBAutoFilter {
+-- 
+1.6.6.1
+
diff --git a/qemu.spec b/qemu.spec
index b394572..30566ec 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -26,6 +26,8 @@ Source8: ksmtuned.conf
 
 Patch01: 0001-block-avoid-creating-too-large-iovecs-in-multiwrite_.patch
 Patch02: 0002-migration-Clear-fd-also-in-error-cases.patch
+Patch03: 0003-raw-posix-Detect-CDROM-via-ioctl-on-linux.patch
+Patch04: 0004-usb-linux-increase-buffer-for-USB-control-requests.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -217,6 +219,8 @@ such as kvmtrace and kvm_stat.
 
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
+%patch04 -p1
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -500,6 +504,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Mon Mar 15 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.3-2
+- Detect cdrom via ioctl (#473154)
+- re add increased buffer for USB control requests (#546483)
+
 * Wed Mar 10 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.3-1
 - Update to 0.12.3 upstream
 - Require seabios