forked from rpms/libvirt
5e7679dbfe
- Rebased to libvirt-7.5.0 (rhbz#1950948)
- The rebase also fixes the following bugs:
rhbz#1949388, rhbz#1969354, rhbz#1970277, rhbz#1972145, rhbz#1973094
rhbz#1975071, rhbz#1972468, rhbz#1975677
Resolves: rhbz#1949388, rhbz#1950948, rhbz#1969354, rhbz#1970277, rhbz#1972145
Resolves: rhbz#1972468, rhbz#1973094, rhbz#1975071, rhbz#1975677
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From b6045e61d3402cccba88e1b3be55871603c61d4f Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b6045e61d3402cccba88e1b3be55871603c61d4f@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 50ed1cabab..2e5a6abff2 100644
|
|
--- a/src/util/virutil.c
|
|
+++ b/src/util/virutil.c
|
|
@@ -1338,9 +1338,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.32.0
|
|
|