rpms/kvm/F-7 kvm-35-ldflags.patch, NONE, 1.1 qemu-atapi-hsm.patch, NONE, 1.1 kvm.spec, 1.13, 1.14 sources, 1.9, 1.10

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/kvm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30342

Modified Files:
	kvm.spec sources 
Added Files:
	kvm-35-ldflags.patch qemu-atapi-hsm.patch 
Log Message:
* Mon Aug 20 2007 Jeremy Katz <katzj at redhat.com> - 35-2
- add fix for ATAPI from upstream qemu


kvm-35-ldflags.patch:

--- NEW FILE kvm-35-ldflags.patch ---
diff -up kvm-35/configure.ldflags kvm-35/configure
--- kvm-35/configure.ldflags	2007-08-20 17:40:39.000000000 -0400
+++ kvm-35/configure	2007-08-20 17:40:50.000000000 -0400
@@ -83,7 +83,7 @@ target_cpu() {
 (cd user; ./configure --prefix="$prefix" --kerneldir="$libkvm_kerneldir")
 (cd qemu; ./configure --target-list=$(target_cpu)-softmmu --cc="$qemu_cc" \
     --disable-kqemu --extra-cflags="-I $PWD/../user" \
-    --extra-ldflags="-L $PWD/../user" \
+    --extra-ldflags="-L $PWD/../user $LDFLAGS" \
     --enable-kvm --kernel-path="$libkvm_kerneldir" \
     --enable-alsa \
     ${disable_gcc_check:+"--disable-gcc-check"} \

qemu-atapi-hsm.patch:

--- NEW FILE qemu-atapi-hsm.patch ---
From: Brandon Philips <brandon at ifup.org>
Newsgroups: gmane.comp.emulators.qemu
Subject: [PATCH][RFC] Fix bugs in the ATAPI cdrom driver
Date: Fri, 17 Aug 2007 16:43:04 -0700
Message-ID: <20070817234304.GB10490 at ifup.org>
Reply-To: qemu-devel at nongnu.org

The new libata-eh in the Linux kernel is throwing a fit over the QEMU
cdrom device for two reasons:

1) DRQ can be set with ERR_STAT set.  This is a violation of the ATAPI
state machine.

2) After a TEST_UNIT_READY ATAPI command is sent ERR_STAT is getting set
which is correct.  But, when the OS issues another ATAPI command
ERR_STAT is still set.  Which is bad since the next expected command
from the OS is REQUEST_SENSE to find out why ERR_STAT is set.

bug this fixes: https://bugzilla.novell.com/show_bug.cgi?id=291775

Signed-off-by: Brandon Philips <bphilips at suse.de>

---
 hw/ide.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: qemu-0.9.0/hw/ide.c
===================================================================
--- qemu/hw/ide.c
+++ qemu/hw/ide.c
@@ -586,7 +586,9 @@ static void ide_transfer_start(IDEState 
     s->end_transfer_func = end_transfer_func;
     s->data_ptr = buf;
     s->data_end = buf + size;
-    s->status |= DRQ_STAT;
+    /* don't violate the HSM */
+    if (!(s->status & ERR_STAT))
+        s->status |= DRQ_STAT;
 }
 
 static void ide_transfer_stop(IDEState *s)
@@ -1805,6 +1807,7 @@ static void ide_ioport_write(void *opaqu
             /* overlapping commands not supported */
             if (s->feature & 0x02)
                 goto abort_cmd;
+            s->status = READY_STAT;
             s->atapi_dma = s->feature & 1;
             s->nsector = 1;
             ide_transfer_start(s, s->io_buffer, ATAPI_PACKET_SIZE, 





Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-7/kvm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kvm.spec	16 May 2007 15:48:16 -0000	1.13
+++ kvm.spec	21 Aug 2007 17:23:49 -0000	1.14
@@ -1,15 +1,17 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 24
-Release: 1
-License: GPL
+Version: 35
+Release: 2%{?dist}
+License: GPLv2 and LGPLv2
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
 Source1: kvm.modules
 Patch0: kvm-19-defaults.patch
+Patch1: kvm-35-ldflags.patch
 # patches from upstream qemu
-Patch100: qemu-0.9.0-load-initrd.patch
+Patch101: kvm-rtl8139-mmio-regions.patch
+Patch102: qemu-atapi-hsm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -33,8 +35,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .defaults
+%patch1 -p1 -b .ldflags
 
-%patch100 -p0
+%patch101 -p1
+%patch102 -p0
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -79,6 +83,28 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Mon Aug 20 2007 Jeremy Katz <katzj at redhat.com> - 35-2
+- add fix for ATAPI from upstream qemu
+
+* Mon Aug 20 2007 Jeremy Katz <katzj at redhat.com> - 35-1
+- update to kvm-35
+- patch to use -Wl,--build-id so that we get debuginfo
+
+* Thu Jul 19 2007 Jeremy Katz <katzj at redhat.com> - 31-1
+- update to kvm-31
+
+* Mon Jul 16 2007 Jeremy Katz <katzj at redhat.com> - 28-2
+- add patch from danpb to fix mac addrs of multiple 8139 nics (#247641)
+
+* Wed Jun 13 2007 Jeremy Katz <katzj at redhat.com> - 28-1
+- update to kvm-28
+
+* Sat Jun  9 2007 Jeremy Katz <katzj at redhat.com> - 27-1
+- update to kvm-27
+
+* Tue May 29 2007 Jeremy Katz <katzj at redhat.com> - 26-1
+- update to kvm-26
+
 * Wed May 16 2007 Jeremy Katz <katzj at redhat.com> - 24-1
 - update to kvm-24
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/F-7/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 May 2007 15:48:16 -0000	1.9
+++ sources	21 Aug 2007 17:23:49 -0000	1.10
@@ -1 +1 @@
-76467c32a7249fad65cf455cbbc489d9  kvm-24.tar.gz
+d83569154ecca5da5514a130865d88c6  kvm-35.tar.gz