From f2e4b83ed266cb83d3726e6410af3be3c938d5af Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Tue, 12 Mar 2019 13:58:19 -0600 Subject: [PATCH] clean up unused libvirt hooks for emulated vTPM The final upstream implementation for emulated TPM support in libvirt has merged, and as such we no longer need to maintain our own hooks. Let's clean up this code as it's no longer relevant. Change-Id: I1c1ee1fa9f53c6c4cdaecc102bb05fe548ba9fb7 Story: 2005213 Task: 29991 Signed-off-by: Chris Friesen --- virt/libvirt/libvirt/hooks/qemu | 59 +-------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/virt/libvirt/libvirt/hooks/qemu b/virt/libvirt/libvirt/hooks/qemu index 469105bd9..a1da758df 100755 --- a/virt/libvirt/libvirt/hooks/qemu +++ b/virt/libvirt/libvirt/hooks/qemu @@ -1,24 +1,11 @@ #!/bin/bash # -# Copyright (c) 2017 Wind River Systems, Inc. +# Copyright (c) 2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # # This script logs to user.log # -# An instance with vTPM enable will have a QEMU config section in its XML file. -# e.g. -# -# -# -# -# -# -# -# -# -# For more information see the vTPM HLD in /folk/cgts/docs/security/ -# # The script is called with the following parameters # e.g. /etc/libvirt/hooks/qemu # @@ -79,49 +66,5 @@ if [ "${OPERATION}" == "prepare begin -" ] || [ "${OPERATION}" == "stopped end - fi fi -VTPM_OPER="" - -if [ "$OPERATION" == "prepare begin -" ]; then - - # Get the instance's uuid - UUID=$(echo $XML_DATA | grep -oP '(?<=).*?(?=)') - if [ -z "$UUID" ]; then - # This should not happen - logger -p err -t $0 "Failed to retrieve uuid for guest $GUEST_NAME" - exit 1 - fi - - # Grab the qemu line "&1 > /dev/null - rc=$? - if [[ $rc != 0 ]]; then - logger -p err -t $0 "setup_vtpm failed with return value $rc for device $VTPM and guest $UUID" - # Do not return error if we were just doing a clear - if [ "$VTPM_OPER" != "clear" ]; then - exit 1; - fi - fi - -fi - exit 0