From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42309 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P8CRB-0008UY-7a for qemu-devel@nongnu.org; Tue, 19 Oct 2010 09:41:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P8CQf-0007ZO-9H for qemu-devel@nongnu.org; Tue, 19 Oct 2010 09:41:09 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:33650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P8CQf-0007ZA-4o for qemu-devel@nongnu.org; Tue, 19 Oct 2010 09:40:37 -0400 Received: by pwi8 with SMTP id 8so8540pwi.4 for ; Tue, 19 Oct 2010 06:40:36 -0700 (PDT) Message-ID: <4CBD9FD0.8030302@codemonkey.ws> Date: Tue, 19 Oct 2010 08:40:32 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 00/10] [PULL] qemu-kvm.git uq/master queue References: In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org On 10/19/2010 05:40 AM, Marcelo Tosatti wrote: > The following changes since commit 38cc9b607f85017b095793cab6c129bc9844f441: > > issue snd_pcm_start() when capturing audio (2010-10-18 00:39:06 +0400) > > are available in the git repository at: > git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master > This breaks the build. cc1: warnings being treated as errors /home/anthony/git/qemu/target-i386/kvm.c: In function ‘kvm_on_sigbus_vcpu’: /home/anthony/git/qemu/target-i386/kvm.c:1671: error: passing argument 3 of ‘kvm_physical_memory_addr_from_ram’ from incompatible pointer type /home/anthony/git/qemu/kvm.h:180: note: expected ‘target_phys_addr_t *’ but argument is of type ‘long unsigned int *’ /home/anthony/git/qemu/target-i386/kvm.c: In function ‘kvm_on_sigbus’: /home/anthony/git/qemu/target-i386/kvm.c:1714: error: passing argument 3 of ‘kvm_physical_memory_addr_from_ram’ from incompatible pointer type /home/anthony/git/qemu/kvm.h:180: note: expected ‘target_phys_addr_t *’ but argument is of type ‘long unsigned int *’ make[1]: *** [kvm.o] Error 1 make: *** [subdir-i386-softmmu] Error 2 I've pushed my tree to http://repo.or.cz/w/qemu/aliguori.git qemu-kvm-20101019 but the merge is a fast-forward so you should have no trouble reproducing. anthony@titi:~/build/qemu$ uname -a Linux titi 2.6.32.11+drm33.2-x201 #1 SMP Sat May 22 09:58:34 PDT 2010 x86_64 GNU/Linux anthony@titi:~/build/qemu$ gcc -v Using built-in specs. Target: x86_64-linux-gnu Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.3-4ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-plugin --enable-objc-gc --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu Thread model: posix gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) Regards, Anthony Liguori > Huang Ying (1): > Add RAM -> physical addr mapping in MCE simulation > > Joerg Roedel (2): > Set cpuid definition to 0 before initializing it > Add svm cpuid features > > Marcelo Tosatti (7): > signalfd compatibility > iothread: use signalfd > Expose thread_id in info cpus > kvm: x86: add mce support > Export qemu_ram_addr_from_host > MCE: Relay UCR MCE to guest > Add savevm/loadvm support for MCE > > Makefile.objs | 1 + > compatfd.c | 117 +++++++++++++++++++ > compatfd.h | 43 +++++++ > configure | 18 +++ > cpu-common.h | 3 +- > cpu-defs.h | 1 + > cpus.c | 161 ++++++++++++++++++++++++-- > exec-all.h | 2 +- > exec.c | 27 +++-- > kvm-all.c | 18 +++ > kvm-stub.c | 5 + > kvm.h | 6 + > monitor.c | 4 + > osdep.c | 15 +++ > osdep.h | 1 + > target-i386/cpu.h | 32 +++++- > target-i386/cpuid.c | 79 ++++++++++--- > target-i386/helper.c | 6 + > target-i386/kvm.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++++- > target-i386/kvm_x86.h | 22 ++++ > 20 files changed, 817 insertions(+), 44 deletions(-) > create mode 100644 compatfd.c > create mode 100644 compatfd.h > create mode 100644 target-i386/kvm_x86.h > > >