From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YznZP-0001hZ-7t for qemu-devel@nongnu.org; Tue, 02 Jun 2015 10:53:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YznZL-0004SX-7x for qemu-devel@nongnu.org; Tue, 02 Jun 2015 10:53:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YznZL-0004SK-15 for qemu-devel@nongnu.org; Tue, 02 Jun 2015 10:53:31 -0400 Date: Tue, 2 Jun 2015 16:53:27 +0200 From: Igor Mammedov Message-ID: <20150602165327.51cd7520@nial.brq.redhat.com> In-Reply-To: <556CEDFF.4090504@linux.vnet.ibm.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> <20150601173958.GI13155@redhat.com> <556CEDFF.4090504@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII 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: Stefan Berger Cc: Peter Maydell , QEMU Developers , "Michael S. Tsirkin" On Mon, 01 Jun 2015 19:42:55 -0400 Stefan Berger wrote: > 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 If you have used conversion to AML API example I've provided nothing would be lost. > > 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 > > > g