9ea8eed2bd
- remote_driver: Restore special behavior of remoteDomainGetBlockIoTune() (RHEL-22800) - conf: Introduce dynamicMemslots attribute for virtio-mem (RHEL-15316) - qemu_capabilities: Add QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI_DYNAMIC_MEMSLOTS capability (RHEL-15316) - qemu_validate: Check capability for virtio-mem dynamicMemslots (RHEL-15316) - qemu_command: Generate cmd line for virtio-mem dynamicMemslots (RHEL-15316) - qemu_snapshot: fix detection if non-leaf snapshot isn't in active chain (RHEL-23212) - qemu_snapshot: create: refactor external snapshot detection (RHEL-22797) - qemu_snapshot: create: don't require disk-only flag for offline external snapshot (RHEL-22797) - remoteDispatchAuthPolkit: Fix lock ordering deadlock if client closes connection during auth (RHEL-20337) - util: virtportallocator: Add VIR_DEBUG statements for port allocations and release (RHEL-21543) - qemu: migration: Properly handle reservation of manually specified NBD port (RHEL-21543) - qemuMigrationDstStartNBDServer: Refactor cleanup (RHEL-21543) - virPCIVPDResourceIsValidTextValue: Adjust comment to reflect actual code (RHEL-22314) - util: pcivpd: Refactor virPCIVPDResourceIsValidTextValue (RHEL-22314) - virNodeDeviceCapVPDFormatCustom*: Escape unsanitized strings (RHEL-22314) - virNodeDeviceCapVPDFormat: Properly escape system-originated strings (RHEL-22314) - schema: nodedev: Adjust allowed characters in 'vpdFieldValueFormat' (RHEL-22314) - tests: Test the previously mishandled PCI VPD characters (RHEL-22314) - Don't overwrite error message from 'virXPathNodeSet' (RHEL-22314) - tests: virpcivpdtest: Remove 'testVirPCIVPDReadVPDBytes' case (RHEL-22314) - util: virpcivpd: Unexport 'virPCIVPDReadVPDBytes' (RHEL-22314) - util: pcivpd: Unexport virPCIVPDParseVPDLargeResourceFields (RHEL-22314) - tests: virpcivpd: Remove 'testVirPCIVPDParseVPDStringResource' case (RHEL-22314) - util: virpcivpd: Unexport 'virPCIVPDParseVPDLargeResourceString' (RHEL-22314) - virPCIVPDResourceGetKeywordPrefix: Fix logging (RHEL-22314) - util: virpcivpd: Remove return value from virPCIVPDResourceCustomUpsertValue (RHEL-22314) - conf: virNodeDeviceCapVPDParse*: Remove pointless NULL checks (RHEL-22314) - virpcivpdtest: testPCIVPDResourceBasic: Remove tests for uninitialized 'ro'/'rw' section (RHEL-22314) - util: virPCIVPDResourceUpdateKeyword: Remove impossible checks (RHEL-22314) - conf: node_device: Refactor 'virNodeDeviceCapVPDParseCustomFields' to fix error reporting (RHEL-22314) - virNodeDeviceCapVPDParseXML: Fix error reporting (RHEL-22314) - util: virpcivpd: Remove return value from virPCIVPDResourceUpdateKeyword (RHEL-22314) - virPCIDeviceHasVPD: Refactor "debug" messages (RHEL-22314) - virPCIDeviceGetVPD: Fix multiple error handling bugs (RHEL-22314) - virPCIDeviceGetVPD: Handle errors in callers (RHEL-22314) - virPCIVPDReadVPDBytes: Refactor error handling (RHEL-22314) - virPCIVPDParseVPDLargeResourceString: Properly report errors (RHEL-22314) - virPCIVPDParseVPDLargeResourceFields: Merge logic conditions (RHEL-22314) - virPCIVPDParseVPDLargeResourceFields: Remove impossible 'default' switch case (RHEL-22314) - virPCIVPDParseVPDLargeResourceFields: Refactor processing of read data (RHEL-22314) - virPCIVPDParseVPDLargeResourceFields: Refactor return logic (RHEL-22314) - virPCIVPDParseVPDLargeResourceFields: Report proper errors (RHEL-22314) - virPCIVPDParse: Do reasonable error reporting (RHEL-22314) - virt-admin: Add warning when connection to default daemon fails (RHEL-23170) Resolves: RHEL-15316, RHEL-20337, RHEL-21543, RHEL-22314, RHEL-22797 Resolves: RHEL-22800, RHEL-23170, RHEL-23212
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
From 225998619d4e6fb87e04d48c74b1320663543312 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <225998619d4e6fb87e04d48c74b1320663543312.1707394627.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Wed, 24 Jan 2024 14:58:52 +0100
|
|
Subject: [PATCH] util: virpcivpd: Unexport 'virPCIVPDReadVPDBytes'
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The function is no longer used outside of virpcivpd.c
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
(cherry picked from commit 4d229ef4404f277004767bec444448fa83e8be99)
|
|
|
|
https://issues.redhat.com/browse/RHEL-22314 [9.4.0]
|
|
---
|
|
src/libvirt_private.syms | 1 -
|
|
src/util/virpcivpd.c | 14 +-------------
|
|
src/util/virpcivpdpriv.h | 3 ---
|
|
3 files changed, 1 insertion(+), 17 deletions(-)
|
|
|
|
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
index fc26109029..dbc4e26d79 100644
|
|
--- a/src/libvirt_private.syms
|
|
+++ b/src/libvirt_private.syms
|
|
@@ -3702,7 +3702,6 @@ virVHBAPathExists;
|
|
virPCIVPDParse;
|
|
virPCIVPDParseVPDLargeResourceFields;
|
|
virPCIVPDParseVPDLargeResourceString;
|
|
-virPCIVPDReadVPDBytes;
|
|
virPCIVPDResourceCustomCompareIndex;
|
|
virPCIVPDResourceCustomFree;
|
|
virPCIVPDResourceCustomUpsertValue;
|
|
diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c
|
|
index 81c7c317b3..373321a836 100644
|
|
--- a/src/util/virpcivpd.c
|
|
+++ b/src/util/virpcivpd.c
|
|
@@ -401,7 +401,7 @@ virPCIVPDResourceUpdateKeyword(virPCIVPDResource *res, const bool readOnly,
|
|
* descriptor, it is reported and -1 is returned to the caller. If EOF is occurred, 0 is returned
|
|
* to the caller.
|
|
*/
|
|
-size_t
|
|
+static size_t
|
|
virPCIVPDReadVPDBytes(int vpdFileFd, uint8_t *buf, size_t count, off_t offset, uint8_t *csum)
|
|
{
|
|
ssize_t numRead = pread(vpdFileFd, buf, count, offset);
|
|
@@ -732,18 +732,6 @@ virPCIVPDParse(int vpdFileFd)
|
|
|
|
#else /* ! __linux__ */
|
|
|
|
-size_t
|
|
-virPCIVPDReadVPDBytes(int vpdFileFd G_GNUC_UNUSED,
|
|
- uint8_t *buf G_GNUC_UNUSED,
|
|
- size_t count G_GNUC_UNUSED,
|
|
- off_t offset G_GNUC_UNUSED,
|
|
- uint8_t *csum G_GNUC_UNUSED)
|
|
-{
|
|
- virReportError(VIR_ERR_NO_SUPPORT, "%s",
|
|
- _("PCI VPD reporting not available on this platform"));
|
|
- return 0;
|
|
-}
|
|
-
|
|
bool
|
|
virPCIVPDParseVPDLargeResourceString(int vpdFileFd G_GNUC_UNUSED,
|
|
uint16_t resPos G_GNUC_UNUSED,
|
|
diff --git a/src/util/virpcivpdpriv.h b/src/util/virpcivpdpriv.h
|
|
index 0f565f81ae..17e6e14ab7 100644
|
|
--- a/src/util/virpcivpdpriv.h
|
|
+++ b/src/util/virpcivpdpriv.h
|
|
@@ -69,9 +69,6 @@ virPCIVPDResourceCustomCompareIndex(virPCIVPDResourceCustom *a, virPCIVPDResourc
|
|
bool
|
|
virPCIVPDResourceCustomUpsertValue(GPtrArray *arr, char index, const char *const value);
|
|
|
|
-size_t
|
|
-virPCIVPDReadVPDBytes(int vpdFileFd, uint8_t *buf, size_t count, off_t offset, uint8_t *csum);
|
|
-
|
|
bool virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t resDataLen,
|
|
bool readOnly, uint8_t *csum, virPCIVPDResource *res);
|
|
|
|
--
|
|
2.43.0
|