* [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection @ 2014-04-02 15:33 Paolo Bonzini 2014-04-02 15:38 ` Michael S. Tsirkin 2014-04-02 15:42 ` Peter Maydell 0 siblings, 2 replies; 8+ messages in thread From: Paolo Bonzini @ 2014-04-02 15:33 UTC (permalink / raw) To: qemu-devel; +Cc: mst The subsection already exists in one well-known enterprise Linux distribution, but for some strange reason the fields were swapped when forward-porting the patch to upstream. Limit headaches for said enterprise Linux distributor when the time will come to rebase their version of QEMU. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- target-i386/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-i386/machine.c b/target-i386/machine.c index 24bc373..168cab6 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), VMSTATE_END_OF_LIST() } }; -- 1.9.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:33 [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection Paolo Bonzini @ 2014-04-02 15:38 ` Michael S. Tsirkin 2014-04-05 10:17 ` Peter Maydell 2014-04-02 15:42 ` Peter Maydell 1 sibling, 1 reply; 8+ messages in thread From: Michael S. Tsirkin @ 2014-04-02 15:38 UTC (permalink / raw) To: Paolo Bonzini, Peter Maydell; +Cc: qemu-devel On Wed, Apr 02, 2014 at 05:33:02PM +0200, Paolo Bonzini wrote: > The subsection already exists in one well-known enterprise Linux > distribution, but for some strange reason the fields were swapped > when forward-porting the patch to upstream. > > Limit headaches for said enterprise Linux distributor when the > time will come to rebase their version of QEMU. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Peter could you pick this up for 2.0 please? Otherwise we will need to maintain 2.0 compatibility code which is annoying ... > --- > target-i386/machine.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 24bc373..168cab6 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { > .minimum_version_id = 1, > .minimum_version_id_old = 1, > .fields = (VMStateField []) { > - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), > + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_END_OF_LIST() > } > }; > -- > 1.9.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:38 ` Michael S. Tsirkin @ 2014-04-05 10:17 ` Peter Maydell 0 siblings, 0 replies; 8+ messages in thread From: Peter Maydell @ 2014-04-05 10:17 UTC (permalink / raw) To: Michael S. Tsirkin; +Cc: Paolo Bonzini, QEMU Developers On 2 April 2014 16:38, Michael S. Tsirkin <mst@redhat.com> wrote: > On Wed, Apr 02, 2014 at 05:33:02PM +0200, Paolo Bonzini wrote: >> The subsection already exists in one well-known enterprise Linux >> distribution, but for some strange reason the fields were swapped >> when forward-porting the patch to upstream. >> >> Limit headaches for said enterprise Linux distributor when the >> time will come to rebase their version of QEMU. >> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > Peter could you pick this up for 2.0 please? > > Otherwise we will need to maintain 2.0 > compatibility code which is annoying ... Applied to master, thanks. -- PMM ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:33 [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection Paolo Bonzini 2014-04-02 15:38 ` Michael S. Tsirkin @ 2014-04-02 15:42 ` Peter Maydell 2014-04-02 15:43 ` Paolo Bonzini 2014-04-02 15:56 ` Michael S. Tsirkin 1 sibling, 2 replies; 8+ messages in thread From: Peter Maydell @ 2014-04-02 15:42 UTC (permalink / raw) To: Paolo Bonzini; +Cc: QEMU Developers, Michael S. Tsirkin On 2 April 2014 16:33, Paolo Bonzini <pbonzini@redhat.com> wrote: > The subsection already exists in one well-known enterprise Linux > distribution, but for some strange reason the fields were swapped > when forward-porting the patch to upstream. > > Limit headaches for said enterprise Linux distributor when the > time will come to rebase their version of QEMU. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > target-i386/machine.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target-i386/machine.c b/target-i386/machine.c > index 24bc373..168cab6 100644 > --- a/target-i386/machine.c > +++ b/target-i386/machine.c > @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { > .minimum_version_id = 1, > .minimum_version_id_old = 1, > .fields = (VMStateField []) { > - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), > + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > VMSTATE_END_OF_LIST() > } Surely this is a migration compatibility break and you need to bump the version fields here? thanks -- PMM ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:42 ` Peter Maydell @ 2014-04-02 15:43 ` Paolo Bonzini 2014-04-02 15:56 ` Michael S. Tsirkin 1 sibling, 0 replies; 8+ messages in thread From: Paolo Bonzini @ 2014-04-02 15:43 UTC (permalink / raw) To: Peter Maydell; +Cc: QEMU Developers, Michael S. Tsirkin Il 02/04/2014 17:42, Peter Maydell ha scritto: > On 2 April 2014 16:33, Paolo Bonzini <pbonzini@redhat.com> wrote: >> The subsection already exists in one well-known enterprise Linux >> distribution, but for some strange reason the fields were swapped >> when forward-porting the patch to upstream. >> >> Limit headaches for said enterprise Linux distributor when the >> time will come to rebase their version of QEMU. >> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >> --- >> target-i386/machine.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/target-i386/machine.c b/target-i386/machine.c >> index 24bc373..168cab6 100644 >> --- a/target-i386/machine.c >> +++ b/target-i386/machine.c >> @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { >> .minimum_version_id = 1, >> .minimum_version_id_old = 1, >> .fields = (VMStateField []) { >> - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), >> VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), >> + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), >> VMSTATE_END_OF_LIST() >> } > > Surely this is a migration compatibility break and you need to bump > the version fields here? No, it was introduced in 2.0 so we're still in time. Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:42 ` Peter Maydell 2014-04-02 15:43 ` Paolo Bonzini @ 2014-04-02 15:56 ` Michael S. Tsirkin 2014-04-02 16:10 ` Andreas Färber 1 sibling, 1 reply; 8+ messages in thread From: Michael S. Tsirkin @ 2014-04-02 15:56 UTC (permalink / raw) To: Peter Maydell; +Cc: Paolo Bonzini, QEMU Developers On Wed, Apr 02, 2014 at 04:42:08PM +0100, Peter Maydell wrote: > On 2 April 2014 16:33, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The subsection already exists in one well-known enterprise Linux > > distribution, but for some strange reason the fields were swapped > > when forward-porting the patch to upstream. > > > > Limit headaches for said enterprise Linux distributor when the > > time will come to rebase their version of QEMU. > > > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > > --- > > target-i386/machine.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/target-i386/machine.c b/target-i386/machine.c > > index 24bc373..168cab6 100644 > > --- a/target-i386/machine.c > > +++ b/target-i386/machine.c > > @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { > > .minimum_version_id = 1, > > .minimum_version_id_old = 1, > > .fields = (VMStateField []) { > > - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > > VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), > > + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), > > VMSTATE_END_OF_LIST() > > } > > Surely this is a migration compatibility break and you need to bump > the version fields here? > > thanks > -- PMM Not if we fix it before we put out 2.0. ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 15:56 ` Michael S. Tsirkin @ 2014-04-02 16:10 ` Andreas Färber 2014-04-02 16:17 ` Paolo Bonzini 0 siblings, 1 reply; 8+ messages in thread From: Andreas Färber @ 2014-04-02 16:10 UTC (permalink / raw) To: Michael S. Tsirkin; +Cc: Peter Maydell, QEMU Developers, Paolo Bonzini Am 02.04.2014 17:56, schrieb Michael S. Tsirkin: > On Wed, Apr 02, 2014 at 04:42:08PM +0100, Peter Maydell wrote: >> On 2 April 2014 16:33, Paolo Bonzini <pbonzini@redhat.com> wrote: >>> The subsection already exists in one well-known enterprise Linux >>> distribution, but for some strange reason the fields were swapped >>> when forward-porting the patch to upstream. >>> >>> Limit headaches for said enterprise Linux distributor when the >>> time will come to rebase their version of QEMU. >>> >>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> >>> --- >>> target-i386/machine.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/target-i386/machine.c b/target-i386/machine.c >>> index 24bc373..168cab6 100644 >>> --- a/target-i386/machine.c >>> +++ b/target-i386/machine.c >>> @@ -569,8 +569,8 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { >>> .minimum_version_id = 1, >>> .minimum_version_id_old = 1, >>> .fields = (VMStateField []) { >>> - VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), >>> VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), >>> + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), >>> VMSTATE_END_OF_LIST() >>> } >> >> Surely this is a migration compatibility break and you need to bump >> the version fields here? >> >> thanks >> -- PMM > > Not if we fix it before we put out 2.0. Is the version_id important for that enterprise distribution? We usually didn't make this depend on the release but on individual changes, so PMM has a point. If someone did a savevm on master and after this patch tries to loadvm it, maybe nothing bad happens in this case but something we could easily prevent. Regards, Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection 2014-04-02 16:10 ` Andreas Färber @ 2014-04-02 16:17 ` Paolo Bonzini 0 siblings, 0 replies; 8+ messages in thread From: Paolo Bonzini @ 2014-04-02 16:17 UTC (permalink / raw) To: Andreas Färber, Michael S. Tsirkin; +Cc: Peter Maydell, QEMU Developers Il 02/04/2014 18:10, Andreas Färber ha scritto: > Is the version_id important for that enterprise distribution? > > We usually didn't make this depend on the release but on individual > changes, so PMM has a point. If someone did a savevm on master and after > this patch tries to loadvm it, maybe nothing bad happens in this case > but something we could easily prevent. In this case most likely they don't have the subsection (it's only there if you use "-cpu foo,hv_something"). A more likely source of breakage if you do savevm on master is that the machine type changed between the time of the savevm and the time of the release. We obviously do not guarantee that between releases. Paolo ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-04-05 10:18 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-04-02 15:33 [Qemu-devel] [PATCH for-2.0] target-i386: reorder fields in cpu/msr_hyperv_hypercall subsection Paolo Bonzini 2014-04-02 15:38 ` Michael S. Tsirkin 2014-04-05 10:17 ` Peter Maydell 2014-04-02 15:42 ` Peter Maydell 2014-04-02 15:43 ` Paolo Bonzini 2014-04-02 15:56 ` Michael S. Tsirkin 2014-04-02 16:10 ` Andreas Färber 2014-04-02 16:17 ` Paolo Bonzini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).