[Qemu-commits] [qemu/qemu] 4ec6ee: pc: fix qemu exiting with error when -m X < 128 wi...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4ec6ee5acef8092ec64e183694aba2a1cfce8d80
      
https://github.com/qemu/qemu/commit/4ec6ee5acef8092ec64e183694aba2a1cfce8d80
  Author: Igor Mammedov <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  pc: fix qemu exiting with error when -m X < 128 with old machines types

If machine doesn't support memory hotplug then staring QEMU
with initial memory less than default will make QEMU exit with
following error message:

$QEMU -m 16  -M isapc
qemu-system-i386: "-memory 'slots|maxmem'" is not supported by: isapc

Set maxram_size to initial memory value before parsing
'maxmem' option allows to keep maxmem in sync with initial
memory size if no maxmem option was specified.

Signed-off-by: Igor Mammedov <address@hidden>
CC: Bruce Rogers <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: faab4597973573852bbddadef21c9e788ce732b3
      
https://github.com/qemu/qemu/commit/faab4597973573852bbddadef21c9e788ce732b3
  Author: Eduardo Habkost <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123]

pc-0.13 and older were missing some compat code that was present on
newer machine-types:

* x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
  (pc-i440fx-1.7 and older)
  (added by commit ef02ef5f4536dba090b12360a6c862ef0e57e3bc)
* x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
  (pc-i440fx-1.4 and older)
  (added by commit 4458c23672904fa131e69897007eeb7c953be7e5
* x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);
  (pc-i440fx-1.4 and older)
  (added by commit 56383703c060777fd01aaf8d63d5f46d660e9fb9)

Instead of duplicating the code from the previous pc_compat_*()
functions, we can now reuse pc_compat_1_2() and fix those issues.

Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 75902802c26267b7d1d6948d81c907e2432f0a94
      
https://github.com/qemu/qemu/commit/75902802c26267b7d1d6948d81c907e2432f0a94
  Author: Hu Tao <address@hidden>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M hw/acpi/ich9.c

  Log Message:
  -----------
  fix typo: apci -> acpi

Signed-off-by: Hu Tao <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>

MST: rebase


  Commit: 0e3cd8334aa800b947e2511720a8dcb792f68871
      
https://github.com/qemu/qemu/commit/0e3cd8334aa800b947e2511720a8dcb792f68871
  Author: Nikolay Nikolaev <address@hidden>
  Date:   2014-07-14 (Mon, 14 Jul 2014)

  Changed paths:
    M tests/vhost-user-test.c

  Log Message:
  -----------
  qtest: fix vhost-user-test compilation with old GLib

Mising G_TIME_SPAN_SECOND definition breaks the RHEL6 compilation as GLib
version before 2.26 does not have it. In such case just define it.

Reported-by: Kevin Wolf <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f69a28051f856e906bd9c2f9f27b3106a47e18f6
      
https://github.com/qemu/qemu/commit/f69a28051f856e906bd9c2f9f27b3106a47e18f6
  Author: Nikolay Nikolaev <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/virtio/vhost-user.c

  Log Message:
  -----------
  vhost-user: Fix VHOST_SET_MEM_TABLE processing

qemu_get_ram_fd doesn't accept a guest physical address. ram_addr_t are
opaque values that are assigned in qemu_ram_alloc.

Find the ram_addr_t corresponding to the userspace_addr using 
qemu_ram_addr_from_host,
and then call qemu_get_ram_fd on it.

Thanks to Paolo Bonzini <address@hidden>

Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: d6970e3b004a5b339abfe8adb0d70585dc8b7d6d
      
https://github.com/qemu/qemu/commit/d6970e3b004a5b339abfe8adb0d70585dc8b7d6d
  Author: Nikolay Nikolaev <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M tests/vhost-user-test.c

  Log Message:
  -----------
  qtest: Adapt vhost-user-test to latest vhost-user changes

A new field mmap_offset was added in the vhost-user message, we need to reflect
this change in the test too.

Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: cd98639f673d92836b6b5fd60279b411748f2f1e
      
https://github.com/qemu/qemu/commit/cd98639f673d92836b6b5fd60279b411748f2f1e
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/virtio/vhost-user.c

  Log Message:
  -----------
  vhost-user: minor cleanups

assert to verify cast does not discard information
minor style fixup.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4d121a549869b93475ccf8b9a0d3e693011d1abb
      
https://github.com/qemu/qemu/commit/4d121a549869b93475ccf8b9a0d3e693011d1abb
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/acpi/ich9.c
    M hw/i386/pc_piix.c
    M hw/virtio/vhost-user.c
    M tests/vhost-user-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

pc,vhost,test fixes

Minor bugfixes all over the place.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Fri 18 Jul 2014 00:43:04 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  vhost-user: minor cleanups
  qtest: Adapt vhost-user-test to latest vhost-user changes
  vhost-user: Fix VHOST_SET_MEM_TABLE processing
  qtest: fix vhost-user-test compilation with old GLib
  fix typo: apci -> acpi
  pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123]
  pc: fix qemu exiting with error when -m X < 128 with old machines types

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


Compare: https://github.com/qemu/qemu/compare/5734d031aa2f...4d121a549869