[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Marcelo Tosatti]

The following changes since commit d33ea50a958b2e050d2b28e5f17e3b55e91c6d74:

  scsi-disk: Fix immediate failure of bdrv_aio_* (2010-11-04 13:54:37 +0100)

are available in the git repository at:
  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

Gleb Natapov (1):
      Add support for async page fault to qemu

 target-i386/cpu.h     |    1 +
 target-i386/cpuid.c   |    2 +-
 target-i386/kvm.c     |   14 ++++++++++++++
 target-i386/machine.c |   26 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletions(-)

[Qemu-devel] [PATCH 1/1] Add support for async page fault to qemu

[Marcelo Tosatti]

From: Gleb Natapov <gleb@redhat.com>

Add save/restore of MSR for migration and cpuid bit.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
 target-i386/cpu.h     |    1 +
 target-i386/cpuid.c   |    2 +-
 target-i386/kvm.c     |   14 ++++++++++++++
 target-i386/machine.c |   26 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 2440d65..06e40f3 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -681,6 +681,7 @@ typedef struct CPUX86State {
 #endif
     uint64_t system_time_msr;
     uint64_t wall_clock_msr;
+    uint64_t async_pf_en_msr;
 
     uint64_t tsc;
 
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 650a719..165045e 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -73,7 +73,7 @@ static const char *ext3_feature_name[] = {
 };
 
 static const char *kvm_feature_name[] = {
-    "kvmclock", "kvm_nopiodelay", "kvm_mmu", NULL, NULL, NULL, NULL, NULL,
+    "kvmclock", "kvm_nopiodelay", "kvm_mmu", NULL, "kvm_asyncpf", NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index ae0a034..7dfc357 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -162,6 +162,9 @@ struct kvm_para_features {
 #ifdef KVM_CAP_PV_MMU
         { KVM_CAP_PV_MMU, KVM_FEATURE_MMU_OP },
 #endif
+#ifdef KVM_CAP_ASYNC_PF
+        { KVM_CAP_ASYNC_PF, KVM_FEATURE_ASYNC_PF },
+#endif
         { -1, -1 }
 };
 
@@ -838,6 +841,9 @@ static int kvm_put_msrs(CPUState *env, int level)
         kvm_msr_entry_set(&msrs[n++], MSR_KVM_SYSTEM_TIME,
                           env->system_time_msr);
         kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
+#ifdef KVM_CAP_ASYNC_PF
+        kvm_msr_entry_set(&msrs[n++], MSR_KVM_ASYNC_PF_EN, env->async_pf_en_msr);
+#endif
     }
 #ifdef KVM_CAP_MCE
     if (env->mcg_cap) {
@@ -1064,6 +1070,9 @@ static int kvm_get_msrs(CPUState *env)
 #endif
     msrs[n++].index = MSR_KVM_SYSTEM_TIME;
     msrs[n++].index = MSR_KVM_WALL_CLOCK;
+#ifdef KVM_CAP_ASYNC_PF
+    msrs[n++].index = MSR_KVM_ASYNC_PF_EN;
+#endif
 
 #ifdef KVM_CAP_MCE
     if (env->mcg_cap) {
@@ -1135,6 +1144,11 @@ static int kvm_get_msrs(CPUState *env)
             }
 #endif
             break;
+#ifdef KVM_CAP_ASYNC_PF
+        case MSR_KVM_ASYNC_PF_EN:
+            env->async_pf_en_msr = msrs[i].data;
+            break;
+#endif
         }
     }
 
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 5f8376c..d78eceb 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -373,6 +373,24 @@ static int cpu_post_load(void *opaque, int version_id)
     return 0;
 }
 
+static bool async_pf_msr_needed(void *opaque)
+{
+    CPUState *cpu = opaque;
+
+    return cpu->async_pf_en_msr != 0;
+}
+
+static const VMStateDescription vmstate_async_pf_msr = {
+    .name = "cpu/async_pf_msr",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT64(async_pf_en_msr, CPUState),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static const VMStateDescription vmstate_cpu = {
     .name = "cpu",
     .version_id = CPU_SAVE_VERSION,
@@ -475,6 +493,14 @@ static const VMStateDescription vmstate_cpu = {
         VMSTATE_YMMH_REGS_VARS(ymmh_regs, CPUState, CPU_NB_REGS, 12),
         VMSTATE_END_OF_LIST()
         /* The above list is not sorted /wrt version numbers, watch out! */
+    },
+    .subsections = (VMStateSubsection []) {
+        {
+            .vmsd = &vmstate_async_pf_msr,
+            .needed = async_pf_msr_needed,
+        } , {
+            /* empty */
+        }
     }
 };
 
-- 
1.7.2.3

[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Marcelo Tosatti]

The following changes since commit d33ea50a958b2e050d2b28e5f17e3b55e91c6d74:

  scsi-disk: Fix immediate failure of bdrv_aio_* (2010-11-04 13:54:37 +0100)

are available in the git repository at:
  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

Gleb Natapov (1):
      Add support for async page fault to qemu

 target-i386/cpu.h     |    1 +
 target-i386/cpuid.c   |    2 +-
 target-i386/kvm.c     |   14 ++++++++++++++
 target-i386/machine.c |   26 ++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletions(-)

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

On 11/05/2010 07:44 PM, Marcelo Tosatti wrote:
> The following changes since commit d33ea50a958b2e050d2b28e5f17e3b55e91c6d74:
>
>    scsi-disk: Fix immediate failure of bdrv_aio_* (2010-11-04 13:54:37 +0100)
>    

Pulled.  Thanks.

Regards,

Anthony Liguori

> are available in the git repository at:
>    git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master
>
> Gleb Natapov (1):
>        Add support for async page fault to qemu
>
>   target-i386/cpu.h     |    1 +
>   target-i386/cpuid.c   |    2 +-
>   target-i386/kvm.c     |   14 ++++++++++++++
>   target-i386/machine.c |   26 ++++++++++++++++++++++++++
>   4 files changed, 42 insertions(+), 1 deletions(-)
>
>
>    

[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Marcelo Tosatti]

The following changes since commit d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:

  etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)

are available in the git repository at:
  git://github.com/avikivity/qemu.git uq/master

Liu, Jinsong (1):
      kvm: support TSC deadline MSR

 target-i386/cpu.h     |    4 +++-
 target-i386/kvm.c     |   14 ++++++++++++++
 target-i386/machine.c |    1 +
 3 files changed, 18 insertions(+), 1 deletions(-)

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

On 10/03/2011 03:55 PM, Marcelo Tosatti wrote:
> The following changes since commit d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:
>
>    etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)
>
> are available in the git repository at:
>    git://github.com/avikivity/qemu.git uq/master

Pulled.  Thanks.

Are ya'll planning on moving your repo back to kernel.org or sticking with github?

Regards,

Anthony Liguori

>
> Liu, Jinsong (1):
>        kvm: support TSC deadline MSR
>
>   target-i386/cpu.h     |    4 +++-
>   target-i386/kvm.c     |   14 ++++++++++++++
>   target-i386/machine.c |    1 +
>   3 files changed, 18 insertions(+), 1 deletions(-)
>
>

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Avi Kivity]

On 10/10/2011 04:41 PM, Anthony Liguori wrote:
> On 10/03/2011 03:55 PM, Marcelo Tosatti wrote:
>> The following changes since commit 
>> d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:
>>
>>    etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)
>>
>> are available in the git repository at:
>>    git://github.com/avikivity/qemu.git uq/master
>
> Pulled.  Thanks.
>

Um, this had a comment about it regarding s/version bump/subsection/

> Are ya'll planning on moving your repo back to kernel.org or sticking 
> with github?

We'll move back to kernel.org as soon as we sort around the keys.

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

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

On 10/10/2011 09:48 AM, Avi Kivity wrote:
> On 10/10/2011 04:41 PM, Anthony Liguori wrote:
>> On 10/03/2011 03:55 PM, Marcelo Tosatti wrote:
>>> The following changes since commit d11cf8cc80d946dfc9a23597cd9a0bb1c487cfa7:
>>>
>>> etrax-dma: Remove bogus if statement (2011-10-03 10:20:13 +0200)
>>>
>>> are available in the git repository at:
>>> git://github.com/avikivity/qemu.git uq/master
>>
>> Pulled. Thanks.
>>
>
> Um, this had a comment about it regarding s/version bump/subsection/

Hrm, sorry about that.  In the future, it would be helpful to explicitly 
withdrawal a PULL request.

Do you want me to revert?  FWIW, I think bumping the version is the right thing 
to do.

Regards,

Anthony Liguori

>
>> Are ya'll planning on moving your repo back to kernel.org or sticking with
>> github?
>
> We'll move back to kernel.org as soon as we sort around the keys.
>

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Avi Kivity]

On 10/10/2011 04:55 PM, Anthony Liguori wrote:
>
> Hrm, sorry about that.  In the future, it would be helpful to 
> explicitly withdrawal a PULL request.
>
> Do you want me to revert?

We'll send the revert together with the new patch.

>   FWIW, I think bumping the version is the right thing to do.

Why?

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

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

On 10/10/2011 10:00 AM, Avi Kivity wrote:
> On 10/10/2011 04:55 PM, Anthony Liguori wrote:
>>
>> Hrm, sorry about that. In the future, it would be helpful to explicitly
>> withdrawal a PULL request.
>>
>> Do you want me to revert?
>
> We'll send the revert together with the new patch.
>
>> FWIW, I think bumping the version is the right thing to do.
>
> Why?

Because we still haven't fixed subsections.  Juan's patches help but they can 
still result in sending bad data to and older QEMU that won't handle it properly.

We need to figure out a proper fix for subsections, either Paolo's protocol 
change or moving subsections out to a detected section.

Regards,

Anthony Liguori

>

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Avi Kivity]

On 10/10/2011 05:12 PM, Anthony Liguori wrote:
> On 10/10/2011 10:00 AM, Avi Kivity wrote:
>> On 10/10/2011 04:55 PM, Anthony Liguori wrote:
>>>
>>> Hrm, sorry about that. In the future, it would be helpful to explicitly
>>> withdrawal a PULL request.
>>>
>>> Do you want me to revert?
>>
>> We'll send the revert together with the new patch.
>>
>>> FWIW, I think bumping the version is the right thing to do.
>>
>> Why?
>
> Because we still haven't fixed subsections.  Juan's patches help but 
> they can still result in sending bad data to and older QEMU that won't 
> handle it properly.
>
> We need to figure out a proper fix for subsections, either Paolo's 
> protocol change or moving subsections out to a detected section.

Ok.  So bumping the version is only right if we don't fix subsections.

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

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

On 10/10/2011 10:24 AM, Avi Kivity wrote:
> On 10/10/2011 05:12 PM, Anthony Liguori wrote:
>> On 10/10/2011 10:00 AM, Avi Kivity wrote:
>>> On 10/10/2011 04:55 PM, Anthony Liguori wrote:
>>>>
>>>> Hrm, sorry about that. In the future, it would be helpful to explicitly
>>>> withdrawal a PULL request.
>>>>
>>>> Do you want me to revert?
>>>
>>> We'll send the revert together with the new patch.
>>>
>>>> FWIW, I think bumping the version is the right thing to do.
>>>
>>> Why?
>>
>> Because we still haven't fixed subsections. Juan's patches help but they can
>> still result in sending bad data to and older QEMU that won't handle it properly.
>>
>> We need to figure out a proper fix for subsections, either Paolo's protocol
>> change or moving subsections out to a detected section.
>
> Ok. So bumping the version is only right if we don't fix subsections.

If we bump *any* version from 0.15 -> 1.0, then there's no point at all in 
having a subsection.  If we break compatibility by using Paolo's new protocol, 
or doing subsections as sections, then there's no point in making it a 
subsection either.

Regards,

Anthony Liguori

>

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Avi Kivity]

On 10/10/2011 05:36 PM, Anthony Liguori wrote:
>> Ok. So bumping the version is only right if we don't fix subsections.
>
>
> If we bump *any* version from 0.15 -> 1.0, then there's no point at 
> all in having a subsection. 

Did we bump versions of relevant devices?

> If we break compatibility by using Paolo's new protocol, or doing 
> subsections as sections, then there's no point in making it a 
> subsection either.

These are workaroundable.  For example if you migrate 0.15 to 1.0 you 
start the destination with -old-subsection-format.  Even if you don't, 
since subsections are rarely present, migration will succeed.

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

[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Marcelo Tosatti]

The following changes since commit 1ccbc2851282564308f790753d7158487b6af8e2:

  qemu-sockets: Fix parsing of the inet option 'to'. (2012-11-21 12:07:59 +0400)

are available in the git repository at:
  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

Bruce Rogers (1):
      Legacy qemu-kvm options have no argument

 qemu-options.hx |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Re: [Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Anthony Liguori]

Marcelo Tosatti <mtosatti@redhat.com> writes:

> The following changes since commit 1ccbc2851282564308f790753d7158487b6af8e2:
>
>   qemu-sockets: Fix parsing of the inet option 'to'. (2012-11-21 12:07:59 +0400)
>
> are available in the git repository at:
>   git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master
>
> Bruce Rogers (1):
>       Legacy qemu-kvm options have no argument

Pulled. Thanks.

Regards,

Anthony Liguori

>
>  qemu-options.hx |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Qemu-devel] [PATCH 0/1] [PULL] qemu-kvm.git uq/master queue

[Gleb Natapov]

Anthony please pull if it is not too later for 1.5.

The following changes since commit 467b34689d277fa56c09ad07ca0f08d7d7539f6d:

  Update OpenBIOS images (2013-05-05 09:53:22 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git uq/master

for you to fetch changes up to 0c1cd0ae2a4faabeb948b9a07ea1696e853de174:

  kvmvapic: add ioport read accessor (2013-05-06 14:52:26 +0300)

----------------------------------------------------------------
Marcelo Tosatti (1):
      kvmvapic: add ioport read accessor

 hw/i386/kvmvapic.c |    6 ++++++
 1 file changed, 6 insertions(+)