From: Anthony Liguori <anthony@codemonkey.ws>
To: Jan Kiszka <jan.kiszka@web.de>
Cc: Avi Kivity <avi@redhat.com>,
kvm@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PATCH] Rename KVM_UPSTREAM to OBSOLETE_KVM_IMPL
Date: Mon, 13 Sep 2010 13:56:48 -0500 [thread overview]
Message-ID: <4C8E73F0.6030302@codemonkey.ws> (raw)
In-Reply-To: <4C8E72E8.1090706@web.de>
On 09/13/2010 01:52 PM, Jan Kiszka wrote:
> Am 13.09.2010 19:54, Avi Kivity wrote:
>
>> The symbol KVM_UPSTREAM is used to mark sections of code that are part of
>> the upstream kvm implemetation that is not used in qemu-kvm. However the
>> name becomes ambiguous if qemu-kvm is merged upstream.
>>
> I doubt this is describing all cases correctly as well. Some changes
> should rather happen the other way around (e.g. you surely don't want to
> obsolete x86 kvm_arch_put/get_registers in favor of
> kvm_arch_load/save_regs, do you?).
>
There's really no perfect name to describe what we're actually doing
here. It's probably not a detail worth worrying that much about.
Regards,
Anthony Liguori
> Jan
>
>
>> Rename the symbol to avoid confusion.
>>
>> Signed-off-by: Avi Kivity<avi@redhat.com>
>> ---
>> cpus.c | 2 +-
>> kvm-all.c | 16 ++++++++--------
>> kvm.h | 6 +++---
>> target-i386/kvm.c | 10 +++++-----
>> vl.c | 4 ++--
>> 5 files changed, 19 insertions(+), 19 deletions(-)
>>
>> diff --git a/cpus.c b/cpus.c
>> index c545a62..99c04d1 100644
>> --- a/cpus.c
>> +++ b/cpus.c
>> @@ -299,7 +299,7 @@ void qemu_notify_event(void)
>> }
>> }
>>
>> -#if defined(KVM_UPSTREAM) || !defined(CONFIG_KVM)
>> +#if defined(OBSOLETE_KVM_IMPL) || !defined(CONFIG_KVM)
>> void qemu_mutex_lock_iothread(void) {}
>> void qemu_mutex_unlock_iothread(void) {}
>> #endif
>> diff --git a/kvm-all.c b/kvm-all.c
>> index 4ff75c4..d4b0861 100644
>> --- a/kvm-all.c
>> +++ b/kvm-all.c
>> @@ -41,7 +41,7 @@
>> do { } while (0)
>> #endif
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> typedef struct KVMSlot
>> {
>> @@ -156,7 +156,7 @@ static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot)
>> return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION,&mem);
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> static void kvm_reset_vcpu(void *opaque)
>> {
>> CPUState *env = opaque;
>> @@ -176,7 +176,7 @@ int kvm_pit_in_kernel(void)
>> }
>>
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> int kvm_init_vcpu(CPUState *env)
>> {
>> KVMState *s = kvm_state;
>> @@ -594,7 +594,7 @@ void kvm_cpu_register_phys_memory_client(void)
>> cpu_register_phys_memory_client(&kvm_cpu_phys_memory_client);
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> int kvm_init(int smp_cpus)
>> {
>> @@ -816,7 +816,7 @@ void kvm_flush_coalesced_mmio_buffer(void)
>> #endif
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> static void do_kvm_cpu_synchronize_state(void *_env)
>> {
>> @@ -1038,7 +1038,7 @@ int kvm_has_debugregs(void)
>> return kvm_state->debugregs;
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> int kvm_has_xsave(void)
>> {
>> return kvm_state->xsave;
>> @@ -1069,10 +1069,10 @@ void kvm_setup_guest_memory(void *start, size_t size)
>> }
>>
>> #ifdef KVM_CAP_SET_GUEST_DEBUG
>> -#ifndef KVM_UPSTREAM
>> +#ifndef OBSOLETE_KVM_IMPL
>> #define run_on_cpu on_vcpu
>> static void on_vcpu(CPUState *env, void (*func)(void *data), void *data);
>> -#endif /* !KVM_UPSTREAM */
>> +#endif /* !OBSOLETE_KVM_IMPL */
>>
>> struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *env,
>> target_ulong pc)
>> diff --git a/kvm.h b/kvm.h
>> index d321fce..56236ae 100644
>> --- a/kvm.h
>> +++ b/kvm.h
>> @@ -31,13 +31,13 @@ extern int kvm_allowed;
>> #define kvm_enabled() (0)
>> #endif
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> struct kvm_run;
>>
>> /* external API */
>>
>> int kvm_init(int smp_cpus);
>> -#endif /* KVM_UPSTREAM */
>> +#endif /* OBSOLETE_KVM_IMPL */
>>
>> int kvm_has_sync_mmu(void);
>> int kvm_has_vcpu_events(void);
>> @@ -96,7 +96,7 @@ int kvm_arch_handle_exit(CPUState *env, struct kvm_run *run);
>>
>> int kvm_arch_pre_run(CPUState *env, struct kvm_run *run);
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> int kvm_arch_process_irqchip_events(CPUState *env);
>> #endif
>>
>> diff --git a/target-i386/kvm.c b/target-i386/kvm.c
>> index b00e80d..f4fc063 100644
>> --- a/target-i386/kvm.c
>> +++ b/target-i386/kvm.c
>> @@ -188,7 +188,7 @@ int kvm_arch_init_vcpu(CPUState *env)
>> return r;
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> env->mp_state = KVM_MP_STATE_RUNNABLE;
>>
>> @@ -304,7 +304,7 @@ void kvm_arch_reset_vcpu(CPUState *env)
>> env->mp_state = KVM_MP_STATE_RUNNABLE;
>> }
>> }
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> static int kvm_has_msr_star(CPUState *env)
>> {
>> @@ -644,7 +644,7 @@ static void kvm_msr_entry_set(struct kvm_msr_entry *entry,
>> entry->data = value;
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> static int kvm_put_msrs(CPUState *env, int level)
>> {
>> struct {
>> @@ -1104,7 +1104,7 @@ static int kvm_get_debugregs(CPUState *env)
>> return 0;
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> int kvm_arch_put_registers(CPUState *env, int level)
>> {
>> int ret;
>> @@ -1242,7 +1242,7 @@ int kvm_arch_post_run(CPUState *env, struct kvm_run *run)
>> return 0;
>> }
>>
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>>
>> int kvm_arch_process_irqchip_events(CPUState *env)
>> {
>> diff --git a/vl.c b/vl.c
>> index 22a3616..378a176 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -2466,7 +2466,7 @@ int main(int argc, char **argv, char **envp)
>> case QEMU_OPTION_smbios:
>> do_smbios_option(optarg);
>> break;
>> -#ifdef KVM_UPSTREAM
>> +#ifdef OBSOLETE_KVM_IMPL
>> case QEMU_OPTION_enable_kvm:
>> kvm_allowed = 1;
>> #endif
>> @@ -2803,7 +2803,7 @@ int main(int argc, char **argv, char **envp)
>> if (kvm_allowed) {
>> int ret = kvm_init(smp_cpus);
>> if (ret< 0) {
>> -#if defined(KVM_UPSTREAM) || defined(CONFIG_NO_CPU_EMULATION)
>> +#if defined(OBSOLETE_KVM_IMPL) || defined(CONFIG_NO_CPU_EMULATION)
>> if (!kvm_available()) {
>> printf("KVM not supported for this target\n");
>> } else {
>>
>
next prev parent reply other threads:[~2010-09-13 18:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 17:54 [PATCH] Rename KVM_UPSTREAM to OBSOLETE_KVM_IMPL Avi Kivity
2010-09-13 18:52 ` Jan Kiszka
2010-09-13 18:56 ` Anthony Liguori [this message]
2010-09-13 19:03 ` Jan Kiszka
2010-09-14 9:29 ` Avi Kivity
2010-09-14 10:42 ` Jan Kiszka
2010-09-14 10:50 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C8E73F0.6030302@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=avi@redhat.com \
--cc=jan.kiszka@web.de \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.