From nobody Tue May 14 10:44:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621027860; cv=none; d=zohomail.com; s=zohoarc; b=NNIoV4TZurj+G8K1MFYo5ZGTFIcXTrQW9VwvWYPOJPaHxE+Efr18qlM9fFwEZkSlySXJe/gk1NI11m903CMjc1Pel1s/SxB8XG5+BIsc+Y0sIgqT1dde9MfiWsEHa/j7I4jTQ3QyAfPoLBiR/w5cDwzHIkkD9PIFJq8qGdvSkJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621027860; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SI/jxYEThR6L0i+tNCznMcqWNNDsEvTQbPMfLUgkfsU=; b=iEklj/WAcTw2e7+RB2SjUHkdLyS300BN4ESmORf+5FMLc1k69jObmZomOq689Q393FtylHmt4IdK7ANblcEdJm5rJWkucWULgU/gSGNvfIe7lRmlFaCkFVSuTdJr1TGXivdM+pdX9WxE3ukdVI02DYWKTJ2upWZiWm4vLJzB+w0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621027860420937.0072654851797; Fri, 14 May 2021 14:31:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-CNyo0jnoMMmiekLG-fizfw-1; Fri, 14 May 2021 17:30:57 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 495E4FC9D; Fri, 14 May 2021 21:30:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C85DC36807; Fri, 14 May 2021 21:30:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4CCD955347; Fri, 14 May 2021 21:30:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14ELT9vZ017821 for ; Fri, 14 May 2021 17:29:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C86716938; Fri, 14 May 2021 21:29:09 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-114-89.phx2.redhat.com [10.3.114.89]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32A8061156 for ; Fri, 14 May 2021 21:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621027859; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SI/jxYEThR6L0i+tNCznMcqWNNDsEvTQbPMfLUgkfsU=; b=DsylnvqcJd+kcugZpNpHHVbAjHUJgOylLclbCz+L6TdCOq5G9djkZkK8ydAw7MQrWlURTf TufaObfxdF6fl5AStFm7uT4hPnXTXY3Y3FTGjwJNjNnfPM60p43TKybomcNe/I1ZpjpZPT PB9hDfMa+ygGFOSHr2aiEhoq2dxolb0= X-MC-Unique: CNyo0jnoMMmiekLG-fizfw-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] test: move nodedev xml2xml output to a separate dir Date: Fri, 14 May 2021 16:28:58 -0500 Message-Id: <20210514212901.108447-2-jjongsma@redhat.com> In-Reply-To: <20210514212901.108447-1-jjongsma@redhat.com> References: <20210514212901.108447-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Currently, we're loading and parsing the xml from the input file, and then formatting it and then comparing it directly back to the input file. This works for now, but is severely limiting as it relies on the input file being fully-specified and in the exact order as the output xml format. If optional elements are ommitted in the input XML, the output xml may include default values for the ommitted elements and thus the output will not match the input. In order to allow more flexibility in testing, save the expected output to a seprate 'out' directory similar to what most of the other xml2xml tests are already doing. Signed-off-by: Jonathon Jongsma Reviewed-by: Michal Privoznik --- tests/nodedevxml2xmlout/DVD_GCC_4247N.xml | 15 +++++++++ tests/nodedevxml2xmlout/DVD_with_media.xml | 18 ++++++++++ tests/nodedevxml2xmlout/ap_07_0038.xml | 9 +++++ tests/nodedevxml2xmlout/ap_card07.xml | 8 +++++ tests/nodedevxml2xmlout/ap_matrix.xml | 7 ++++ .../ap_matrix_mdev_types.xml | 14 ++++++++ tests/nodedevxml2xmlout/ccw_0_0_ffff.xml | 10 ++++++ tests/nodedevxml2xmlout/computer.xml | 16 +++++++++ .../css_0_0_fffe_mdev_types.xml | 17 ++++++++++ tests/nodedevxml2xmlout/css_0_0_ffff.xml | 10 ++++++ tests/nodedevxml2xmlout/drm_renderD129.xml | 10 ++++++ ...v_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 8 +++++ ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 9 +++++ .../net_00_13_02_b9_f9_d3.xml | 21 ++++++++++++ .../net_00_15_58_2f_e9_55.xml | 21 ++++++++++++ .../pci_0000_00_02_0_header_type.xml | 16 +++++++++ .../pci_0000_00_1c_0_header_type.xml | 21 ++++++++++++ .../pci_0000_02_10_7_mdev_types.xml | 33 +++++++++++++++++++ .../pci_0000_02_10_7_sriov.xml | 24 ++++++++++++++ .../pci_0000_02_10_7_sriov_pf_vfs_all.xml | 29 ++++++++++++++++ ...0_02_10_7_sriov_pf_vfs_all_header_type.xml | 31 +++++++++++++++++ .../pci_0000_02_10_7_sriov_vfs.xml | 27 +++++++++++++++ ..._0000_02_10_7_sriov_zero_vfs_max_count.xml | 22 +++++++++++++ tests/nodedevxml2xmlout/pci_1002_71c4.xml | 14 ++++++++ .../pci_8086_0c0c_snd_hda_intel.xml | 17 ++++++++++ .../pci_8086_10c9_sriov_pf.xml | 18 ++++++++++ .../pci_8086_27c5_scsi_host.xml | 7 ++++ .../pci_8086_27c5_scsi_host_0.xml | 7 ++++ .../pci_8086_27c5_scsi_host_0_unique_id.xml | 8 +++++ ...i_8086_27c5_scsi_host_scsi_device_lun0.xml | 11 +++++++ .../pci_8086_27c5_scsi_host_scsi_host.xml | 7 ++++ .../pci_8086_4238_pcie_wireless.xml | 27 +++++++++++++++ tests/nodedevxml2xmlout/scsi_target0_0_0.xml | 7 ++++ tests/nodedevxml2xmlout/scsi_target1_0_0.xml | 12 +++++++ ...rial_3600c0ff000d7a2a5d463ff4902000000.xml | 19 +++++++++++ ...al_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml | 14 ++++++++ .../usb_device_1d6b_1_0000_00_1d_0.xml | 10 ++++++ .../usb_device_1d6b_1_0000_00_1d_0_if0.xml | 10 ++++++ tests/nodedevxml2xmltest.c | 12 ++++--- 39 files changed, 591 insertions(+), 5 deletions(-) create mode 100644 tests/nodedevxml2xmlout/DVD_GCC_4247N.xml create mode 100644 tests/nodedevxml2xmlout/DVD_with_media.xml create mode 100644 tests/nodedevxml2xmlout/ap_07_0038.xml create mode 100644 tests/nodedevxml2xmlout/ap_card07.xml create mode 100644 tests/nodedevxml2xmlout/ap_matrix.xml create mode 100644 tests/nodedevxml2xmlout/ap_matrix_mdev_types.xml create mode 100644 tests/nodedevxml2xmlout/ccw_0_0_ffff.xml create mode 100644 tests/nodedevxml2xmlout/computer.xml create mode 100644 tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types.xml create mode 100644 tests/nodedevxml2xmlout/css_0_0_ffff.xml create mode 100644 tests/nodedevxml2xmlout/drm_renderD129.xml create mode 100644 tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1= da537d301b.xml create mode 100644 tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2= a01e8e48ad.xml create mode 100644 tests/nodedevxml2xmlout/net_00_13_02_b9_f9_d3.xml create mode 100644 tests/nodedevxml2xmlout/net_00_15_58_2f_e9_55.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_a= ll.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_a= ll_header_type.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml create mode 100644 tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs= _max_count.xml create mode 100644 tests/nodedevxml2xmlout/pci_1002_71c4.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_10c9_sriov_pf.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_uniqu= e_id.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_de= vice_lun0.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_ho= st.xml create mode 100644 tests/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml create mode 100644 tests/nodedevxml2xmlout/scsi_target0_0_0.xml create mode 100644 tests/nodedevxml2xmlout/scsi_target1_0_0.xml create mode 100644 tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a= 5d463ff4902000000.xml create mode 100644 tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9= SA00_MPCZ12Y0GNGWSE.xml create mode 100644 tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.= xml create mode 100644 tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_= if0.xml diff --git a/tests/nodedevxml2xmlout/DVD_GCC_4247N.xml b/tests/nodedevxml2x= mlout/DVD_GCC_4247N.xml new file mode 100644 index 0000000000..aed787a6c3 --- /dev/null +++ b/tests/nodedevxml2xmlout/DVD_GCC_4247N.xml @@ -0,0 +1,15 @@ + + DVD_GCC_4247N + pci_8086_27df_scsi_host_scsi_device_lun0 + + /dev/sr0 + scsi + cdrom + RW/DVD GCC-4247N + HL-DT-ST + + 0 + 0 + + + diff --git a/tests/nodedevxml2xmlout/DVD_with_media.xml b/tests/nodedevxml2= xmlout/DVD_with_media.xml new file mode 100644 index 0000000000..f169885eb1 --- /dev/null +++ b/tests/nodedevxml2xmlout/DVD_with_media.xml @@ -0,0 +1,18 @@ + + DVD_GCC_4247N + pci_8086_27df_scsi_host_scsi_device_lun0 + + /dev/sr0 + scsi + cdrom + RW/DVD GCC-4247N + HL-DT-ST + + 1 + 12345678 + Windows_XP_Label + 2048 + 6028 + + + diff --git a/tests/nodedevxml2xmlout/ap_07_0038.xml b/tests/nodedevxml2xmlo= ut/ap_07_0038.xml new file mode 100644 index 0000000000..553c68f27b --- /dev/null +++ b/tests/nodedevxml2xmlout/ap_07_0038.xml @@ -0,0 +1,9 @@ + + ap_07_0038 + /sys/devices/ap/card07/07.0038 + ap_card07 + + 0x07 + 0x0038 + + diff --git a/tests/nodedevxml2xmlout/ap_card07.xml b/tests/nodedevxml2xmlou= t/ap_card07.xml new file mode 100644 index 0000000000..14a845fd62 --- /dev/null +++ b/tests/nodedevxml2xmlout/ap_card07.xml @@ -0,0 +1,8 @@ + + ap_card07 + /sys/devices/ap/card07 + computer + + 0x07 + + diff --git a/tests/nodedevxml2xmlout/ap_matrix.xml b/tests/nodedevxml2xmlou= t/ap_matrix.xml new file mode 100644 index 0000000000..30dab9cfc8 --- /dev/null +++ b/tests/nodedevxml2xmlout/ap_matrix.xml @@ -0,0 +1,7 @@ + + ap_matrix + /sys/devices/vfio_ap/matrix + computer + + + diff --git a/tests/nodedevxml2xmlout/ap_matrix_mdev_types.xml b/tests/noded= evxml2xmlout/ap_matrix_mdev_types.xml new file mode 100644 index 0000000000..b3802e6d8b --- /dev/null +++ b/tests/nodedevxml2xmlout/ap_matrix_mdev_types.xml @@ -0,0 +1,14 @@ + + ap_matrix + /sys/devices/vfio_ap/matrix + computer + + + + VFIO AP Passthrough Device + vfio-ap + 65536 + + + + diff --git a/tests/nodedevxml2xmlout/ccw_0_0_ffff.xml b/tests/nodedevxml2xm= lout/ccw_0_0_ffff.xml new file mode 100644 index 0000000000..3b8ea46e37 --- /dev/null +++ b/tests/nodedevxml2xmlout/ccw_0_0_ffff.xml @@ -0,0 +1,10 @@ + + ccw_0_0_ffff + /sys/devices/css0/0.0.0070/0.0.ffff + css_0_0_0070 + + 0x0 + 0x0 + 0xffff + + diff --git a/tests/nodedevxml2xmlout/computer.xml b/tests/nodedevxml2xmlout= /computer.xml new file mode 100644 index 0000000000..4e4b9188b3 --- /dev/null +++ b/tests/nodedevxml2xmlout/computer.xml @@ -0,0 +1,16 @@ + + computer + + + LENOVO + ThinkPad T60p + 123123 + 12345678-1234-1234-9596-a088b277d677 + + + LENOVO + 79ETE1WW (2.21 ) + 02/05/2008 + + + diff --git a/tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types.xml b/tests/no= dedevxml2xmlout/css_0_0_fffe_mdev_types.xml new file mode 100644 index 0000000000..5058b6434e --- /dev/null +++ b/tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types.xml @@ -0,0 +1,17 @@ + + css_0_0_fffe + /sys/devices/css0/0.0.fffe + computer + + 0x0 + 0x0 + 0xfffe + + + I/O subchannel (Non-QDIO) + vfio-ccw + 1 + + + + diff --git a/tests/nodedevxml2xmlout/css_0_0_ffff.xml b/tests/nodedevxml2xm= lout/css_0_0_ffff.xml new file mode 100644 index 0000000000..312e07fe65 --- /dev/null +++ b/tests/nodedevxml2xmlout/css_0_0_ffff.xml @@ -0,0 +1,10 @@ + + css_0_0_ffff + /sys/devices/css0/0.0.ffff + computer + + 0x0 + 0x0 + 0xffff + + diff --git a/tests/nodedevxml2xmlout/drm_renderD129.xml b/tests/nodedevxml2= xmlout/drm_renderD129.xml new file mode 100644 index 0000000000..161481624f --- /dev/null +++ b/tests/nodedevxml2xmlout/drm_renderD129.xml @@ -0,0 +1,10 @@ + + drm_renderD129 + /sys/devices/pci0000:00/0000:00:02.0/drm/renderD129 + /dev/dri/renderD129 + /dev/dri/by-path/pci-0000:00:02.0-render + pci_0000_00_02_0 + + render + + diff --git a/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d3= 01b.xml b/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b= .xml new file mode 100644 index 0000000000..470e5917ec --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml @@ -0,0 +1,8 @@ + + mdev_3627463d_b7f0_4fea_b468_f1da537d301b + computer + + + + + diff --git a/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e4= 8ad.xml b/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad= .xml new file mode 100644 index 0000000000..106f759333 --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml @@ -0,0 +1,9 @@ + + mdev_ee0b88c4-f554-4dc1-809d-b2a01e8e48ad + /sys/devices/vfio_ap/matrix/mdev_ee0b88c4-f554-4dc1-809d-b2a01e8e4= 8ad + ap_matrix + + + + + diff --git a/tests/nodedevxml2xmlout/net_00_13_02_b9_f9_d3.xml b/tests/node= devxml2xmlout/net_00_13_02_b9_f9_d3.xml new file mode 100644 index 0000000000..88252e6a4e --- /dev/null +++ b/tests/nodedevxml2xmlout/net_00_13_02_b9_f9_d3.xml @@ -0,0 +1,21 @@ + + net_00_13_02_b9_f9_d3 + pci_8086_4227 + + eth0 +
00:13:02:b9:f9:d3
+ + + + + + + + + + + + + + + diff --git a/tests/nodedevxml2xmlout/net_00_15_58_2f_e9_55.xml b/tests/node= devxml2xmlout/net_00_15_58_2f_e9_55.xml new file mode 100644 index 0000000000..f77dfcc3e0 --- /dev/null +++ b/tests/nodedevxml2xmlout/net_00_15_58_2f_e9_55.xml @@ -0,0 +1,21 @@ + + net_00_15_58_2f_e9_55 + pci_8086_109a + + eth1 +
00:15:58:2f:e9:55
+ + + + + + + + + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml b/tes= ts/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml new file mode 100644 index 0000000000..387fce7051 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml @@ -0,0 +1,16 @@ + + pci_0000_00_02_0 + computer + + 0xffffff + 0 + 0 + 2 + 0 + 4th Gen Core Processor Integrated Graphics Cont= roller + Intel Corporation + +
+ + + diff --git a/tests/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml b/tes= ts/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml new file mode 100644 index 0000000000..b07d14faa5 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml @@ -0,0 +1,21 @@ + + pci_0000_00_1c_0 + computer + + 0xffffff + 0 + 0 + 28 + 0 + 8 Series/C220 Series Chipset Family PCI Express= Root Port #1 + Intel Corporation + + +
+ + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml b/test= s/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml new file mode 100644 index 0000000000..8e71e3f897 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml @@ -0,0 +1,33 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + + + bar1 + vfio-pci + 1 + + + bar2 + vfio-pci + 2 + + + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov.xml b/tests/nod= edevxml2xmlout/pci_0000_02_10_7_sriov.xml new file mode 100644 index 0000000000..6fa2b406a5 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov.xml @@ -0,0 +1,24 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + +
+ + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all.xml = b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all.xml new file mode 100644 index 0000000000..9e8dace020 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all.xml @@ -0,0 +1,29 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + +
+ + +
+
+
+
+ + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all_head= er_type.xml b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all_hea= der_type.xml new file mode 100644 index 0000000000..c30c0d0d2b --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all_header_type= .xml @@ -0,0 +1,31 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + +
+ + +
+
+
+
+ + + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml b/tests= /nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml new file mode 100644 index 0000000000..096055e2ae --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml @@ -0,0 +1,27 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + +
+
+
+
+ + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs_max_co= unt.xml b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs_max_count= .xml new file mode 100644 index 0000000000..8259cd059b --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml @@ -0,0 +1,22 @@ + + pci_0000_02_10_7 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 16 + 7 + 82576 Virtual Function + Intel Corporation + + +
+ + + + + + + + diff --git a/tests/nodedevxml2xmlout/pci_1002_71c4.xml b/tests/nodedevxml2x= mlout/pci_1002_71c4.xml new file mode 100644 index 0000000000..2039e2201f --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_1002_71c4.xml @@ -0,0 +1,14 @@ + + pci_1002_71c4 + pci_8086_27a1 + + 0xffffff + 0 + 1 + 0 + 0 + M56GL [Mobility FireGL V5200] + ATI Technologies Inc + + + diff --git a/tests/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml b/test= s/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml new file mode 100644 index 0000000000..3ffe53b8c9 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml @@ -0,0 +1,17 @@ + + pci_0000_00_03_0 + computer + + 0xffffff + 0 + 0 + 3 + 0 + Xeon E3-1200 v3/4th Gen Core Processor HD Audio= Controller + Intel Corporation + +
+ + + + diff --git a/tests/nodedevxml2xmlout/pci_8086_10c9_sriov_pf.xml b/tests/nod= edevxml2xmlout/pci_8086_10c9_sriov_pf.xml new file mode 100644 index 0000000000..6bd1292095 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_10c9_sriov_pf.xml @@ -0,0 +1,18 @@ + + pci_0000_02_00_0 + pci_0000_00_04_0 + + 0xffffff + 0 + 2 + 0 + 0 + 82576 Gigabit Network Connection + Intel Corporation + +
+
+ + + + diff --git a/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host.xml b/tests/no= dedevxml2xmlout/pci_8086_27c5_scsi_host.xml new file mode 100644 index 0000000000..3b377a383f --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host.xml @@ -0,0 +1,7 @@ + + pci_8086_27c5_scsi_host + pci_8086_27c5 + + 0 + + diff --git a/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml b/tests/= nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml new file mode 100644 index 0000000000..a160167824 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml @@ -0,0 +1,7 @@ + + pci_8086_27c5_scsi_host_0 + pci_8086_27c5 + + 1 + + diff --git a/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_unique_id.xm= l b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_unique_id.xml new file mode 100644 index 0000000000..5428f59d17 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_unique_id.xml @@ -0,0 +1,8 @@ + + pci_8086_27c5_scsi_host_0 + pci_8086_27c5 + + 1 + 2 + + diff --git a/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_device_lu= n0.xml b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_device_lun0.x= ml new file mode 100644 index 0000000000..5c2dff7b01 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_device_lun0.xml @@ -0,0 +1,11 @@ + + pci_8086_27c5_scsi_host_scsi_device_lun0 + pci_8086_27c5_scsi_host + + 0 + 0 + 0 + 0 + disk + + diff --git a/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_host.xml = b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_host.xml new file mode 100644 index 0000000000..8ffb0a5bb8 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_host.xml @@ -0,0 +1,7 @@ + + pci_8086_27c5_scsi_host_scsi_host + pci_8086_27c5_scsi_host + + 0 + + diff --git a/tests/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml b/test= s/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml new file mode 100644 index 0000000000..59f5ec8622 --- /dev/null +++ b/tests/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml @@ -0,0 +1,27 @@ + + pci_0000_03_00_0 + pci_0000_00_1c_1 + + 0xffffff + 0 + 3 + 0 + 0 + Centrino Ultimate-N 6300 + Intel Corporation + +
+
+
+
+
+
+
+
+ + + + + + + diff --git a/tests/nodedevxml2xmlout/scsi_target0_0_0.xml b/tests/nodedevxm= l2xmlout/scsi_target0_0_0.xml new file mode 100644 index 0000000000..b83c96dfda --- /dev/null +++ b/tests/nodedevxml2xmlout/scsi_target0_0_0.xml @@ -0,0 +1,7 @@ + + scsi_target0_0_0 + scsi_host0 + + target0:0:0 + + diff --git a/tests/nodedevxml2xmlout/scsi_target1_0_0.xml b/tests/nodedevxm= l2xmlout/scsi_target1_0_0.xml new file mode 100644 index 0000000000..b783c54fea --- /dev/null +++ b/tests/nodedevxml2xmlout/scsi_target1_0_0.xml @@ -0,0 +1,12 @@ + + scsi_target1_0_0 + /sys/devices/css0/0.0.0000/0.0.0000/host1/rport-1:0-0/target1:0:0<= /path> + scsi_host0 + + target1:0:0 + + rport-1:0-0 + 0x9d73bc45f0e21a86 + + + diff --git a/tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a5d463ff= 4902000000.xml b/tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a5d4= 63ff4902000000.xml new file mode 100644 index 0000000000..5bdbb8ac95 --- /dev/null +++ b/tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a5d463ff4902000= 000.xml @@ -0,0 +1,19 @@ + + storage_serial_3600c0ff000d7a2a5d463ff4902000000 + /dev/sdb + /dev/disk/by-id/usb-SanDisk_Ultra_Fit_4C530001051= 009112405-0:0 + /dev/disk/by-path/pci-0000:00:14.0-usb-0:1:1.0-sc= si-0:0:0:0 + /dev/disk/by-uuid/661A1A460111DA18 + pci_10df_fe00_scsi_host_scsi_device_lun8 + + /dev/sdj + pci + disk + MSA2012fc + HP + 3600c0ff000d7a2a5d463ff4902000000 + 15626928128 + 512 + 30521344 + + diff --git a/tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9SA00_MP= CZ12Y0GNGWSE.xml b/tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9S= A00_MPCZ12Y0GNGWSE.xml new file mode 100644 index 0000000000..68dbf0be96 --- /dev/null +++ b/tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0G= NGWSE.xml @@ -0,0 +1,14 @@ + + storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE + pci_8086_27c5_scsi_host_scsi_device_lun0 + + /dev/sda + scsi + disk + HTS721010G9SA00 + ATA + 100030242816 + 512 + 195371568 + + diff --git a/tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml b/t= ests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml new file mode 100644 index 0000000000..29533e769b --- /dev/null +++ b/tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml @@ -0,0 +1,10 @@ + + usb_device_1d6b_1_0000_00_1d_0 + pci_8086_27c8 + + 2 + 1 + 1.1 root hub + Linux Foundation + + diff --git a/tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml= b/tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml new file mode 100644 index 0000000000..9de35c7e8c --- /dev/null +++ b/tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml @@ -0,0 +1,10 @@ + + usb_device_1d6b_1_0000_00_1d_0_if0 + usb_device_1d6b_1_0000_00_1d_0 + + 0 + 9 + 0 + 0 + + diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 4ebd578ccc..04d238bbca 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -14,7 +14,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE =20 static int -testCompareXMLToXMLFiles(const char *xml) +testCompareXMLToXMLFiles(const char *xml, const char *outfile) { char *xmlData =3D NULL; char *actual =3D NULL; @@ -52,10 +52,8 @@ testCompareXMLToXMLFiles(const char *xml) if (!(actual =3D virNodeDeviceDefFormat(dev))) goto fail; =20 - if (STRNEQ(xmlData, actual)) { - virTestDifferenceFull(stderr, xmlData, xml, actual, NULL); + if (virTestCompareToFile(actual, outfile) < 0) goto fail; - } =20 ret =3D 0; =20 @@ -71,11 +69,15 @@ testCompareXMLToXMLHelper(const void *data) { int result =3D -1; char *xml =3D NULL; + char *outfile =3D NULL; =20 xml =3D g_strdup_printf("%s/nodedevschemadata/%s.xml", abs_srcdir, (const char *)data); =20 - result =3D testCompareXMLToXMLFiles(xml); + outfile =3D g_strdup_printf("%s/nodedevxml2xmlout/%s.xml", abs_srcdir, + (const char *)data); + + result =3D testCompareXMLToXMLFiles(xml, outfile); =20 VIR_FREE(xml); return result; --=20 2.31.1 From nobody Tue May 14 10:44:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621027880; cv=none; d=zohomail.com; s=zohoarc; b=Do9iBuToTuX6186y5rwtLGlb3Qa/NfaR33hZsrcg6r9OVY0n9nA8XiJps8r5fEuuYkZ7ig+dObPqj7Vc+HAYfcaGk4YwRqilnpb3BaEcbNAEjciPQv9kXlND69Bv/8BizzYBU8T6OhWcF5rr4A1b9dzuIUUlbTkmUtuhXUqPTAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621027880; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i2qNxUDvgw0VlEcOTcLbVOzIg8OSaujBufAVf3iPddg=; b=LrtFMD3gaL6bqlsQAUDbgmQkdtxAThBLCoV9+4JI7iqM2KYdNoh74KfnlaoIyIwS3MSzV6Dh7Bx22HwLb//rtsphEAdSwpNbyXx6lgloo10Cg4+z7sdUavukQXF5GvYX4pN+lydK86PJuFZS9dp2j8oqvSJEFV+SmNzY0n8TYs4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1621027880962611.823585790304; Fri, 14 May 2021 14:31:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-402-k8D6mlk4NdKC_h9nUSUG-w-1; Fri, 14 May 2021 17:31:17 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88E98803625; Fri, 14 May 2021 21:31:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A3F360CEB; Fri, 14 May 2021 21:31:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 31E5F180B463; Fri, 14 May 2021 21:31:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14ELTACb017826 for ; Fri, 14 May 2021 17:29:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0398150378; Fri, 14 May 2021 21:29:10 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-114-89.phx2.redhat.com [10.3.114.89]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF38761156; Fri, 14 May 2021 21:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621027879; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i2qNxUDvgw0VlEcOTcLbVOzIg8OSaujBufAVf3iPddg=; b=ZLn8jkXpOqrvYlFR3iFJVIcmWlMV43zVky4U9BPGOsE+PaBdbe8aThXJg06Q/eLx3Z2nHP PnT8PgLlVkseQd3LI5F2TprZNaYjaK6Kvv64Yejj6QAcUNQr815orfXFlxtQQQDmy0Z9Dl G1sHZ88t8HqyddLDl2Xcvqdgkw0QF0I= X-MC-Unique: k8D6mlk4NdKC_h9nUSUG-w-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] nodedev: support auto-start property for mdevs Date: Fri, 14 May 2021 16:28:59 -0500 Message-Id: <20210514212901.108447-3-jjongsma@redhat.com> In-Reply-To: <20210514212901.108447-1-jjongsma@redhat.com> References: <20210514212901.108447-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Boris Fiuczynski X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Boris Fiuczynski This adds a new element to the mdev capabilities xml schema that represents the start policy for a defined mediated device. The actual auto-start functionality is handled behind the scenes by mdevctl, but it wasn't yet hooked up in libvirt. Signed-off-by: Boris Fiuczynski Signed-off-by: Jonathon Jongsma --- docs/formatnode.html.in | 10 ++++++++++ docs/schemas/nodedev.rng | 11 ++++++++++ src/conf/node_device_conf.c | 20 ++++++++++++++++++- src/conf/node_device_conf.h | 12 +++++++++++ src/libvirt_private.syms | 2 ++ src/node_device/node_device_driver.c | 7 ++++++- .../mdevctl-list-multiple.out.xml | 4 ++++ ...v_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 1 + ...v_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml | 1 + 9 files changed, 66 insertions(+), 2 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index c58cd01395..3065570405 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -384,6 +384,16 @@ The order that they appear in the xml definition determine= s the order that they will be written to the device. +
start
+
+ This element represents the start policy for the device. = It + has a required attribute type, which can have= a + value of auto or manual. Mediated + devices with an auto start type will be start= ed + automatically by the host when the parent device becomes + available (either on boot, or when the parent device is + attached). Otherwise the device must be started manually. +
ccw
diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng index 777227c38a..660cbda3be 100644 --- a/docs/schemas/nodedev.rng +++ b/docs/schemas/nodedev.rng @@ -622,6 +622,17 @@ + + + + + manual + auto + + + + + diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 861f43f6c4..9c1192fe3b 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -85,6 +85,12 @@ VIR_ENUM_IMPL(virNodeDevDRM, "render", ); =20 +VIR_ENUM_IMPL(virNodeDevMdevStart, + VIR_NODE_DEV_MDEV_START_LAST, + "manual", + "auto", +); + static int virNodeDevCapsDefParseString(const char *xpath, xmlXPathContextPtr ctxt, @@ -528,6 +534,8 @@ virNodeDeviceCapMdevDefFormat(virBuffer *buf, =20 virBufferEscapeString(buf, "\n", data->mdev.type); virBufferEscapeString(buf, "%s\n", data->mdev.uuid); + virBufferEscapeString(buf, "\n", + virNodeDevMdevStartTypeToString(data->mdev.start= )); virBufferAsprintf(buf, "\n", data->mdev.iommuGroupNumber); =20 @@ -1149,7 +1157,6 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, return -1; } storage->removable_media_size =3D val; - ctxt->node =3D orignode2; } else { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1923,6 +1930,7 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, g_autofree xmlNodePtr *attrs =3D NULL; size_t i; g_autofree char *uuidstr =3D NULL; + g_autofree char *starttype =3D NULL; =20 ctxt->node =3D node; =20 @@ -1944,6 +1952,16 @@ virNodeDevCapMdevParseXML(xmlXPathContextPtr ctxt, virUUIDFormat(uuidbuf, mdev->uuid); } =20 + if ((starttype =3D virXPathString("string(./start[1]/@type)", ctxt))) { + if ((mdev->start =3D virNodeDevMdevStartTypeFromString(starttype))= < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown mdev start type '%s' for '%s'"), sta= rttype, def->name); + return -1; + } + } else { + mdev->start =3D VIR_NODE_DEV_MDEV_START_MANUAL; + } + /* 'iommuGroup' is optional, only report an error if the supplied valu= e is * invalid (-2), not if it's missing (-1) */ if (virXPathUInt("number(./iommuGroup[1]/@number)", diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index a60562e4fe..1a31133c4c 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -124,6 +124,17 @@ typedef enum { =20 VIR_ENUM_DECL(virNodeDevDRM); =20 +typedef enum { + /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */ + VIR_NODE_DEV_MDEV_START_MANUAL, + VIR_NODE_DEV_MDEV_START_AUTO, + + VIR_NODE_DEV_MDEV_START_LAST +} virNodeDevMdevStartType; + +VIR_ENUM_DECL(virNodeDevMdevStart); + + typedef struct _virNodeDevCapSystemHardware virNodeDevCapSystemHardware; struct _virNodeDevCapSystemHardware { char *vendor_name; @@ -151,6 +162,7 @@ struct _virNodeDevCapMdev { char *type; unsigned int iommuGroupNumber; char *uuid; + virNodeDevMdevStartType start; virMediatedDeviceAttr **attributes; size_t nattributes; }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1df4b8cfe8..7aae36de56 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -846,6 +846,8 @@ virNodeDeviceGetSCSIHostCaps; virNodeDeviceGetSCSITargetCaps; virNodeDeviceGetWWNs; virNodeDeviceUpdateCaps; +virNodeDevMdevStartTypeFromString; +virNodeDevMdevStartTypeToString; =20 =20 # conf/node_device_event.h diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 8a0a2c3847..a9f605715b 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -615,7 +615,8 @@ nodeDeviceDefToMdevctlConfig(virNodeDeviceDef *def, cha= r **buf) if (virJSONValueObjectAppendString(json, "mdev_type", mdev->type) < 0) return -1; =20 - if (virJSONValueObjectAppendString(json, "start", "manual") < 0) + if (virJSONValueObjectAppendString(json, "start", + virNodeDevMdevStartTypeToString(mde= v->start)) < 0) return -1; =20 if (mdev->attributes) { @@ -1014,6 +1015,8 @@ nodeDeviceParseMdevctlChildDevice(const char *parent, mdev->uuid =3D g_strdup(uuid); mdev->type =3D g_strdup(virJSONValueObjectGetString(props, "mdev_type")); + mdev->start =3D + virNodeDevMdevStartTypeFromString(virJSONValueObjectGetString(prop= s, "start")); =20 attrs =3D virJSONValueObjectGet(props, "attrs"); =20 @@ -1683,6 +1686,8 @@ nodeDeviceDefCopyFromMdevctl(virNodeDeviceDef *dst, dstmdev->uuid =3D g_strdup(srcmdev->uuid); } =20 + dstmdev->start =3D srcmdev->start; + if (virMediatedDeviceAttrsCopy(dstmdev, srcmdev)) ret =3D true; =20 diff --git a/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml b/tests= /nodedevmdevctldata/mdevctl-list-multiple.out.xml index cf7e966256..83a3010455 100644 --- a/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml +++ b/tests/nodedevmdevctldata/mdevctl-list-multiple.out.xml @@ -4,6 +4,7 @@ 200f228a-c80a-4d50-bfb7-f5a0e4e34045 + @@ -13,6 +14,7 @@ de807ffc-1923-4d5f-b6c9-b20ecebc6d4b + @@ -22,6 +24,7 @@ 435722ea-5f43-468a-874f-da34f1217f13 + @@ -32,6 +35,7 @@ 783e6dbb-ea0e-411f-94e2-717eaad438bf + diff --git a/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d3= 01b.xml b/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b= .xml index 470e5917ec..30dda60e87 100644 --- a/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml +++ b/tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml @@ -3,6 +3,7 @@ computer + diff --git a/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e4= 8ad.xml b/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad= .xml index 106f759333..1988ffa679 100644 --- a/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml +++ b/tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml @@ -4,6 +4,7 @@ ap_matrix + --=20 2.31.1 From nobody Tue May 14 10:44:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621027925; cv=none; d=zohomail.com; s=zohoarc; b=RRw1qrmdGC6xpTwvQ5TXuBi1ovhdMs+U46W0vAPbgmh9vKNd/tN6pv7xE/FXZ5nlgCwMk0291wHeNUfdJ+xRkTjzb9oP7pJNhrKmeV81TSSuI/a9V7mf60PbxYE+Gf2i9P+k/HMM68DEt4YhJUvW/5XHJOvHvia5ENPcsHbPW9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621027925; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VQJ8+Y1okL5rgnJyuYiNJp9dEPUgzECId3eAxsQoEMY=; b=XJ7m8xWiE8VdXPHYFwBI41NuvHiNLcAXCabYx6tDgxn3SlE3roAQmN1lgDzbjt7URUQBCOtU0UlWoVcMR/qWdzC4Xpp61eOqbpyV65Qw5c0xGLnfriy9jOCjcjVcEOSu2SPvNQbaSC/ai+REaBtXHyaWguuUmMseOx8FhjtlD8s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621027925357105.3684129927226; Fri, 14 May 2021 14:32:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-Nyp7eolsNPuQyF3sUublZA-1; Fri, 14 May 2021 17:31:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A90EF8015C6; Fri, 14 May 2021 21:31:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 89A2961156; Fri, 14 May 2021 21:31:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EDEA7180B463; Fri, 14 May 2021 21:31:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14ELTAo3017831 for ; Fri, 14 May 2021 17:29:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5D1B950378; Fri, 14 May 2021 21:29:10 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-114-89.phx2.redhat.com [10.3.114.89]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2590F61156 for ; Fri, 14 May 2021 21:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621027924; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VQJ8+Y1okL5rgnJyuYiNJp9dEPUgzECId3eAxsQoEMY=; b=UYhaw9tW5pjJLPqS6TWnqpYVVcW0OXlAteYn86LMNM33wPTjpvXdGrAtQH10X6bQUKY2Q3 IVz6yWGStF6HU827HdT7lux27dSIgNYJEojr2d9Qy5KFYqIIG4f72WH3xEJhJh7bruSbNy WEMqKSY6a9U4aPni3OscOrQp0coHIDw= X-MC-Unique: Nyp7eolsNPuQyF3sUublZA-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] tests: nodedevxml2xmltest: test more mdev files Date: Fri, 14 May 2021 16:29:00 -0500 Message-Id: <20210514212901.108447-4-jjongsma@redhat.com> In-Reply-To: <20210514212901.108447-1-jjongsma@redhat.com> References: <20210514212901.108447-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add the rest of the mdev xml files to the xml2xml test, and include 2 new test cases: one that explicitly specifies 'manual' start, and one that explicitly specifies 'auto' start. Signed-off-by: Jonathon Jongsma --- tests/nodedevschemadata/mdev_autostart.xml | 10 ++++++++++ tests/nodedevschemadata/mdev_manual.xml | 10 ++++++++++ tests/nodedevxml2xmlout/mdev_autostart.xml | 11 +++++++++++ .../mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml | 10 ++++++++++ .../mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml | 11 +++++++++++ .../mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml | 10 ++++++++++ tests/nodedevxml2xmlout/mdev_manual.xml | 11 +++++++++++ tests/nodedevxml2xmltest.c | 5 +++++ 8 files changed, 78 insertions(+) create mode 100644 tests/nodedevschemadata/mdev_autostart.xml create mode 100644 tests/nodedevschemadata/mdev_manual.xml create mode 100644 tests/nodedevxml2xmlout/mdev_autostart.xml create mode 100644 tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c= 9a70e21366.xml create mode 100644 tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_be= b3f14c23d9.xml create mode 100644 tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_87= 1d16c13076.xml create mode 100644 tests/nodedevxml2xmlout/mdev_manual.xml diff --git a/tests/nodedevschemadata/mdev_autostart.xml b/tests/nodedevsche= madata/mdev_autostart.xml new file mode 100644 index 0000000000..7f2f341648 --- /dev/null +++ b/tests/nodedevschemadata/mdev_autostart.xml @@ -0,0 +1,10 @@ + + mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100 + pci_0000_00_02_0 + + + + + 9c4954d2-fa39-4973-9d66-d61c6c4d0100 + + diff --git a/tests/nodedevschemadata/mdev_manual.xml b/tests/nodedevschemad= ata/mdev_manual.xml new file mode 100644 index 0000000000..9001588c24 --- /dev/null +++ b/tests/nodedevschemadata/mdev_manual.xml @@ -0,0 +1,10 @@ + + mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100 + pci_0000_00_02_0 + + + + + 9c4954d2-fa39-4973-9d66-d61c6c4d0100 + + diff --git a/tests/nodedevxml2xmlout/mdev_autostart.xml b/tests/nodedevxml2= xmlout/mdev_autostart.xml new file mode 100644 index 0000000000..4313c4a145 --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_autostart.xml @@ -0,0 +1,11 @@ + + mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100 + pci_0000_00_02_0 + + + 9c4954d2-fa39-4973-9d66-d61c6c4d0100 + + + + + diff --git a/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21= 366.xml b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366= .xml new file mode 100644 index 0000000000..bff95b015b --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_d069d019_36ea_4111_8f0a_8c9a70e21366.xml @@ -0,0 +1,10 @@ + + mdev_d069d019_36ea_4111_8f0a_8c9a70e21366 + pci_0000_00_02_0 + + + d069d019-36ea-4111-8f0a-8c9a70e21366 + + + + diff --git a/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c2= 3d9.xml b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9= .xml new file mode 100644 index 0000000000..beb25b1989 --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9.xml @@ -0,0 +1,11 @@ + + mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9 + pci_0000_00_02_0 + + + + + + + + diff --git a/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13= 076.xml b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076= .xml new file mode 100644 index 0000000000..1d6dbb6118 --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_fedc4916_1ca8_49ac_b176_871d16c13076.xml @@ -0,0 +1,10 @@ + + mdev_fedc4916_1ca8_49ac_b176_871d16c13076 + pci_0000_00_02_0 + + + + + + + diff --git a/tests/nodedevxml2xmlout/mdev_manual.xml b/tests/nodedevxml2xml= out/mdev_manual.xml new file mode 100644 index 0000000000..0735f29e1e --- /dev/null +++ b/tests/nodedevxml2xmlout/mdev_manual.xml @@ -0,0 +1,11 @@ + + mdev_9c4954d2_fa39_4973_9d66_d61c6c4d0100 + pci_0000_00_02_0 + + + 9c4954d2-fa39-4973-9d66-d61c6c4d0100 + + + + + diff --git a/tests/nodedevxml2xmltest.c b/tests/nodedevxml2xmltest.c index 04d238bbca..cb8f254445 100644 --- a/tests/nodedevxml2xmltest.c +++ b/tests/nodedevxml2xmltest.c @@ -132,6 +132,11 @@ mymain(void) DO_TEST("ap_matrix"); DO_TEST("ap_matrix_mdev_types"); DO_TEST("mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad"); + DO_TEST("mdev_d069d019_36ea_4111_8f0a_8c9a70e21366"); + DO_TEST("mdev_d2441d39_495e_4243_ad9f_beb3f14c23d9"); + DO_TEST("mdev_fedc4916_1ca8_49ac_b176_871d16c13076"); + DO_TEST("mdev_autostart"); + DO_TEST("mdev_manual"); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.31.1 From nobody Tue May 14 10:44:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1621027886; cv=none; d=zohomail.com; s=zohoarc; b=l0H9vrtdX3ixRiWxSSchBACX7D5J89GWXVkfVGEqlfN0ZehnsKOT7ZpW8BLp2jM/GYjfjOIsL2nXvWIwhrWcwZhZcIn5+6Mkh1hTqztagBPKj6mNBKvGJY6mAYqInvFw7tVB6eYXYAsWpdGL9owiHGiPDXSrA0ykUaRblympsVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621027886; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Szo0JQz2iTpoTNXXwpjVA+9jtiP5N+sIkSXHIefJkho=; b=OhXzdx/XGB61coXwZZVKmbYMslMq6TaeFrRz9EqIQE2GzOzvvnV2oL+Yn+lTmPEBB9tN06ny5zkrQ3mMsiJwg70y7BJ2xL9FrnuBpxJjmOW7zvhM3UJm5uhgYqaMp7fkMEmKcaGNMHK7S8pSvMysd8dVK+ZvAk7WZUOMqcCGhJ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1621027886055218.86496231382034; Fri, 14 May 2021 14:31:26 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-123-dBkbK_MaP9aLuHKhl-t8xw-1; Fri, 14 May 2021 17:31:22 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D6B9107AD28; Fri, 14 May 2021 21:31:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1AEED16938; Fri, 14 May 2021 21:31:15 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D628555347; Fri, 14 May 2021 21:31:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14ELTAr5017837 for ; Fri, 14 May 2021 17:29:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id B57A550378; Fri, 14 May 2021 21:29:10 +0000 (UTC) Received: from himantopus.redhat.com (ovpn-114-89.phx2.redhat.com [10.3.114.89]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7F60061156 for ; Fri, 14 May 2021 21:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1621027885; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Szo0JQz2iTpoTNXXwpjVA+9jtiP5N+sIkSXHIefJkho=; b=SgHTleTE8EzNSVEumuxSl6g7/vEOef4ptHjZRGJxlXBNrr3t1IUY3OFKtF47DSBQGnGVfG EhYsl+SBc0CIG/jbrYNfapB40QWDhMs3G7LbHeeMdty3UXS7koSsVkE3YswlSQyKuxhG7E Ath5EcHg7wbDmlNChRpP8ON+hLKw42s= X-MC-Unique: dBkbK_MaP9aLuHKhl-t8xw-1 From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] docs: nodedev: document mdev uuid property Date: Fri, 14 May 2021 16:29:01 -0500 Message-Id: <20210514212901.108447-5-jjongsma@redhat.com> In-Reply-To: <20210514212901.108447-1-jjongsma@redhat.com> References: <20210514212901.108447-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jonathon Jongsma Reviewed-by: Michal Privoznik --- docs/formatnode.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 3065570405..9a505f0fe9 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -384,6 +384,10 @@ The order that they appear in the xml definition determine= s the order that they will be written to the device. +
uuid
+
+ This element represents the UUID of the mediated device. +
start
This element represents the start policy for the device. = It --=20 2.31.1