From 6614511d6557151b42178accec759f0801c712dd Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Jul 28 2009 08:17:19 +0000 Subject: Sync from git again --- diff --git a/qemu-bios-bigger-roms.patch b/qemu-bios-bigger-roms.patch index 7416c87..35b63a2 100644 --- a/qemu-bios-bigger-roms.patch +++ b/qemu-bios-bigger-roms.patch @@ -1,4 +1,4 @@ -From c9aea972de34bad96814301988df698063ccf608 Mon Sep 17 00:00:00 2001 +From dd5a9dedba205ad51ef2fc70f0a1dddea7ff4a4f Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 24 Jun 2009 14:31:41 +0100 Subject: [PATCH] compute checksum for roms bigger than a segment @@ -17,6 +17,7 @@ the image size (thus, maximum size = 0xff = 128k = 2 segments) Signed-off-by: Glauber Costa Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-bios-bigger-roms.patch --- kvm/bios/rombios.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/qemu-fix-build-for-esd-audio.patch b/qemu-fix-build-for-esd-audio.patch index de62d4c..f43bb6f 100644 --- a/qemu-fix-build-for-esd-audio.patch +++ b/qemu-fix-build-for-esd-audio.patch @@ -1,4 +1,4 @@ -From b37fb38b6043e319768fa92d5541fe20afb4741b Mon Sep 17 00:00:00 2001 +From 17588a0bbf311ad95c6d3ad84f5edb8f98353d58 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 1 Jul 2009 10:07:16 -0500 Subject: [PATCH] Fix build for ESD audio @@ -7,6 +7,7 @@ Subject: [PATCH] Fix build for ESD audio Signed-off-by: Anthony Liguori Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-fix-build-for-esd-audio.patch --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-fix-linux-user-build-on-ppc.patch b/qemu-fix-linux-user-build-on-ppc.patch index 768d4bc..6d1c86c 100644 --- a/qemu-fix-linux-user-build-on-ppc.patch +++ b/qemu-fix-linux-user-build-on-ppc.patch @@ -1,4 +1,4 @@ -From 978e305a8cb8533bef2c6238c88e96913f7d09d0 Mon Sep 17 00:00:00 2001 +From 052506320166112bec0b5b7aa272973c1a508551 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Mon, 29 Jun 2009 14:49:03 +0100 Subject: [PATCH] Fix linux-user build on ppc @@ -37,6 +37,7 @@ Problem seems to be that signal.h is pulling in a bunch of ppc headers which expose elf_greg_t, R_PPC_* and PPC_FEATURE_*. Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-fix-linux-user-build-on-ppc.patch --- elf.h | 2 ++ linux-user/elfload.c | 10 ++++++++++ diff --git a/qemu-prefer-sysfs-for-usb-host-devices.patch b/qemu-prefer-sysfs-for-usb-host-devices.patch index 5fbbf2c..6441f0d 100644 --- a/qemu-prefer-sysfs-for-usb-host-devices.patch +++ b/qemu-prefer-sysfs-for-usb-host-devices.patch @@ -1,4 +1,4 @@ -From da1377c5e28ea68a6492b627725e8dd5f7acbb0a Mon Sep 17 00:00:00 2001 +From dfeae76a9a941c12ffe828848476a4a31a358205 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 3 Jul 2009 09:17:20 +0100 Subject: [PATCH] Prefer sysfs for USB host devices @@ -15,8 +15,11 @@ See also: https://bugzilla.redhat.com/508326 +(cherry picked from commit 554962405cb18a3e624edf05b6257eaf9273810c) + Reported-by: Daniel Berrange Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-prefer-sysfs-for-usb-host-devices.patch --- usb-linux.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qemu-slirp-Fix-guestfwd-for-incoming-data.patch b/qemu-slirp-Fix-guestfwd-for-incoming-data.patch index 95a14cf..c4c87fd 100644 --- a/qemu-slirp-Fix-guestfwd-for-incoming-data.patch +++ b/qemu-slirp-Fix-guestfwd-for-incoming-data.patch @@ -1,4 +1,4 @@ -From ff933dfefb22e2ef115eb6035e23b0f64335b0db Mon Sep 17 00:00:00 2001 +From 57ab33ece875e62e47d09e52bcd0d9d108594729 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 22 Jul 2009 17:03:52 +0200 Subject: [PATCH] slirp: Fix guestfwd for incoming data @@ -7,8 +7,12 @@ Unless a virtual server address was explicitly defined (which is impossible with the legacy -net channel format), guestfwd did not properly forwarded host->guest packets. This patch fixes it. +(cherry picked from commit bb53fc5394201c0cbe3c89a1c9fa5fbd6a3b832c) + Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori +Signed-off-by: Mark McLoughlin +Fedora-patch: qemu-slirp-Fix-guestfwd-for-incoming-data.patch --- net.c | 11 ++++++----- slirp/libslirp.h | 2 +-