提交 b4a40dd9 编写于 作者: M Martin Kletzander

Use qemuOpenFile in qemu_driver.c

On two places, the usage of open() is replaced with qemuOpenFile as
that is the preferred method in those cases.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=963881
上级 849df287
...@@ -9786,6 +9786,7 @@ qemuDomainBlockPeek(virDomainPtr dom, ...@@ -9786,6 +9786,7 @@ qemuDomainBlockPeek(virDomainPtr dom,
void *buffer, void *buffer,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
int fd = -1, ret = -1; int fd = -1, ret = -1;
const char *actual; const char *actual;
...@@ -9812,13 +9813,9 @@ qemuDomainBlockPeek(virDomainPtr dom, ...@@ -9812,13 +9813,9 @@ qemuDomainBlockPeek(virDomainPtr dom,
} }
path = actual; path = actual;
/* The path is correct, now try to open it and get its size. */ fd = qemuOpenFile(driver, vm, path, O_RDONLY, NULL, NULL);
fd = open(path, O_RDONLY); if (fd == -1)
if (fd == -1) {
virReportSystemError(errno,
_("%s: failed to open"), path);
goto cleanup; goto cleanup;
}
/* Seek and read. */ /* Seek and read. */
/* NB. Because we configure with AC_SYS_LARGEFILE, off_t should /* NB. Because we configure with AC_SYS_LARGEFILE, off_t should
...@@ -9979,12 +9976,9 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, ...@@ -9979,12 +9976,9 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom,
path = disk->src; path = disk->src;
/* The path is correct, now try to open it and get its size. */ /* The path is correct, now try to open it and get its size. */
fd = open(path, O_RDONLY); fd = qemuOpenFile(driver, vm, path, O_RDONLY, NULL, NULL);
if (fd == -1) { if (fd == -1)
virReportSystemError(errno,
_("failed to open path '%s'"), path);
goto cleanup; goto cleanup;
}
/* Probe for magic formats */ /* Probe for magic formats */
if (disk->format) { if (disk->format) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册