| Message ID | 1366063976-4909-3-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Apr 16, 2013 at 12:12:42AM +0200, Igor Mammedov wrote: > ... to synchronize CPU state to KVM > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > v2: > * linking kvm-stub.o to *-user target moved in separate patch > --- > include/sysemu/kvm.h | 18 ++++++++++-------- > kvm-all.c | 1 + > kvm-stub.c | 1 + > qom/cpu.c | 4 ++++ > vl.c | 1 - > 5 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 93cef28..8fb2489 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -250,8 +250,6 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > uint32_t index, int reg); > void kvm_cpu_synchronize_state(CPUArchState *env); > -void kvm_cpu_synchronize_post_reset(CPUState *cpu); > -void kvm_cpu_synchronize_post_init(CPUState *cpu); > > /* generic hooks - to be moved/refactored once there are more users */ > > @@ -262,6 +260,16 @@ static inline void cpu_synchronize_state(CPUArchState *env) > } > } > > +#if !defined(CONFIG_USER_ONLY) > +int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > + hwaddr *phys_addr); > +#endif > + > +#endif /* NEED_CPU_H */ > + > +void kvm_cpu_synchronize_post_reset(CPUState *cpu); > +void kvm_cpu_synchronize_post_init(CPUState *cpu); > + > static inline void cpu_synchronize_post_reset(CPUState *cpu) > { > if (kvm_enabled()) { > @@ -277,12 +285,6 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) > } > > > -#if !defined(CONFIG_USER_ONLY) > -int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > - hwaddr *phys_addr); > -#endif > - > -#endif > int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign, > uint32_t size); > > diff --git a/kvm-all.c b/kvm-all.c > index fc4e17c..1d17128 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -109,6 +109,7 @@ bool kvm_async_interrupts_allowed; > bool kvm_irqfds_allowed; > bool kvm_msi_via_irqfd_allowed; > bool kvm_gsi_routing_allowed; > +bool kvm_allowed; > > static const KVMCapabilityInfo kvm_required_capabilites[] = { > KVM_CAP_INFO(USER_MEMORY), > diff --git a/kvm-stub.c b/kvm-stub.c > index a131305..4282e09 100644 > --- a/kvm-stub.c > +++ b/kvm-stub.c > @@ -23,6 +23,7 @@ bool kvm_async_interrupts_allowed; > bool kvm_irqfds_allowed; > bool kvm_msi_via_irqfd_allowed; > bool kvm_gsi_routing_allowed; > +bool kvm_allowed; > > int kvm_init_vcpu(CPUState *cpu) > { > diff --git a/qom/cpu.c b/qom/cpu.c > index e242dcb..0c76712 100644 > --- a/qom/cpu.c > +++ b/qom/cpu.c > @@ -20,6 +20,7 @@ > > #include "qom/cpu.h" > #include "qemu-common.h" > +#include "sysemu/kvm.h" > > void cpu_reset_interrupt(CPUState *cpu, int mask) > { > @@ -57,6 +58,9 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model) > > static void cpu_common_realizefn(DeviceState *dev, Error **errp) > { > + if (dev->hotplugged) { > + cpu_synchronize_post_init(CPU(dev)); > + } > } > > static void cpu_class_init(ObjectClass *klass, void *data) > diff --git a/vl.c b/vl.c > index dd94549..bc9c016 100644 > --- a/vl.c > +++ b/vl.c > @@ -267,7 +267,6 @@ static NotifierList machine_init_done_notifiers = > NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); > > static bool tcg_allowed = true; > -bool kvm_allowed; > bool xen_allowed; > uint32_t xen_domid; > enum xen_mode xen_mode = XEN_EMULATE; > -- > 1.8.2 > >
Am 16.04.2013 00:12, schrieb Igor Mammedov: > ... to synchronize CPU state to KVM > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > v2: > * linking kvm-stub.o to *-user target moved in separate patch > --- > include/sysemu/kvm.h | 18 ++++++++++-------- > kvm-all.c | 1 + > kvm-stub.c | 1 + > qom/cpu.c | 4 ++++ > vl.c | 1 - > 5 files changed, 16 insertions(+), 9 deletions(-) Looks okay to me. Gleb, can you ack? Andreas > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 93cef28..8fb2489 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -250,8 +250,6 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > uint32_t index, int reg); > void kvm_cpu_synchronize_state(CPUArchState *env); > -void kvm_cpu_synchronize_post_reset(CPUState *cpu); > -void kvm_cpu_synchronize_post_init(CPUState *cpu); > > /* generic hooks - to be moved/refactored once there are more users */ > > @@ -262,6 +260,16 @@ static inline void cpu_synchronize_state(CPUArchState *env) > } > } > > +#if !defined(CONFIG_USER_ONLY) > +int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > + hwaddr *phys_addr); > +#endif > + > +#endif /* NEED_CPU_H */ > + > +void kvm_cpu_synchronize_post_reset(CPUState *cpu); > +void kvm_cpu_synchronize_post_init(CPUState *cpu); > + > static inline void cpu_synchronize_post_reset(CPUState *cpu) > { > if (kvm_enabled()) { > @@ -277,12 +285,6 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) > } > > > -#if !defined(CONFIG_USER_ONLY) > -int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > - hwaddr *phys_addr); > -#endif > - > -#endif > int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign, > uint32_t size); > > diff --git a/kvm-all.c b/kvm-all.c > index fc4e17c..1d17128 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -109,6 +109,7 @@ bool kvm_async_interrupts_allowed; > bool kvm_irqfds_allowed; > bool kvm_msi_via_irqfd_allowed; > bool kvm_gsi_routing_allowed; > +bool kvm_allowed; > > static const KVMCapabilityInfo kvm_required_capabilites[] = { > KVM_CAP_INFO(USER_MEMORY), > diff --git a/kvm-stub.c b/kvm-stub.c > index a131305..4282e09 100644 > --- a/kvm-stub.c > +++ b/kvm-stub.c > @@ -23,6 +23,7 @@ bool kvm_async_interrupts_allowed; > bool kvm_irqfds_allowed; > bool kvm_msi_via_irqfd_allowed; > bool kvm_gsi_routing_allowed; > +bool kvm_allowed; > > int kvm_init_vcpu(CPUState *cpu) > { > diff --git a/qom/cpu.c b/qom/cpu.c > index e242dcb..0c76712 100644 > --- a/qom/cpu.c > +++ b/qom/cpu.c > @@ -20,6 +20,7 @@ > > #include "qom/cpu.h" > #include "qemu-common.h" > +#include "sysemu/kvm.h" > > void cpu_reset_interrupt(CPUState *cpu, int mask) > { > @@ -57,6 +58,9 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model) > > static void cpu_common_realizefn(DeviceState *dev, Error **errp) > { > + if (dev->hotplugged) { > + cpu_synchronize_post_init(CPU(dev)); > + } > } > > static void cpu_class_init(ObjectClass *klass, void *data) > diff --git a/vl.c b/vl.c > index dd94549..bc9c016 100644 > --- a/vl.c > +++ b/vl.c > @@ -267,7 +267,6 @@ static NotifierList machine_init_done_notifiers = > NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); > > static bool tcg_allowed = true; > -bool kvm_allowed; > bool xen_allowed; > uint32_t xen_domid; > enum xen_mode xen_mode = XEN_EMULATE; >
On Mon, Apr 22, 2013 at 03:46:37PM +0200, Andreas Färber wrote: > Am 16.04.2013 00:12, schrieb Igor Mammedov: > > ... to synchronize CPU state to KVM > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > > --- > > v2: > > * linking kvm-stub.o to *-user target moved in separate patch > > --- > > include/sysemu/kvm.h | 18 ++++++++++-------- > > kvm-all.c | 1 + > > kvm-stub.c | 1 + > > qom/cpu.c | 4 ++++ > > vl.c | 1 - > > 5 files changed, 16 insertions(+), 9 deletions(-) > > Looks okay to me. Gleb, can you ack? > Yes, looks good to me. > Andreas > > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > > index 93cef28..8fb2489 100644 > > --- a/include/sysemu/kvm.h > > +++ b/include/sysemu/kvm.h > > @@ -250,8 +250,6 @@ int kvm_check_extension(KVMState *s, unsigned int extension); > > uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, > > uint32_t index, int reg); > > void kvm_cpu_synchronize_state(CPUArchState *env); > > -void kvm_cpu_synchronize_post_reset(CPUState *cpu); > > -void kvm_cpu_synchronize_post_init(CPUState *cpu); > > > > /* generic hooks - to be moved/refactored once there are more users */ > > > > @@ -262,6 +260,16 @@ static inline void cpu_synchronize_state(CPUArchState *env) > > } > > } > > > > +#if !defined(CONFIG_USER_ONLY) > > +int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > > + hwaddr *phys_addr); > > +#endif > > + > > +#endif /* NEED_CPU_H */ > > + > > +void kvm_cpu_synchronize_post_reset(CPUState *cpu); > > +void kvm_cpu_synchronize_post_init(CPUState *cpu); > > + > > static inline void cpu_synchronize_post_reset(CPUState *cpu) > > { > > if (kvm_enabled()) { > > @@ -277,12 +285,6 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) > > } > > > > > > -#if !defined(CONFIG_USER_ONLY) > > -int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, > > - hwaddr *phys_addr); > > -#endif > > - > > -#endif > > int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign, > > uint32_t size); > > > > diff --git a/kvm-all.c b/kvm-all.c > > index fc4e17c..1d17128 100644 > > --- a/kvm-all.c > > +++ b/kvm-all.c > > @@ -109,6 +109,7 @@ bool kvm_async_interrupts_allowed; > > bool kvm_irqfds_allowed; > > bool kvm_msi_via_irqfd_allowed; > > bool kvm_gsi_routing_allowed; > > +bool kvm_allowed; > > > > static const KVMCapabilityInfo kvm_required_capabilites[] = { > > KVM_CAP_INFO(USER_MEMORY), > > diff --git a/kvm-stub.c b/kvm-stub.c > > index a131305..4282e09 100644 > > --- a/kvm-stub.c > > +++ b/kvm-stub.c > > @@ -23,6 +23,7 @@ bool kvm_async_interrupts_allowed; > > bool kvm_irqfds_allowed; > > bool kvm_msi_via_irqfd_allowed; > > bool kvm_gsi_routing_allowed; > > +bool kvm_allowed; > > > > int kvm_init_vcpu(CPUState *cpu) > > { > > diff --git a/qom/cpu.c b/qom/cpu.c > > index e242dcb..0c76712 100644 > > --- a/qom/cpu.c > > +++ b/qom/cpu.c > > @@ -20,6 +20,7 @@ > > > > #include "qom/cpu.h" > > #include "qemu-common.h" > > +#include "sysemu/kvm.h" > > > > void cpu_reset_interrupt(CPUState *cpu, int mask) > > { > > @@ -57,6 +58,9 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model) > > > > static void cpu_common_realizefn(DeviceState *dev, Error **errp) > > { > > + if (dev->hotplugged) { > > + cpu_synchronize_post_init(CPU(dev)); > > + } > > } > > > > static void cpu_class_init(ObjectClass *klass, void *data) > > diff --git a/vl.c b/vl.c > > index dd94549..bc9c016 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -267,7 +267,6 @@ static NotifierList machine_init_done_notifiers = > > NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); > > > > static bool tcg_allowed = true; > > -bool kvm_allowed; > > bool xen_allowed; > > uint32_t xen_domid; > > enum xen_mode xen_mode = XEN_EMULATE; > > > > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg -- Gleb.
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 93cef28..8fb2489 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -250,8 +250,6 @@ int kvm_check_extension(KVMState *s, unsigned int extension); uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, uint32_t index, int reg); void kvm_cpu_synchronize_state(CPUArchState *env); -void kvm_cpu_synchronize_post_reset(CPUState *cpu); -void kvm_cpu_synchronize_post_init(CPUState *cpu); /* generic hooks - to be moved/refactored once there are more users */ @@ -262,6 +260,16 @@ static inline void cpu_synchronize_state(CPUArchState *env) } } +#if !defined(CONFIG_USER_ONLY) +int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, + hwaddr *phys_addr); +#endif + +#endif /* NEED_CPU_H */ + +void kvm_cpu_synchronize_post_reset(CPUState *cpu); +void kvm_cpu_synchronize_post_init(CPUState *cpu); + static inline void cpu_synchronize_post_reset(CPUState *cpu) { if (kvm_enabled()) { @@ -277,12 +285,6 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) } -#if !defined(CONFIG_USER_ONLY) -int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, - hwaddr *phys_addr); -#endif - -#endif int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint32_t val, bool assign, uint32_t size); diff --git a/kvm-all.c b/kvm-all.c index fc4e17c..1d17128 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -109,6 +109,7 @@ bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; bool kvm_msi_via_irqfd_allowed; bool kvm_gsi_routing_allowed; +bool kvm_allowed; static const KVMCapabilityInfo kvm_required_capabilites[] = { KVM_CAP_INFO(USER_MEMORY), diff --git a/kvm-stub.c b/kvm-stub.c index a131305..4282e09 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -23,6 +23,7 @@ bool kvm_async_interrupts_allowed; bool kvm_irqfds_allowed; bool kvm_msi_via_irqfd_allowed; bool kvm_gsi_routing_allowed; +bool kvm_allowed; int kvm_init_vcpu(CPUState *cpu) { diff --git a/qom/cpu.c b/qom/cpu.c index e242dcb..0c76712 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -20,6 +20,7 @@ #include "qom/cpu.h" #include "qemu-common.h" +#include "sysemu/kvm.h" void cpu_reset_interrupt(CPUState *cpu, int mask) { @@ -57,6 +58,9 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model) static void cpu_common_realizefn(DeviceState *dev, Error **errp) { + if (dev->hotplugged) { + cpu_synchronize_post_init(CPU(dev)); + } } static void cpu_class_init(ObjectClass *klass, void *data) diff --git a/vl.c b/vl.c index dd94549..bc9c016 100644 --- a/vl.c +++ b/vl.c @@ -267,7 +267,6 @@ static NotifierList machine_init_done_notifiers = NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); static bool tcg_allowed = true; -bool kvm_allowed; bool xen_allowed; uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE;
... to synchronize CPU state to KVM Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- v2: * linking kvm-stub.o to *-user target moved in separate patch --- include/sysemu/kvm.h | 18 ++++++++++-------- kvm-all.c | 1 + kvm-stub.c | 1 + qom/cpu.c | 4 ++++ vl.c | 1 - 5 files changed, 16 insertions(+), 9 deletions(-)