[Qemu-commits] [qemu/qemu] 6b2699: hostmem: Fix qemu_opt_get_bool() crash in host_mem...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6b2699672d5b56f8c2902fb9db9879e8cafb2afe
      
https://github.com/qemu/qemu/commit/6b2699672d5b56f8c2902fb9db9879e8cafb2afe
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-07-22 (Wed, 22 Jul 2015)

  Changed paths:
    M backends/hostmem.c

  Log Message:
  -----------
  hostmem: Fix qemu_opt_get_bool() crash in host_memory_backend_init()

This fixes the following crash, introduced by commit
49d2e648e8087d154d8bf8b91f27c8e05e79d5a6:

  $ gdb --args qemu-system-x86_64 -machine pc,mem-merge=off -object 
memory-backend-ram,id=ram-node0,size=1024
  [...]
  Program received signal SIGABRT, Aborted.
  (gdb) bt
  #0  0x00007ffff253b8c7 in raise () at /lib64/libc.so.6
  #1  0x00007ffff253d52a in abort () at /lib64/libc.so.6
  #2  0x00007ffff253446d in __assert_fail_base () at /lib64/libc.so.6
  #3  0x00007ffff2534522 in  () at /lib64/libc.so.6
  #4  0x00005555558bb80a in qemu_opt_get_bool_helper (opts=0x55555621b650, 
address@hidden "mem-merge", address@hidden, address@hidden) at 
qemu/util/qemu-option.c:388
  #5  0x00005555558bbb5a in qemu_opt_get_bool (opts=<optimized out>, 
address@hidden "mem-merge", address@hidden) at qemu/util/qemu-option.c:398
  #6  0x0000555555720a24 in host_memory_backend_init (obj=0x5555562ac970) at 
qemu/backends/hostmem.c:226

Instead of using qemu_opt_get_bool(), that didn't work with
qemu_machine_opts for a long time, we can use the corresponding
MachineState fields.

Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 12e21eb088a51161c78ee39ed54ac56ebcff4243
      
https://github.com/qemu/qemu/commit/12e21eb088a51161c78ee39ed54ac56ebcff4243
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-23 (Thu, 23 Jul 2015)

  Changed paths:
    M backends/hostmem.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into 
staging

NUMA queue, 2015-07-22

# gpg: Signature made Wed Jul 22 19:11:04 2015 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <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: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/numa-pull-request:
  hostmem: Fix qemu_opt_get_bool() crash in host_memory_backend_init()

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


Compare: https://github.com/qemu/qemu/compare/b69b30532e0a...12e21eb088a5