qemuxml2argvmock: qemuBuildTPMOpenBackendFDs: Use real FDs

Use 'virTestMakeDummyFD()' to create real FDs both for 'tpmfd' and
'cancelfd'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index d9f9c8e27818c8946bbeab5b848da23eeedbad82..826109396435b6721af1d8b7f7b2957f871d2020 100644 (file)
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -40,6 +40,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 long virGetSystemPageSize(void)
@@ -245,16 +247,12 @@ qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUSED,
 
 
 int
-qemuBuildTPMOpenBackendFDs(const char *tpmdev G_GNUC_UNUSED,
+qemuBuildTPMOpenBackendFDs(const char *tpmdev,
                            int *tpmfd,
                            int *cancelfd)
 {
-    if (fcntl(1730, F_GETFD) != -1 ||
-        fcntl(1731, F_GETFD) != -1)
-        abort();
-
-    *tpmfd = 1730;
-    *cancelfd = 1731;
+    *tpmfd = virTestMakeDummyFD(g_strdup_printf("@tpm-%s-fd@", tpmdev));
+    *cancelfd = virTestMakeDummyFD(g_strdup_printf("@tpm-%s-cancelfd@", tpmdev));
     return 0;
 }
 

diff --git a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
index f9f6acff01f210332909fda999d35ffb3117bf3a..856bdb03aa78386c02181c6a3cebb732c3a936d1 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough-crb.x86_64-latest.args
@@ -27,8 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-shutdown \
 -boot menu=on,strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--add-fd set=0,fd=XXXXXXX,opaque=tpm0-tpm \
--add-fd set=1,fd=XXXXXXX,opaque=tpm0-cancel \
+-add-fd set=0,fd=@tpm-/dev/tpm0-fd@,opaque=tpm0-tpm \
+-add-fd set=1,fd=@tpm-/dev/tpm0-cancelfd@,opaque=tpm0-cancel \
 -tpmdev passthrough,id=tpm-tpm0,path=/dev/fdset/0,cancel-path=/dev/fdset/1 \
 -device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \

diff --git a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
index cd92127ade6b6043ccd23e8f117150718381091e..42738cf4ea998dcf8206a6d1b95cb0e7859e9b43 100644 (file)
--- a/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/tpm-passthrough.x86_64-latest.args
@@ -27,8 +27,8 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-TPM-VM/.config \
 -no-shutdown \
 -boot menu=on,strict=on \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
--add-fd set=0,fd=XXXXXXX,opaque=tpm0-tpm \
--add-fd set=1,fd=XXXXXXX,opaque=tpm0-cancel \
+-add-fd set=0,fd=@tpm-/dev/tpm0-fd@,opaque=tpm0-tpm \
+-add-fd set=1,fd=@tpm-/dev/tpm0-cancelfd@,opaque=tpm0-cancel \
 -tpmdev passthrough,id=tpm-tpm0,path=/dev/fdset/0,cancel-path=/dev/fdset/1 \
 -device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \