Signed-off-by: Laszlo Ersek <ler...@redhat.com>
---
src/lib/disk.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/lib/disk.c b/src/lib/disk.c
index 1dcbe9b..f592db6 100644
--- a/src/lib/disk.c
+++ b/src/lib/disk.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <stdint.h>
+#include <inttypes.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <fcntl.h>
@@ -177,15 +177,14 @@ disk_info_from_fd(int fd, struct disk_info *info)
}
static int
-disk_get_virt_pci(unsigned disknum, unsigned part, unsigned char *bus,
+disk_get_virt_pci(const struct disk_info *info, unsigned char *bus,
unsigned char *device, unsigned char *function)
{
char inbuf[32], outbuf[128];
ssize_t lnksz;
- if (snprintf(inbuf, sizeof inbuf, "/sys/dev/block/%d:%u",
- get_virtblk_major(),
- disknum << 4 | part) >= sizeof inbuf) {
+ if (snprintf(inbuf, sizeof inbuf, "/sys/dev/block/%" PRIu64 ":%u",
+ info->major, info->minor) >= sizeof inbuf) {
return 1;
}
@@ -333,8 +332,7 @@ disk_get_pci(int fd,
case md:
break;
case virtblk:
- return disk_get_virt_pci(info.disknum, info.part, bus, device,
- function);
+ return disk_get_virt_pci(&info, bus, device, function);
default:
break;
}
--
1.7.1
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
