[Qemu-devel] [PULL 0/1] PC compat bug fix for v2.12

[Qemu-devel] [PULL 0/1] PC compat bug fix for v2.12

[Eduardo Habkost]

Dropped all the other commits from machine-next and kept only the
bug fix below.

The following changes since commit 2bb39a657abeac3f33ab3298177fb27c35f5b50a:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180316' into staging (2018-03-16 17:25:33 +0000)

are available in the Git repository at:

  git://github.com/ehabkost/qemu.git tags/machine-next-pull-request

for you to fetch changes up to 0ab126f165b04cce4a6e641d6bfce2ffd8a7cf62:

  pc: correct misspelled CPU model-id for pc 2.2 (2018-03-16 16:29:07 -0300)

----------------------------------------------------------------
PC compat bug fix for 2.12

----------------------------------------------------------------

Queue for Machine Core patches


Wang Xin (1):
  pc: correct misspelled CPU model-id for pc 2.2

 include/hw/i386/pc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.14.3

[Qemu-devel] [PULL 1/1] pc: correct misspelled CPU model-id for pc 2.2

[Eduardo Habkost]

From: Wang Xin <wangxinxin.wang@huawei.com>

Signed-off-by: Wang Xin <wangxinxin.wang@huawei.com>
Message-Id: <1517367668-25048-1-git-send-email-wangxinxin.wang@huawei.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 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 6598d571a0..ffee8413f0 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -601,7 +601,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *);
 
 #define PC_COMPAT_2_2 \
     HW_COMPAT_2_2 \
-    PC_CPU_MODEL_IDS("2.3.0") \
+    PC_CPU_MODEL_IDS("2.2.0") \
     {\
         .driver = "kvm64" "-" TYPE_X86_CPU,\
         .property = "vme",\
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/1] PC compat bug fix for v2.12

[Peter Maydell]

On 16 March 2018 at 19:33, Eduardo Habkost <ehabkost@redhat.com> wrote:
> Dropped all the other commits from machine-next and kept only the
> bug fix below.
>
> The following changes since commit 2bb39a657abeac3f33ab3298177fb27c35f5b50a:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20180316' into staging (2018-03-16 17:25:33 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/ehabkost/qemu.git tags/machine-next-pull-request
>
> for you to fetch changes up to 0ab126f165b04cce4a6e641d6bfce2ffd8a7cf62:
>
>   pc: correct misspelled CPU model-id for pc 2.2 (2018-03-16 16:29:07 -0300)
>
> ----------------------------------------------------------------
> PC compat bug fix for 2.12
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM