[Qemu-commits] [qemu/qemu] d1048b: -machine vmport=auto: Fix handling of VMWare iopor...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d1048bef9df0aacde9a54bf9b5b97a6e10950d8c
      
https://github.com/qemu/qemu/commit/d1048bef9df0aacde9a54bf9b5b97a6e10950d8c
  Author: Don Slutz <address@hidden>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h
    M qapi/common.json
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  -machine vmport=auto: Fix handling of VMWare ioport emulation for xen

c/s 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4

or

c/s b154537ad07598377ebf98252fb7d2aff127983b

moved the testing of xen_enabled() from pc_init1() to
pc_machine_initfn().

xen_enabled() does not return the correct value in
pc_machine_initfn().

Changed vmport from a bool to an enum.  Added the value "auto" to do
the old way.  Move check of xen_enabled() back to pc_init1().

Acked-by: Eric Blake <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Don Slutz <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f3b3766899fc0a79a175a5d29d0ff427327cd34a
      
https://github.com/qemu/qemu/commit/f3b3766899fc0a79a175a5d29d0ff427327cd34a
  Author: Gonglei <address@hidden>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: fix boot order bug when dynamically modified via QOM

When we dynamically modify boot order, the length of
boot order will be changed, but we don't update
s->files->f[i].size with new length. This casuse
seabios read a wrong vale of qemu cfg file about
bootorder.

Cc: Gerd Hoffmann <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: dc622deb2d49aac6afa485f9025be8fed440ef3d
      
https://github.com/qemu/qemu/commit/dc622deb2d49aac6afa485f9025be8fed440ef3d
  Author: Christian Borntraeger <address@hidden>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Fix compile error

commit a2b257d6212a "memory: expose alignment used for allocating RAM
as MemoryRegion API" triggered a compile error on KVM/s390x.

Fix the prototype and the implementation of legacy_s390_alloc.

Cc: Igor Mammedov <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3ef4ebcc5c0360629bb05f49d9b961774247d6ca
      
https://github.com/qemu/qemu/commit/3ef4ebcc5c0360629bb05f49d9b961774247d6ca
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/nvram/fw_cfg.c
    M include/hw/i386/pc.h
    M qapi/common.json
    M qemu-options.hx
    M target-s390x/kvm.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

The final 2.2 patches from me.

# gpg: Signature made Wed 26 Nov 2014 11:12:25 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  s390x/kvm: Fix compile error
  fw_cfg: fix boot order bug when dynamically modified via QOM
  -machine vmport=auto: Fix handling of VMWare ioport emulation for xen

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/2528043f1f29...3ef4ebcc5c03