[fedora-virt-maint] rpms/qemu/devel qemu-bios-bigger-roms.patch, 1.6, 1.7 qemu-fix-build-for-esd-audio.patch, 1.1, 1.2 qemu-fix-linux-user-build-on-ppc.patch, 1.2, 1.3 qemu-prefer-sysfs-for-usb-host-devices.patch, 1.2, 1.3 qemu-slirp-Fix-guestfwd-for-incoming-data.patch, 1.1, 1.2 qemu-fix-pcspk-build-with-kvm-disabled.patch, 1.2, NONE qemu-fix-ppc-softmmu-kvm-disabled-build.patch, 1.3, NONE

Mark McLoughlin markmc at fedoraproject.org
Tue Jul 28 07:59:51 UTC 2009 

Author: markmc

Update of /cvs/pkgs/rpms/qemu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2921

Modified Files:
	qemu-bios-bigger-roms.patch qemu-fix-build-for-esd-audio.patch 
	qemu-fix-linux-user-build-on-ppc.patch 
	qemu-prefer-sysfs-for-usb-host-devices.patch 
	qemu-slirp-Fix-guestfwd-for-incoming-data.patch 
Removed Files:
	qemu-fix-pcspk-build-with-kvm-disabled.patch 
	qemu-fix-ppc-softmmu-kvm-disabled-build.patch 
Log Message:
Sync patches from git; remove unused patches


qemu-bios-bigger-roms.patch:
 rombios.c |   34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

Index: qemu-bios-bigger-roms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-bios-bigger-roms.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- qemu-bios-bigger-roms.patch	16 Jul 2009 11:15:53 -0000	1.6
+++ qemu-bios-bigger-roms.patch	28 Jul 2009 07:59:50 -0000	1.7
@@ -1,7 +1,7 @@
 From c9aea972de34bad96814301988df698063ccf608 Mon Sep 17 00:00:00 2001
 From: Glauber Costa <glommer at redhat.com>
 Date: Wed, 24 Jun 2009 14:31:41 +0100
-Subject: [PATCH 1/4] compute checksum for roms bigger than a segment
+Subject: [PATCH] compute checksum for roms bigger than a segment
 
 Some option roms (e1000 provided by gpxe project as an example)
 are bigger than a segment. The current algorithm to compute the
@@ -76,5 +76,5 @@ index 6186199..fc289c0 100644
  
  
 -- 
-1.6.3.3
+1.6.2.5
 

qemu-fix-build-for-esd-audio.patch:
 Makefile |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Index: qemu-fix-build-for-esd-audio.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-build-for-esd-audio.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-fix-build-for-esd-audio.patch	16 Jul 2009 11:15:53 -0000	1.1
+++ qemu-fix-build-for-esd-audio.patch	28 Jul 2009 07:59:51 -0000	1.2
@@ -1,7 +1,7 @@
 From b37fb38b6043e319768fa92d5541fe20afb4741b Mon Sep 17 00:00:00 2001
 From: Anthony Liguori <aliguori at us.ibm.com>
 Date: Wed, 1 Jul 2009 10:07:16 -0500
-Subject: [PATCH 4/4] Fix build for ESD audio
+Subject: [PATCH] Fix build for ESD audio
 
 (cherry picked from commit c6a5a71a3a1886afad5eeb214eb6e8785f4e0319)
 
@@ -40,5 +40,5 @@ index fc40431..f5deae9 100644
  ifdef AUDIO_PT
  LDFLAGS += -pthread
 -- 
-1.6.3.3
+1.6.2.5
 

qemu-fix-linux-user-build-on-ppc.patch:
 elf.h                |    2 ++
 linux-user/elfload.c |   11 ++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: qemu-fix-linux-user-build-on-ppc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-fix-linux-user-build-on-ppc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-fix-linux-user-build-on-ppc.patch	16 Jul 2009 11:15:53 -0000	1.2
+++ qemu-fix-linux-user-build-on-ppc.patch	28 Jul 2009 07:59:51 -0000	1.3
@@ -1,7 +1,7 @@
 From 978e305a8cb8533bef2c6238c88e96913f7d09d0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 29 Jun 2009 14:49:03 +0100
-Subject: [PATCH 2/4] Fix linux-user build on ppc
+Subject: [PATCH] Fix linux-user build on ppc
 
 kvm-87 build fails on ppc:
 
@@ -130,5 +130,5 @@ index d31cca7..3ccfdda 100644
  #define ELF_HWCAP get_elf_hwcap()
  
 -- 
-1.6.3.3
+1.6.2.5
 

qemu-prefer-sysfs-for-usb-host-devices.patch:
 usb-linux.c |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Index: qemu-prefer-sysfs-for-usb-host-devices.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-prefer-sysfs-for-usb-host-devices.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-prefer-sysfs-for-usb-host-devices.patch	16 Jul 2009 11:15:53 -0000	1.2
+++ qemu-prefer-sysfs-for-usb-host-devices.patch	28 Jul 2009 07:59:51 -0000	1.3
@@ -1,7 +1,7 @@
 From da1377c5e28ea68a6492b627725e8dd5f7acbb0a Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 3 Jul 2009 09:17:20 +0100
-Subject: [PATCH 3/4] Prefer sysfs for USB host devices
+Subject: [PATCH] Prefer sysfs for USB host devices
 
 Scanning for devices via /sys/bus/usb/devices/ and using them via the
 /dev/bus/usb/<bus>/<device> character devices is the prefered method
@@ -58,5 +58,5 @@ index 67e4acd..3c724ba 100644
          if (!usb_fs_type) {
              monitor_printf(mon, "husb: unable to access USB devices\n");
 -- 
-1.6.3.3
+1.6.2.5
 

qemu-slirp-Fix-guestfwd-for-incoming-data.patch:
 net.c            |   11 ++++++-----
 slirp/libslirp.h |    2 +-
 slirp/slirp.c    |   15 +++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

Index: qemu-slirp-Fix-guestfwd-for-incoming-data.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/devel/qemu-slirp-Fix-guestfwd-for-incoming-data.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qemu-slirp-Fix-guestfwd-for-incoming-data.patch	23 Jul 2009 14:52:22 -0000	1.1
+++ qemu-slirp-Fix-guestfwd-for-incoming-data.patch	28 Jul 2009 07:59:51 -0000	1.2
@@ -1,4 +1,4 @@
-From b0dc78730e54bd3ef96f56466890aa2509a328c3 Mon Sep 17 00:00:00 2001
+From ff933dfefb22e2ef115eb6035e23b0f64335b0db Mon Sep 17 00:00:00 2001
 From: Jan Kiszka <jan.kiszka at siemens.com>
 Date: Wed, 22 Jul 2009 17:03:52 +0200
 Subject: [PATCH] slirp: Fix guestfwd for incoming data
@@ -16,10 +16,10 @@ Signed-off-by: Anthony Liguori <aliguori
  3 files changed, 14 insertions(+), 13 deletions(-)
 
 diff --git a/net.c b/net.c
-index 90cf912..1c2c7d0 100644
+index a34f1d3..7e1edf6 100644
 --- a/net.c
 +++ b/net.c
-@@ -1150,7 +1150,7 @@ static void slirp_smb(SlirpState* s, Monitor *mon, const char *exported_dir,
+@@ -1170,7 +1170,7 @@ static void slirp_smb(SlirpState* s, Monitor *mon, const char *exported_dir,
      snprintf(smb_cmdline, sizeof(smb_cmdline), "%s -s %s",
               SMBD_COMMAND, smb_conf);
  
@@ -28,7 +28,7 @@ index 90cf912..1c2c7d0 100644
          slirp_smb_cleanup(s);
          config_error(mon, "conflicting/invalid smbserver address\n");
      }
-@@ -1239,16 +1239,17 @@ static void slirp_guestfwd(SlirpState *s, Monitor *mon, const char *config_str,
+@@ -1259,16 +1259,17 @@ static void slirp_guestfwd(SlirpState *s, Monitor *mon, const char *config_str,
          qemu_free(fwd);
          return;
      }
@@ -95,5 +95,5 @@ index 0ce62a3..9be8553 100644
  }
  
 -- 
-1.6.2.2
+1.6.2.5
 


--- qemu-fix-pcspk-build-with-kvm-disabled.patch DELETED ---


--- qemu-fix-ppc-softmmu-kvm-disabled-build.patch DELETED ---

More information about the Fedora-virt-maint mailing list