Skip to contentSkip to conversation

make --disable-kvm to compile again

PATCH Applied Juan Quintela 3 participants 5 messages Sep 19, 2009 – Sep 21, 2009 KVM

lore
Share & tools
lore

Juan Quintela

author
#0 lore raw

cover make --disable-kvm to compile again

There were a couple of missing #ifdef KVM_* from last merge. ./configure --disable-kvm compiles and boots again.

It compiles, it boot, it is perfect!!! (*)

Later, Juan.

*: No, that sentence is not mine :)

Juan Quintela (2):
apic: Variable only used when CAP_IRQCHIP is defined
i8259: kvm_* functions only defined when KVM_CAP_IRQCHIP devined

 hw/apic.c  |    4 ++--
 hw/i8259.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
author
#1 lore raw

PATCH 1/2 apic: Variable only used when CAP_IRQCHIP is defined

Signed-off-by Juan Quintela <[email protected]>
---
 hw/apic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/apic.c +2 -2
index d92d86c..908d293 100644
@@ -967,9 +967,9 @@ void qemu_kvm_load_lapic(CPUState *env)
 
 static void apic_pre_save(const void *opaque)
 {
+#ifdef KVM_CAP_IRQCHIP
     APICState *s = (void *)opaque;
 
-#ifdef KVM_CAP_IRQCHIP
     if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
         kvm_kernel_lapic_save_to_user(s);
     }

@@ -978,9 +978,9 @@ static void apic_pre_save(const void *opaque)
 
 static int apic_post_load(void *opaque)
 {
+#ifdef KVM_CAP_IRQCHIP
     APICState *s = opaque;
 
-#ifdef KVM_CAP_IRQCHIP
     if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
         kvm_kernel_lapic_load_from_user(s);
     }
Signature · 1 line
1.6.2.5
author
#2 lore raw

PATCH 2/2 i8259: kvm_* functions only defined when KVM_CAP_IRQCHIP devined

In reply to Juan Quintela
Signed-off-by Juan Quintela <[email protected]>
---
 hw/i8259.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
hw/i8259.c +2 -2
index aaec6d8..3b98bab 100644
@@ -464,18 +464,18 @@ static uint32_t elcr_ioport_read(void *opaque, uint32_t addr1)
     return s->elcr;
 }
 
+#ifdef KVM_CAP_IRQCHIP
 static void kvm_kernel_pic_save_to_user(const void *opaque);
 static int kvm_kernel_pic_load_from_user(void *opaque);
+#endif
 
 static const VMStateDescription vmstate_pic = {
     .name = "i8259",
     .version_id = 1,
 #ifdef KVM_CAP_IRQCHIP
-#ifdef TARGET_I386
     .pre_save = kvm_kernel_pic_save_to_user,
     .post_load = kvm_kernel_pic_load_from_user,
 #endif
-#endif
     .minimum_version_id = 1,
     .minimum_version_id_old = 1,
     .fields      = (VMStateField []) {
Signature · 1 line
1.6.2.5
#3 lore raw
In reply to Juan Quintela
Quoted 4 lines · Juan Quintela

There were a couple of missing #ifdef KVM_* from last merge. ./configure --disable-kvm compiles and boots again.

It compiles, it boot, it is perfect!!! (*)

Well, almost (try to build all targets): :p

You also have to move vga_dirty_log_start/stop back to vga.c where it actually belongs (right beside vga_sync_dirty_bitmap). This happens to work so far in upstream as its users there are only built together with vga-pci. But it fails here due to the special logging patches qemu-kvm still carries.

Please also refactor this upstream.

Jan

Applied
#4 lore raw
In reply to Juan Quintela
Quoted 6 lines · Juan Quintela

There were a couple of missing #ifdef KVM_* from last merge. ./configure --disable-kvm compiles and boots again.

It compiles, it boot, it is perfect!!! (*)

Applied, thanks.

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