From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzZMb-0004hl-8p for qemu-devel@nongnu.org; Mon, 01 Jun 2015 19:43:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzZMY-0007LA-2A for qemu-devel@nongnu.org; Mon, 01 Jun 2015 19:43:25 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:55514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzZMX-0006u6-Rv for qemu-devel@nongnu.org; Mon, 01 Jun 2015 19:43:21 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 1 Jun 2015 17:42:59 -0600 Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id A97CD1FF0030 for ; Mon, 1 Jun 2015 17:34:06 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t51Ngu7I52559914 for ; Mon, 1 Jun 2015 16:42:56 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t51NguUN023086 for ; Mon, 1 Jun 2015 17:42:56 -0600 Message-ID: <556CEDFF.4090504@linux.vnet.ibm.com> Date: Mon, 01 Jun 2015 19:42:55 -0400 From: Stefan Berger MIME-Version: 1.0 References: <1433161230-29421-1-git-send-email-mst@redhat.com> <20150601173958.GI13155@redhat.com> In-Reply-To: <20150601173958.GI13155@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL v2 00/60] pc, pci, tpm, virtio, vhost enhancements and fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , Peter Maydell Cc: QEMU Developers , "Michael S. Tsirkin" On 06/01/2015 01:39 PM, Daniel P. Berrange wrote: > On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote: >> On 1 June 2015 at 13:22, Michael S. Tsirkin wrote: >>> The following changes since commit 97af820f539efe80b87615a04f9de11ea585f725: >>> >>> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150529' into staging (2015-05-29 17:10:57 +0100) >>> >>> are available in the git repository at: >>> >>> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream >>> >>> for you to fetch changes up to 830d70db692e374b55555f4407f96a1ceefdcc97: >>> >>> vhost-user: add multi queue support (2015-06-01 14:18:55 +0200) >>> >>> Changes from v1: >>> adding two TPM files that I forgot to commit >>> added a couple of patches that became ready since the pull request >>> >>> ---------------------------------------------------------------- >>> pc, pci, tpm, virtio, vhost enhancements and fixes >>> >>> A bunch of cleanups and fixes all over the place, >>> enhancements in TPM, virtio and vhost. >>> >>> Signed-off-by: Michael S. Tsirkin >>> >> Applied, thanks. > This appears to have broken the build for me > > CPP x86_64-softmmu/ssdt-tpm.dsl.i.orig > /home/berrange/src/virt/qemu-new/hw/i386/ssdt-tpm.dsl:28:31: fatal error: ssdt-tpm-common.dsl: No such file or directory > compilation terminated. > /home/berrange/src/virt/qemu-new/hw/i386/Makefile.objs:20: recipe for target 'hw/i386/ssdt-tpm.hex' failed > make[1]: *** [hw/i386/ssdt-tpm.hex] Error 1 > Makefile:173: recipe for target 'subdir-x86_64-softmmu' failed > make: *** [subdir-x86_64-softmmu] Error 2 > > > I believe this is caused by Yes, it is broken. The patches for ssdt-tpm-common.dsl must have gotten lost somewhere. It was still here: http://lists.nongnu.org/archive/html/qemu-devel/2015-06/msg00165.html hw/i386/Makefile.objs | 2 +- hw/i386/acpi-build.c | 38 ++++++++++++-- hw/i386/acpi-defs.h | 18 +++++++ >hw/i386/ssdt-tpm-common.dsl | 36 +++++++++++++ hw/i386/ssdt-tpm.dsl | 16 +----- hw/i386/ssdt-tpm.hex.generated | 26 +++++++--- hw/i386/ssdt-tpm2.dsl | 29 +++++++++++ hw/i386/ssdt-tpm2.hex.generated | 109 ++++++++++++++++++++++++++++++++++++++++ hw/tpm/tpm_tis.c | 11 ++++ include/hw/acpi/tpm.h | 5 ++ include/sysemu/tpm.h | 11 +++- I'll repost the missing file(s) asap. Stefan