forked from rpms/libvirt
ecfafb711e
- Rebased to libvirt-7.4.0 (rhbz#1950948)
- The rebase also fixes the following bugs:
rhbz#1960993
Resolves: rhbz#1950948, rhbz#1960993
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 79a94d508777bfa7118ac7fe60eb1eb5143f3f70 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <79a94d508777bfa7118ac7fe60eb1eb5143f3f70@dist-git>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Fri, 6 Mar 2020 15:52:24 +0100
|
|
Subject: [PATCH] RHEL: virutil: Accept non-block devices in virGetDeviceID()
|
|
|
|
If a caller wants to learn major or minor number for a device,
|
|
let them. There's no need to check if the device is a block
|
|
device here.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1808390
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Message-Id: <20200306145226.1610708-5-abologna@redhat.com>
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
---
|
|
src/util/virutil.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/src/util/virutil.c b/src/util/virutil.c
|
|
index 198ee8d591..1e51cdf0cb 100644
|
|
--- a/src/util/virutil.c
|
|
+++ b/src/util/virutil.c
|
|
@@ -1340,9 +1340,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
|
|
if (stat(path, &sb) < 0)
|
|
return -errno;
|
|
|
|
- if (!S_ISBLK(sb.st_mode))
|
|
- return -EINVAL;
|
|
-
|
|
if (maj)
|
|
*maj = major(sb.st_rdev);
|
|
if (min)
|
|
--
|
|
2.31.1
|
|
|