On 11/09/2015 06:13 PM, Michael S. Tsirkin wrote:
On Fri, Oct 30, 2015 at 01:56:03PM +0800, Xiao Guangrong wrote:
Currently, file_ram_alloc() only works on directory - it creates a file
under @path and do mmap on it
This patch tries to allow it to work on file directly, if @path is a
directory it works as before, otherwise it treats @path as the target
file then directly allocate memory from it
Signed-off-by: Xiao Guangrong <guangrong.xiao@xxxxxxxxxxxxxxx>
---
exec.c | 80 ++++++++++++++++++++++++++++++++++++++++++------------------------
1 file changed, 51 insertions(+), 29 deletions(-)
diff --git a/exec.c b/exec.c
index 3ca7e50..f219010 100644
--- a/exec.c
+++ b/exec.c
@@ -1174,14 +1174,60 @@ void qemu_mutex_unlock_ramlist(void)
}
#ifdef __linux__
+static bool path_is_dir(const char *path)
+{
+ struct stat fs;
+
+ return stat(path, &fs) == 0 && S_ISDIR(fs.st_mode);
This means file doesn't exist is treated as a file.
Can't figure out if that's intentional, should
be documented in any case.
The path is dir only if it passes S_ISDIR test. Otherwise, it is treated
as regular file. Any error on the file will be figured out by open() and
mmap() later.
+}
+
+static int open_file_path(RAMBlock *block, const char *path, size_t size)
+{
+ char *filename;
+ char *sanitized_name;
+ char *c;
+ int fd;
+
+ if (!path_is_dir(path)) {
+ int flags = (block->flags & RAM_SHARED) ? O_RDWR : O_RDONLY;
Why does this make sense?
RAM_SHARED means its write is invisible to others also it does not actual
change the content of the file. Readonly permission is enough for this case.
It is also help us to pass a readonly file to the guess but discard its change
after guest shutdown.
+
+ flags |= O_EXCL;
And why does this makes sense?
It' used if we pass a block device as a NVDIMM backend memory:
O_EXCL can be used without O_CREAT if pathname refers to a block
device. If the block device is in use by the system (e.g., mounted),
open() fails with the error EBUSY
BTW, the similar logic has already been in upsteam QEMU which is
introduced by commit 8d31d6b6 (backends/hostmem-file: Allow to specify
full pathname for backing file). I will drop these patches:
util: introduce qemu_file_get_page_size()
exec: allow memory to be allocated from any kind of path
exec: allow file_ram_alloc to work on file
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
