Skip to contentSkip to conversation

Use coalescing region from upstream

PATCH Applied Glauber Costa 2 participants 4 messages Jul 24, 2009 – Jul 29, 2009 KVM

lore
Share & tools
lore
#0 lore raw

cover Use coalescing region from upstream

Marcelo,

these two patches move the control of coalescing regions to upstream code. Note the first one won't apply in your tip. I'm assuming you have already applied the ones who remove some pit/irqchip related variables in kvm_context

thanks!

#1 lore raw

PATCH 1/2 use coalesced_mmio field from qemu upstream

remove it from kvm_context too. Besides it all,
helps catching any missing conversion

---
 qemu-kvm.c |   14 ++++++--------
 qemu-kvm.h |    2 --
 2 files changed, 6 insertions(+), 10 deletions(-)
qemu-kvm.c +6 -8
index b9164ee..c1454fd 100644
@@ -1026,9 +1026,9 @@ again:
 	post_kvm_run(kvm, env);
 
 #if defined(KVM_CAP_COALESCED_MMIO)
-	if (kvm->coalesced_mmio) {
+	if (kvm_state->coalesced_mmio) {
 	        struct kvm_coalesced_mmio_ring *ring = (void *)run +
-						kvm->coalesced_mmio * PAGE_SIZE;
+						kvm_state->coalesced_mmio * PAGE_SIZE;
 		while (ring->first != ring->last) {
 			kvm_mmio_write(kvm->opaque,
 				 ring->coalesced_mmio[ring->first].phys_addr,
@@ -1164,11 +1164,11 @@ int kvm_inject_nmi(kvm_vcpu_context_t vcpu)
 int kvm_init_coalesced_mmio(kvm_context_t kvm)
 {
 	int r = 0;
-	kvm->coalesced_mmio = 0;
+	kvm_state->coalesced_mmio = 0;
 #ifdef KVM_CAP_COALESCED_MMIO
 	r = kvm_ioctl(kvm_state, KVM_CHECK_EXTENSION, KVM_CAP_COALESCED_MMIO);
 	if (r > 0) {
-		kvm->coalesced_mmio = r;
+		kvm_state->coalesced_mmio = r;
 		return 0;
 	}
 #endif
@@ -1178,11 +1178,10 @@ int kvm_init_coalesced_mmio(kvm_context_t kvm)
 int kvm_coalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size)
 {
 #ifdef KVM_CAP_COALESCED_MMIO
-	kvm_context_t kvm = kvm_context;
 	struct kvm_coalesced_mmio_zone zone;
 	int r;
 
-	if (kvm->coalesced_mmio) {
+	if (kvm_state->coalesced_mmio) {
 
 		zone.addr = addr;
 		zone.size = size;
@@ -1201,11 +1200,10 @@ int kvm_coalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size)
 int kvm_uncoalesce_mmio_region(target_phys_addr_t addr, ram_addr_t size)
 {
 #ifdef KVM_CAP_COALESCED_MMIO
-	kvm_context_t kvm = kvm_context;
 	struct kvm_coalesced_mmio_zone zone;
 	int r;
 
-	if (kvm->coalesced_mmio) {
+	if (kvm_state->coalesced_mmio) {
 
 		zone.addr = addr;
 		zone.size = size;
qemu-kvm.h +0 -2
index 1e5d89a..0de546f 100644
@@ -61,8 +61,6 @@ struct kvm_context {
 	int irqchip_inject_ioctl;
 	/// in-kernel pit status
 	int pit_in_kernel;
-	/// in-kernel coalesced mmio
-	int coalesced_mmio;
 #ifdef KVM_CAP_IRQ_ROUTING
 	struct kvm_irq_routing *irq_routes;
 	int nr_allocated_irq_routes;
Signature · 1 line
1.6.2.2
#2 lore raw

PATCH 2/2 use coalesce memory regions functions from upstream

Delete ours, they do the same thing.

---
 kvm-all.c  |    2 +-
 qemu-kvm.c |   45 ---------------------------------------------
 2 files changed, 1 insertions(+), 46 deletions(-)
kvm-all.c +1 -1
index 157b968..e798496 100644
@@ -344,6 +344,7 @@ int kvm_physical_sync_dirty_bitmap(target_phys_addr_t start_addr,
 
     return ret;
 }
+#endif
 
 int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
 {
@@ -383,7 +384,6 @@ int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size)
     return ret;
 }
 
-#endif
 int kvm_check_extension(KVMState *s, unsigned int extension)
 {
     int ret;
qemu-kvm.c +0 -45

51 lines not on this page · raw message

Signature · 1 line
1.6.2.2
Applied
#3 lore raw
In reply to Glauber Costa
Quoted 6 lines · Glauber Costa

Marcelo,

these two patches move the control of coalescing regions to upstream code. Note the first one won't apply in your tip. I'm assuming you have already applied the ones who remove some pit/irqchip related variables in kvm_context

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function