rpms/kvm/devel kvm-83-compile-fixes.patch, NONE, 1.1 kvm.spec, 1.86, 1.87

Eduardo Habkost ehabkost at fedoraproject.org
Wed Feb 11 16:15:00 UTC 2009


Author: ehabkost

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

Modified Files:
	kvm.spec 
Added Files:
	kvm-83-compile-fixes.patch 
Log Message:
compile fixes for newer gcc


kvm-83-compile-fixes.patch:

--- NEW FILE kvm-83-compile-fixes.patch ---
From: Eduardo Habkost <ehabkost at redhat.com>
Subject: Compile fixes for gcc 4.4.0

Newer gcc versions support a r"foobar" construct, so we can't use
"abc"R"def" constructs, without any space between R and the quotes,
when using -std=gcc99.

Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
---
Index: kvm-83/user/test/x86/vmexit.c
===================================================================
--- kvm-83.orig/user/test/x86/vmexit.c
+++ kvm-83/user/test/x86/vmexit.c
@@ -31,7 +31,7 @@ int main()
 
 	t1 = rdtsc();
 	for (i = 0; i < N; ++i)
-		asm volatile ("push %%"R"bx; cpuid; pop %%"R"bx"
+		asm volatile ("push %%" R "bx; cpuid; pop %%" R "bx"
 			      : : : "eax", "ecx", "edx");
 	t2 = rdtsc();
 	printf("vmexit latency: %d\n", (int)((t2 - t1) / N));
Index: kvm-83/user/test/x86/apic.c
===================================================================
--- kvm-83.orig/user/test/x86/apic.c
+++ kvm-83/user/test/x86/apic.c
@@ -54,14 +54,14 @@ asm (
     "push %r9  \n\t"
     "push %r8  \n\t"
 #endif
-    "push %"R"di \n\t"
-    "push %"R"si \n\t"
-    "push %"R"bp \n\t"
-    "push %"R"sp \n\t"
-    "push %"R"bx \n\t"
-    "push %"R"dx \n\t"
-    "push %"R"cx \n\t"
-    "push %"R"ax \n\t"
+    "push %" R "di \n\t"
+    "push %" R "si \n\t"
+    "push %" R "bp \n\t"
+    "push %" R "sp \n\t"
+    "push %" R "bx \n\t"
+    "push %" R "dx \n\t"
+    "push %" R "cx \n\t"
+    "push %" R "ax \n\t"
 #ifdef __x86_64__
     "mov %rsp, %rdi \n\t"
     "callq *8*16(%rsp) \n\t"
@@ -70,14 +70,14 @@ asm (
     "calll *4+4*8(%esp) \n\t"
     "add $4, %esp \n\t"
 #endif
-    "pop %"R"ax \n\t"
-    "pop %"R"cx \n\t"
-    "pop %"R"dx \n\t"
-    "pop %"R"bx \n\t"
-    "pop %"R"bp \n\t"
-    "pop %"R"bp \n\t"
-    "pop %"R"si \n\t"
-    "pop %"R"di \n\t"
+    "pop %" R "ax \n\t"
+    "pop %" R "cx \n\t"
+    "pop %" R "dx \n\t"
+    "pop %" R "bx \n\t"
+    "pop %" R "bp \n\t"
+    "pop %" R "bp \n\t"
+    "pop %" R "si \n\t"
+    "pop %" R "di \n\t"
 #ifdef __x86_64__
     "pop %r8  \n\t"
     "pop %r9  \n\t"


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- kvm.spec	11 Feb 2009 13:36:41 -0000	1.86
+++ kvm.spec	11 Feb 2009 16:14:30 -0000	1.87
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 83
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -9,6 +9,7 @@
 #Source0: http://people.qumranet.com:8888/avi/snapshots/kvm-snapshot-%{snapshot}.tar.gz
 Source1: %{name}.modules
 Patch0: %{name}-62-block-rw-range-check.patch
+Patch1: %{name}-83-compile-fixes.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -54,6 +55,7 @@
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 # "configure --kerneldir" looks for this
 # FIXME: kvm-84 or later shouldn't need this anymore, see:
@@ -195,6 +197,9 @@
 
 
 %changelog
+* Wed Feb 11 2009 Eduardo Habkost <ehabkost at redhat.com> - 83-5
+- Compile fixes for newer gcc
+
 * Wed Feb 11 2009 Eduardo Habkost <ehabkost at redhat.com> - 83-4
 - Fix block range check patch to use bdrv_wr_badreq_sectors() on
   bdrv_aio_write() (bug #484364)




More information about the fedora-extras-commits mailing list