From: Glauber Costa <gcosta@redhat.com>
To: kvm@vger.kernel.org
Cc: avi@qumranet.com, aliguori@us.ibm.com
Subject: [PATCH 2/9] experimental change to avoid doing the same thing twice
Date: Tue, 12 Aug 2008 21:48:02 -0300 [thread overview]
Message-ID: <1218588489-17182-3-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <1218588489-17182-2-git-send-email-gcosta@redhat.com>
Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
qemu/qemu-kvm.c | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 1d07650..f24c436 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -779,28 +779,19 @@ void kvm_cpu_register_physical_memory(target_phys_addr_t start_addr,
#ifdef KVM_CAP_USER_MEMORY
int r = 0;
+
r = kvm_check_extension(kvm_context, KVM_CAP_USER_MEMORY);
if (r) {
- if (!(phys_offset & ~TARGET_PAGE_MASK)) {
- r = kvm_is_allocated_mem(kvm_context, start_addr, size);
- if (r)
- return;
- r = kvm_is_intersecting_mem(kvm_context, start_addr);
- if (r)
- kvm_create_mem_hole(kvm_context, start_addr, size);
- r = kvm_register_userspace_phys_mem(kvm_context, start_addr,
- phys_ram_base + phys_offset,
- size, 0);
- }
- if (phys_offset & IO_MEM_ROM) {
- phys_offset &= ~IO_MEM_ROM;
- r = kvm_is_intersecting_mem(kvm_context, start_addr);
- if (r)
- kvm_create_mem_hole(kvm_context, start_addr, size);
- r = kvm_register_userspace_phys_mem(kvm_context, start_addr,
- phys_ram_base + phys_offset,
- size, 0);
- }
+ phys_offset &= ~IO_MEM_ROM;
+ r = kvm_is_allocated_mem(kvm_context, start_addr, size);
+ if (r)
+ return;
+ r = kvm_is_intersecting_mem(kvm_context, start_addr);
+ if (r)
+ kvm_create_mem_hole(kvm_context, start_addr, size);
+ r = kvm_register_userspace_phys_mem(kvm_context, start_addr,
+ phys_ram_base + phys_offset,
+ size, 0);
if (r < 0) {
printf("kvm_cpu_register_physical_memory: failed\n");
exit(1);
--
1.5.5.1
next prev parent reply other threads:[~2008-08-13 0:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-13 0:48 [RFC 0/9] Memory registration rework Glauber Costa
2008-08-13 0:48 ` [PATCH 1/9] add debuging facilities to memory registration at libkvm Glauber Costa
2008-08-13 0:48 ` Glauber Costa [this message]
2008-08-13 0:48 ` [PATCH 3/9] do not use mem_hole anymore Glauber Costa
2008-08-13 0:48 ` [PATCH 4/9] allow intersecting region to be on the boundary Glauber Costa
2008-08-13 0:48 ` [PATCH 5/9] substitute is_allocated_mem with more general is_containing_region Glauber Costa
2008-08-13 0:48 ` [PATCH 6/9] move kvm_cpu_register_memory_area into qemu's Glauber Costa
2008-08-13 0:48 ` [PATCH 7/9] cleanup kvm memory registration Glauber Costa
2008-08-13 0:48 ` [PATCH 8/9] coalesce mmio regions without an explicit call Glauber Costa
2008-08-13 0:48 ` [PATCH 9/9] remove explicit calls to kvm_qemu_register_coalesced_mmio Glauber Costa
2008-08-13 14:11 ` [PATCH 6/9] move kvm_cpu_register_memory_area into qemu's Anthony Liguori
2008-08-13 14:33 ` Glauber Costa
2008-08-13 11:41 ` [PATCH 5/9] substitute is_allocated_mem with more general is_containing_region Avi Kivity
2008-08-13 13:02 ` Glauber Costa
2008-08-13 11:43 ` [RFC 0/9] Memory registration rework Avi Kivity
2008-08-13 14:13 ` Anthony Liguori
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=1218588489-17182-3-git-send-email-gcosta@redhat.com \
--to=gcosta@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=avi@qumranet.com \
--cc=kvm@vger.kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox