diff options
| author | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
|---|---|---|
| committer | Cedric Schieli <cschieli@gmail.com> | 2010-06-01 12:37:47 +0000 |
| commit | 10b8b99e48384b4470cac1330080c12d2ade01de (patch) | |
| tree | 7bb4ad6cd94a2c9a960fd9a4532d123eee5151d5 /main/qemu/kqemu.patch | |
| parent | 9252f1cfd78299b137400ed8169a79f7f833daac (diff) | |
| parent | c6c0b6f9dbde1244e7b31f74c703178a867e873f (diff) | |
| download | aports-to-upstream.tar.bz2 aports-to-upstream.tar.xz | |
Merge remote branch 'upstream/master' into to-upstreamto-upstream
Diffstat (limited to 'main/qemu/kqemu.patch')
| -rw-r--r-- | main/qemu/kqemu.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/main/qemu/kqemu.patch b/main/qemu/kqemu.patch new file mode 100644 index 00000000..337a356c --- /dev/null +++ b/main/qemu/kqemu.patch @@ -0,0 +1,32 @@ +--- a/kqemu.c 2009-07-17 00:56:23.000000000 +0000 ++++ b/kqemu.c 2009-08-22 13:20:00.000000000 +0000 +@@ -93,9 +93,9 @@ + int qpi_io_memory; + uint32_t kqemu_comm_base; /* physical address of the QPI communication page */ + +-#define cpuid(index, eax, ebx, ecx, edx) \ ++#define cpuid(index, eax, ecx, edx) \ + asm volatile ("cpuid" \ +- : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx) \ ++ : "=a" (eax), "=c" (ecx), "=d" (edx) \ + : "0" (index)) + + #ifdef __x86_64__ +@@ -125,7 +125,7 @@ + static void kqemu_update_cpuid(CPUState *env) + { + int critical_features_mask, features, ext_features, ext_features_mask; +- uint32_t eax, ebx, ecx, edx; ++ uint32_t eax, ecx, edx; + + /* the following features are kept identical on the host and + target cpus because they are important for user code. Strictly +@@ -140,7 +140,7 @@ + features = 0; + ext_features = 0; + } else { +- cpuid(1, eax, ebx, ecx, edx); ++ cpuid(1, eax, ecx, edx); + features = edx; + ext_features = ecx; + } |