Re: [Qemu-devel] [PULL v2 00/60] pc, pci, tpm, virtio, vhost enhancements and fixes

[Daniel P. Berrange]

On Mon, Jun 01, 2015 at 05:33:24PM +0100, Peter Maydell wrote:
> On 1 June 2015 at 13:22, Michael S. Tsirkin <address@hidden> 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 <address@hidden>
> >
> 
> 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

commit 5cb18b3d7bff2a83275ee98af2a14eb9e21c93ab
Author: Stefan Berger <address@hidden>
Date:   Tue May 26 16:51:07 2015 -0400

    TPM2 ACPI table support
    
    Add a TPM2 ACPI table if a TPM 2 is used in the backend.
    Also add an SSDT for the TPM 2.
    
    Rename tpm_find() to tpm_get_version() and have this function
    return the version of the TPM found, TPMVersion_Unspec if
    no TPM is found. Use the version number to build version
    specific ACPI tables.
    
    Signed-off-by: Stefan Berger <address@hidden>
    Reviewed-by: Michael S. Tsirkin <address@hidden>
    Signed-off-by: Michael S. Tsirkin <address@hidden>


Which references the ssdt-tpm-common.dsl file:

diff --git a/hw/i386/ssdt-tpm.dsl b/hw/i386/ssdt-tpm.dsl
index 75d9691..d81478c 100644
--- a/hw/i386/ssdt-tpm.dsl
+++ b/hw/i386/ssdt-tpm.dsl
@@ -25,19 +25,5 @@ DefinitionBlock (
     0x1                 // OEM Revision
     )
 {
-    Scope(\_SB) {
-        /* TPM with emulated TPM TIS interface */
-        Device (TPM) {
-            Name (_HID, EisaID ("PNP0C31"))
-            Name (_CRS, ResourceTemplate ()
-            {
-                Memory32Fixed (ReadWrite, TPM_TIS_ADDR_BASE, TPM_TIS_ADDR_SIZE)
-                // older Linux tpm_tis drivers do not work with IRQ
-                //IRQNoFlags () {TPM_TIS_IRQ}
-            })
-            Method (_STA, 0, NotSerialized) {
-                Return (0x0F)
-            }
-        }
-    }
+#include "ssdt-tpm-common.dsl"
 }


but never adds that file, nor alternatively any rules to generate the
file AFAICT.


I have a fresh checkout of QEMU at

commit b821cbe274c5a5cacf1a7b28360d869ae1e6e0c3
Merge: 9657caf 830d70d
Author: Peter Maydell <address@hidden>
Date:   Mon Jun 1 15:22:46 2015 +0100

    Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
    

built on Fedora 22 with:


$ ./configure --target-list=x86_64-softmmu
Install prefix    /usr/local
BIOS directory    /usr/local/share/qemu
binary directory  /usr/local/bin
library directory /usr/local/lib
module directory  /usr/local/lib/qemu
libexec directory /usr/local/libexec
include directory /usr/local/include
config directory  /usr/local/etc
local state directory   /usr/local/var
Manual directory  /usr/local/share/man
ELF interp prefix /usr/gnemul/qemu-%M
Source path       /home/berrange/src/virt/qemu-new
C compiler        cc
Host C compiler   cc
C++ compiler      c++
Objective-C compiler clang
ARFLAGS           rv
CFLAGS            -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread 
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include  -g 
QEMU_CFLAGS       -I/usr/include/pixman-1   -Werror -DHAS_LIBSSH2_SFTP_FSYNC 
-fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
-Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings 
-Wmissing-prototypes -fno-strict-aliasing -fno-common  -Wendif-labels 
-Wmissing-include-dirs -Wempty-body -Wnested-externs -Wformat-security 
-Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration 
-Wold-style-definition -Wtype-limits -fstack-protector-strong  
-I/usr/include/p11-kit-1  -I/usr/include/p11-kit-1    -I/usr/include/libpng16  
-I/usr/include/spice-server -I/usr/include/cacard -I/usr/include/nss3 
-I/usr/include/nspr4 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include 
-I/usr/include/pixman-1 -I/usr/include/spice-1  -I/usr/include/libusb-1.0  
LDFLAGS           -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g 
make              make
install           install
python            python -B
smbd              /usr/sbin/smbd
module support    no
host CPU          x86_64
host big endian   no
target list       x86_64-softmmu
tcg debug enabled no
gprof enabled     no
sparse enabled    no
strip binaries    yes
profiler          no
static build      no
pixman            system
SDL support       yes
GTK support       yes
VTE support       yes
curses support    yes
curl support      yes
mingw32 support   no
Audio drivers     oss
Block whitelist (rw) 
Block whitelist (ro) 
VirtFS support    yes
VNC support       yes
VNC TLS support   yes
VNC SASL support  yes
VNC JPEG support  yes
VNC PNG support   yes
VNC WS support    yes
xen support       yes
xen ctrl version  450
brlapi support    yes
bluez  support    yes
Documentation     yes
GUEST_BASE        yes
PIE               yes
vde support       no
netmap support    no
Linux AIO support yes
ATTR/XATTR support yes
Install blobs     yes
KVM support       yes
RDMA support      yes
TCG interpreter   no
fdt support       yes
preadv support    yes
fdatasync         yes
madvise           yes
posix_madvise     yes
sigev_thread_id   yes
uuid support      yes
libcap-ng support yes
vhost-net support yes
vhost-scsi support yes
Trace backends    nop
spice support     yes (0.12.7/0.12.5)
rbd support       yes
xfsctl support    yes
nss used          yes
libusb            yes
usb net redir     yes
OpenGL support    yes
libiscsi support  yes
libnfs support    no
build guest agent yes
QGA VSS support   no
seccomp support   yes
coroutine backend ucontext
coroutine pool    yes
GlusterFS support yes
Archipelago support no
gcov              gcov
gcov enabled      no
TPM support       yes
libssh2 support   yes
TPM passthrough   yes
QOM debugging     yes
vhdx              yes
Quorum            yes
lzo support       no
snappy support    no
bzip2 support     yes
NUMA host support yes
tcmalloc support  no



Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|