[Qemu-devel] [PATCH for-2.7] apic: fix broken migration for kvm-apic

[Igor Mammedov]

commit f6e98444 (apic: Use apic_id as apic's migration instance_id)
breaks migration when in kernel irqchip is used for 2.6 and older
machine types.

It applies compat property only for userspace 'apic' type
instead of applying it to all apic types inherited from
'apic-common' type as it was supposed to do.

Fix it by setting compat property 'legacy-instance-id' for
'apic-common' type which affects inherited types (i.e. not
only 'apic' but also 'kvm-apic' types)

Signed-off-by: Igor Mammedov 
---
 include/hw/i386/pc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index c87c5c1..74c175c 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -388,7 +388,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
 .value = "off",\
 },\
 {\
-.driver   = "apic",\
+.driver   = "apic-common",\
 .property = "legacy-instance-id",\
 .value= "on",\
 },
-- 
2.7.4

Re: [Qemu-devel] [PATCH for-2.7] apic: fix broken migration for kvm-apic

[Michael S. Tsirkin]

On Fri, Jul 29, 2016 at 03:55:42PM +0200, Igor Mammedov wrote:
> commit f6e98444 (apic: Use apic_id as apic's migration instance_id)
> breaks migration when in kernel irqchip is used for 2.6 and older
> machine types.
> 
> It applies compat property only for userspace 'apic' type
> instead of applying it to all apic types inherited from
> 'apic-common' type as it was supposed to do.
> 
> Fix it by setting compat property 'legacy-instance-id' for
> 'apic-common' type which affects inherited types (i.e. not
> only 'apic' but also 'kvm-apic' types)
> 
> Signed-off-by: Igor Mammedov 


Reviewed-by: Michael S. Tsirkin 



> ---
>  include/hw/i386/pc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index c87c5c1..74c175c 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -388,7 +388,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t 
> *);
>  .value = "off",\
>  },\
>  {\
> -.driver   = "apic",\
> +.driver   = "apic-common",\
>  .property = "legacy-instance-id",\
>  .value= "on",\
>  },
> -- 
> 2.7.4

Re: [Qemu-devel] [PATCH for-2.7] apic: fix broken migration for kvm-apic

[Paolo Bonzini]

On 29/07/2016 15:55, Igor Mammedov wrote:
> commit f6e98444 (apic: Use apic_id as apic's migration instance_id)
> breaks migration when in kernel irqchip is used for 2.6 and older
> machine types.
> 
> It applies compat property only for userspace 'apic' type
> instead of applying it to all apic types inherited from
> 'apic-common' type as it was supposed to do.
> 
> Fix it by setting compat property 'legacy-instance-id' for
> 'apic-common' type which affects inherited types (i.e. not
> only 'apic' but also 'kvm-apic' types)
> 
> Signed-off-by: Igor Mammedov 
> ---
>  include/hw/i386/pc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index c87c5c1..74c175c 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -388,7 +388,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t 
> *);
>  .value = "off",\
>  },\
>  {\
> -.driver   = "apic",\
> +.driver   = "apic-common",\
>  .property = "legacy-instance-id",\
>  .value= "on",\
>  },
> 

Queued for 2.7, thanks.

Paolo