[PATCH 0/2] make --disable-kvm to compile again

[PATCH 0/2] make --disable-kvm to compile again

[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!!! (*)

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(-)

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

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/apic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/apic.c b/hw/apic.c
index d92d86c..908d293 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -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);
     }
-- 
1.6.2.5

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

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/i8259.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/i8259.c b/hw/i8259.c
index aaec6d8..3b98bab 100644
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -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 []) {
-- 
1.6.2.5

Re: [PATCH 0/2] make --disable-kvm to compile again

[Jan Kiszka]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

Juan Quintela wrote:
> 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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 257 bytes --]

Re: [PATCH 0/2] make --disable-kvm to compile again

[Avi Kivity]

On 09/19/2009 03:59 PM, Juan Quintela wrote:
> 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.

-- 
error compiling committee.c: too many arguments to function