From: Isaku Yamahata <yamahata@valinux.co.jp> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp Subject: [PATCH 09/21] exec.c: factor out qemu_get_ram_ptr() Date: Thu, 29 Dec 2011 10:25:48 +0900 [thread overview] Message-ID: <e92203d5555c1ebb667dc23bbc886da89f1b46b6.1325055139.git.yamahata@valinux.co.jp> (raw) In-Reply-To: <cover.1325055139.git.yamahata@valinux.co.jp> In-Reply-To: <cover.1325055139.git.yamahata@valinux.co.jp> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- cpu-all.h | 2 ++ exec.c | 51 +++++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 9d78715..0244f7a 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -496,6 +496,8 @@ extern RAMList ram_list; extern const char *mem_path; extern int mem_prealloc; +RAMBlock *qemu_get_ram_block(ram_addr_t adar); + /* physical memory access */ /* MMIO pages are identified by a combination of an IO device index and diff --git a/exec.c b/exec.c index 32782b4..51b8d15 100644 --- a/exec.c +++ b/exec.c @@ -3117,15 +3117,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) } #endif /* !_WIN32 */ -/* Return a host pointer to ram allocated with qemu_ram_alloc. - With the exception of the softmmu code in this file, this should - only be used for local memory (e.g. video ram) that the device owns, - and knows it isn't going to access beyond the end of the block. - - It should not be used for general purpose DMA. - Use cpu_physical_memory_map/cpu_physical_memory_rw instead. - */ -void *qemu_get_ram_ptr(ram_addr_t addr) +RAMBlock *qemu_get_ram_block(ram_addr_t addr) { RAMBlock *block; @@ -3136,19 +3128,7 @@ void *qemu_get_ram_ptr(ram_addr_t addr) QLIST_REMOVE(block, next); QLIST_INSERT_HEAD(&ram_list.blocks, block, next); } - if (xen_enabled()) { - /* We need to check if the requested address is in the RAM - * because we don't want to map the entire memory in QEMU. - * In that case just map until the end of the page. - */ - if (block->offset == 0) { - return xen_map_cache(addr, 0, 0); - } else if (block->host == NULL) { - block->host = - xen_map_cache(block->offset, block->length, 1); - } - } - return block->host + (addr - block->offset); + return block; } } @@ -3159,6 +3139,33 @@ void *qemu_get_ram_ptr(ram_addr_t addr) } /* Return a host pointer to ram allocated with qemu_ram_alloc. + With the exception of the softmmu code in this file, this should + only be used for local memory (e.g. video ram) that the device owns, + and knows it isn't going to access beyond the end of the block. + + It should not be used for general purpose DMA. + Use cpu_physical_memory_map/cpu_physical_memory_rw instead. + */ +void *qemu_get_ram_ptr(ram_addr_t addr) +{ + RAMBlock *block = qemu_get_ram_block(addr); + + if (xen_enabled()) { + /* We need to check if the requested address is in the RAM + * because we don't want to map the entire memory in QEMU. + * In that case just map until the end of the page. + */ + if (block->offset == 0) { + return xen_map_cache(addr, 0, 0); + } else if (block->host == NULL) { + block->host = + xen_map_cache(block->offset, block->length, 1); + } + } + return block->host + (addr - block->offset); +} + +/* Return a host pointer to ram allocated with qemu_ram_alloc. * Same as qemu_get_ram_ptr but avoid reordering ramblocks. */ void *qemu_safe_ram_ptr(ram_addr_t addr) -- 1.7.1.1
WARNING: multiple messages have this Message-ID (diff)
From: Isaku Yamahata <yamahata@valinux.co.jp> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp, t.hirofuchi@aist.go.jp, satoshi.itoh@aist.go.jp Subject: [Qemu-devel] [PATCH 09/21] exec.c: factor out qemu_get_ram_ptr() Date: Thu, 29 Dec 2011 10:25:48 +0900 [thread overview] Message-ID: <e92203d5555c1ebb667dc23bbc886da89f1b46b6.1325055139.git.yamahata@valinux.co.jp> (raw) In-Reply-To: <cover.1325055139.git.yamahata@valinux.co.jp> In-Reply-To: <cover.1325055139.git.yamahata@valinux.co.jp> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- cpu-all.h | 2 ++ exec.c | 51 +++++++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 9d78715..0244f7a 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -496,6 +496,8 @@ extern RAMList ram_list; extern const char *mem_path; extern int mem_prealloc; +RAMBlock *qemu_get_ram_block(ram_addr_t adar); + /* physical memory access */ /* MMIO pages are identified by a combination of an IO device index and diff --git a/exec.c b/exec.c index 32782b4..51b8d15 100644 --- a/exec.c +++ b/exec.c @@ -3117,15 +3117,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) } #endif /* !_WIN32 */ -/* Return a host pointer to ram allocated with qemu_ram_alloc. - With the exception of the softmmu code in this file, this should - only be used for local memory (e.g. video ram) that the device owns, - and knows it isn't going to access beyond the end of the block. - - It should not be used for general purpose DMA. - Use cpu_physical_memory_map/cpu_physical_memory_rw instead. - */ -void *qemu_get_ram_ptr(ram_addr_t addr) +RAMBlock *qemu_get_ram_block(ram_addr_t addr) { RAMBlock *block; @@ -3136,19 +3128,7 @@ void *qemu_get_ram_ptr(ram_addr_t addr) QLIST_REMOVE(block, next); QLIST_INSERT_HEAD(&ram_list.blocks, block, next); } - if (xen_enabled()) { - /* We need to check if the requested address is in the RAM - * because we don't want to map the entire memory in QEMU. - * In that case just map until the end of the page. - */ - if (block->offset == 0) { - return xen_map_cache(addr, 0, 0); - } else if (block->host == NULL) { - block->host = - xen_map_cache(block->offset, block->length, 1); - } - } - return block->host + (addr - block->offset); + return block; } } @@ -3159,6 +3139,33 @@ void *qemu_get_ram_ptr(ram_addr_t addr) } /* Return a host pointer to ram allocated with qemu_ram_alloc. + With the exception of the softmmu code in this file, this should + only be used for local memory (e.g. video ram) that the device owns, + and knows it isn't going to access beyond the end of the block. + + It should not be used for general purpose DMA. + Use cpu_physical_memory_map/cpu_physical_memory_rw instead. + */ +void *qemu_get_ram_ptr(ram_addr_t addr) +{ + RAMBlock *block = qemu_get_ram_block(addr); + + if (xen_enabled()) { + /* We need to check if the requested address is in the RAM + * because we don't want to map the entire memory in QEMU. + * In that case just map until the end of the page. + */ + if (block->offset == 0) { + return xen_map_cache(addr, 0, 0); + } else if (block->host == NULL) { + block->host = + xen_map_cache(block->offset, block->length, 1); + } + } + return block->host + (addr - block->offset); +} + +/* Return a host pointer to ram allocated with qemu_ram_alloc. * Same as qemu_get_ram_ptr but avoid reordering ramblocks. */ void *qemu_safe_ram_ptr(ram_addr_t addr) -- 1.7.1.1
next prev parent reply other threads:[~2011-12-29 1:26 UTC|newest] Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-12-29 1:25 [PATCH 00/21][RFC] postcopy live migration Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 01/21] arch_init: export sort_ram_list() and ram_save_block() Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 02/21] arch_init: export RAM_SAVE_xxx flags for postcopy Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 03/21] arch_init/ram_save: introduce constant for ram save version = 4 Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 04/21] arch_init: refactor host_from_stream_offset() Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 05/21] arch_init/ram_save_live: factor out RAM_SAVE_FLAG_MEM_SIZE case Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 06/21] arch_init: refactor ram_save_block() Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 07/21] arch_init/ram_save_live: factor out ram_save_limit Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 08/21] arch_init/ram_load: refactor ram_load Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` Isaku Yamahata [this message] 2011-12-29 1:25 ` [Qemu-devel] [PATCH 09/21] exec.c: factor out qemu_get_ram_ptr() Isaku Yamahata 2011-12-29 1:25 ` [PATCH 10/21] exec.c: export last_ram_offset() Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 11/21] savevm: export qemu_peek_buffer, qemu_peek_byte, qemu_file_skip Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 12/21] savevm: qemu_pending_size() to return pending buffered size Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 13/21] savevm, buffered_file: introduce method to drain buffer of buffered file Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 14/21] migration: export migrate_fd_completed() and migrate_fd_cleanup() Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 15/21] migration: factor out parameters into MigrationParams Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 16/21] umem.h: import Linux umem.h Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 17/21] update-linux-headers.sh: teach umem.h to update-linux-headers.sh Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 18/21] configure: add CONFIG_POSTCOPY option Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 19/21] postcopy: introduce -postcopy and -postcopy-flags option Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:25 ` [PATCH 20/21] postcopy outgoing: add -p and -n option to migrate command Isaku Yamahata 2011-12-29 1:25 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 1:26 ` [PATCH 21/21] postcopy: implement postcopy livemigration Isaku Yamahata 2011-12-29 1:26 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 15:51 ` Orit Wasserman 2011-12-29 15:51 ` Orit Wasserman 2012-01-04 3:34 ` Isaku Yamahata 2012-01-04 3:34 ` [Qemu-devel] " Isaku Yamahata 2011-12-29 16:06 ` Avi Kivity 2011-12-29 16:06 ` [Qemu-devel] " Avi Kivity 2012-01-04 3:29 ` Isaku Yamahata 2012-01-04 3:29 ` [Qemu-devel] " Isaku Yamahata 2012-01-12 14:15 ` Avi Kivity 2012-01-12 14:15 ` [Qemu-devel] " Avi Kivity 2011-12-29 22:39 ` [PATCH 00/21][RFC] postcopy live migration Anthony Liguori 2011-12-29 22:39 ` [Qemu-devel] " Anthony Liguori 2012-01-01 9:43 ` Orit Wasserman 2012-01-01 9:43 ` [Qemu-devel] " Orit Wasserman 2012-01-01 16:27 ` Stefan Hajnoczi 2012-01-01 16:27 ` Stefan Hajnoczi 2012-01-02 9:28 ` Dor Laor 2012-01-02 9:28 ` Dor Laor 2012-01-02 17:22 ` Stefan Hajnoczi 2012-01-02 17:22 ` [Qemu-devel] " Stefan Hajnoczi 2012-01-01 9:52 ` Dor Laor 2012-01-01 9:52 ` [Qemu-devel] " Dor Laor 2012-01-04 1:30 ` Takuya Yoshikawa 2012-01-04 1:30 ` [Qemu-devel] " Takuya Yoshikawa 2012-01-04 3:48 ` Michael Roth 2012-01-04 3:48 ` [Qemu-devel] " Michael Roth 2012-01-04 3:51 ` Isaku Yamahata 2012-01-04 3:51 ` Isaku Yamahata [not found] ` <BLU0-SMTP161AC380D472854F48E33A5BC9A0@phx.gbl> 2012-01-11 2:45 ` 回??: " Isaku Yamahata 2012-01-11 2:45 ` [Qemu-devel] " Isaku Yamahata 2012-01-12 8:29 ` thfbjyddx 2012-01-12 8:29 ` [Qemu-devel] " thfbjyddx 2012-01-12 8:54 ` 回??: [PATCH 00/21][RFC] postcopy live?migration Isaku Yamahata 2012-01-12 8:54 ` [Qemu-devel] " Isaku Yamahata 2012-01-12 13:26 ` thfbjyddx 2012-01-12 13:26 ` [Qemu-devel] " thfbjyddx 2012-01-16 6:51 ` Isaku Yamahata 2012-01-16 6:51 ` [Qemu-devel] " Isaku Yamahata 2012-01-16 10:17 ` Isaku Yamahata 2012-01-16 10:17 ` [Qemu-devel] " Isaku Yamahata 2012-03-12 8:36 ` thfbjyddx 2012-03-12 8:36 ` [Qemu-devel] " thfbjyddx 2012-03-13 3:21 ` Isaku Yamahata 2012-03-13 3:21 ` [Qemu-devel] " Isaku Yamahata
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e92203d5555c1ebb667dc23bbc886da89f1b46b6.1325055139.git.yamahata@valinux.co.jp \ --to=yamahata@valinux.co.jp \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ --cc=satoshi.itoh@aist.go.jp \ --cc=t.hirofuchi@aist.go.jp \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.