From c7edac6759b3f14faf8641ae058dd3b93ee15863 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: Feb 28 2010 16:36:01 +0000
Subject: Update patches against 0.12.3


---

diff --git a/qemu-tap-add-vhost-vhostfd-options.patch b/qemu-tap-add-vhost-vhostfd-options.patch
index 462d08f..1a3dfb9 100644
--- a/qemu-tap-add-vhost-vhostfd-options.patch
+++ b/qemu-tap-add-vhost-vhostfd-options.patch
@@ -64,7 +64,7 @@ index 7e9ca79..d9f2e41 100644
      return s;
  }
  
-@@ -456,6 +464,27 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
+@@ -456,5 +464,26 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
          }
      }
  
@@ -89,9 +89,8 @@ index 7e9ca79..d9f2e41 100644
 +        return -1;
 +    }
 +
-     if (vlan) {
-         vlan->nb_host_devs++;
-     }
+     return 0;
+ }
 diff --git a/qemu-options.hx b/qemu-options.hx
 index ca73ba5..2b3d9b8 100644
 --- a/qemu-options.hx
diff --git a/qemu.spec b/qemu.spec
index 26726cb..3a4cb6e 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: 2%{?dist}
+Release: 3%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -598,7 +598,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Sun Feb 28 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.2-1
+* Sun Feb 28 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.3-3
+- Update patches against 0.12.3
+
+* Sun Feb 28 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.3-2
 - Fix sources file
 
 * Fri Feb 26 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.12.3-1