compile fix - avoid raw string literal

Commit Message

Jochen Roth March 12, 2009, 1:19 p.m. UTC

This patch fixes compilation problems of kvm-userspace on current gcc 
4.4 compilers which implement the following standard: 
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm

Signed-off-by: Jochen Roth <[e-mail]>


--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Avi Kivity March 15, 2009, 1:11 p.m. UTC | #1

Jochen Roth wrote:
> This patch fixes compilation problems of kvm-userspace on current gcc 
> 4.4 compilers which implement the following standard: 
> http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2442.htm
>

Applied, thanks.  Something's fishy with your mailer though - it 
wouldn't apply except by reducing context to 0.  Please make sure your 
mailer doesn't corrupt patches.

Patch

diff --git a/user/test/x86/apic.c b/user/test/x86/apic.c
index 9c6205b..7794615 100644
--- a/user/test/x86/apic.c
+++ b/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"
diff --git a/user/test/x86/vmexit.c b/user/test/x86/vmexit.c
index bd57bfa..981d6c1 100644
--- a/user/test/x86/vmexit.c
+++ b/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));