From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jes Sorensen Date: Mon, 11 May 2009 12:36:30 +0000 Subject: Re: [patch] today's qemu-kvm build fix Message-Id: <4A081BCE.2010805@sgi.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="------------070703000505020908010001" List-Id: References: <4A0816CF.8090205@sgi.com> In-Reply-To: <4A0816CF.8090205@sgi.com> To: kvm-ia64@vger.kernel.org This is a multi-part message in MIME format. --------------070703000505020908010001 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Avi Kivity wrote: > kvm.c is not (yet) built in qemu-kvm.git. Please move the function to > qemu-kvm-x86.c instead. > Ok, Grossness is now in qemu-kvm-x86.c. Jes --------------070703000505020908010001 Content-Type: text/x-patch; name="0008-qemu-cpuid-cleanup.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0008-qemu-cpuid-cleanup.patch" kvm_arch_get_supported_cpuid() doesn't belong in qemu-kvm.c as it is just an x86 specific build workaround. Signed-off-by: Jes Sorensen --- qemu-kvm-x86.c | 6 ++++++ qemu-kvm.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) Index: qemu-kvm/qemu-kvm-x86.c =================================================================== --- qemu-kvm.orig/qemu-kvm-x86.c +++ qemu-kvm/qemu-kvm-x86.c @@ -910,3 +910,9 @@ return true; return false; } + +uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, + int reg) +{ + return kvm_get_supported_cpuid(kvm_context, function, reg); +} Index: qemu-kvm/qemu-kvm.c =================================================================== --- qemu-kvm.orig/qemu-kvm.c +++ qemu-kvm/qemu-kvm.c @@ -1400,9 +1400,3 @@ if (kvm_enabled()) env->kvm_cpu_state.stopped = 1; } - -uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, - int reg) -{ - return kvm_get_supported_cpuid(kvm_context, function, reg); -} --------------070703000505020908010001--