qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 44f192: iscsi: Remove pointless runtime check


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 44f192: iscsi: Remove pointless runtime check of macro val...
Date: Thu, 04 Jun 2015 06:30:07 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 44f192f364b71683379e104157b15b0685d24394
      
https://github.com/qemu/qemu/commit/44f192f364b71683379e104157b15b0685d24394
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: Remove pointless runtime check of macro value

raw_bsd already has QEMU_BUILD_BUG_ON(BDRV_SECTOR_SIZE != 512), so iscsi
should relax.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: a2f533da00f7278788afcf10f325f636805077dc
      
https://github.com/qemu/qemu/commit/a2f533da00f7278788afcf10f325f636805077dc
  Author: Peter Crosthwaite <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M target-microblaze/cpu.h

  Log Message:
  -----------
  microblaze: cpu: Delete MMAP_SHIFT definition

Just fallback on the default of 12 like other architectures. This
allows changing the system-mode-affecting definition of
TARGET_PAGE_BITS without affecting microblaze linux-user.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: b8981dc9aae25fa79e5f35609e63f50f078a572d
      
https://github.com/qemu/qemu/commit/b8981dc9aae25fa79e5f35609e63f50f078a572d
  Author: Peter Krempa <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  util: socket: Add missing localaddr and localport option for DGRAM socket

The 'socket_optslist' structure does not contain the 'localaddr' and
'localport' options that are parsed in case you are creating a
'connect' type UDP character device.

I've noticed it happening after commit f43e47dbf6de24db20ec9b588bb6cc762
made qemu abort() after seeing the invalid option.

A minimal reproducer for the case is:
$ qemu-system-x86_64 -chardev 
udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234
qemu-system-x86_64: -chardev 
udp,id=charrng0,host=127.0.0.1,port=1234,localaddr=,localport=1234: Invalid 
parameter 'localaddr'
Aborted (core dumped)

Prior to the commit mentioned above the error would be printed but the
value for localaddr and localport was simply ignored. I did not go
through the code to find out when it was broken.

Add the two fields so that the options can again be parsed correctly and
qemu doesn't abort().

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1220252

Signed-off-by: Peter Krempa <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 5708b2b736ebec6e3af04b9b249faadf896791cd
      
https://github.com/qemu/qemu/commit/5708b2b736ebec6e3af04b9b249faadf896791cd
  Author: Chen Hanxiao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M docs/writing-qmp-commands.txt

  Log Message:
  -----------
  docs/writing-qmp-commands: fix a typo

s/interation/iteration

Signed-off-by: Chen Hanxiao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2ba154cf4eb8636cdd3aa90f392ca9e77206ca39
      
https://github.com/qemu/qemu/commit/2ba154cf4eb8636cdd3aa90f392ca9e77206ca39
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  hw/i386/pc_piix: Fix memory leak

valgrind complains about:
==16447== 8 bytes in 1 blocks are definitely lost in loss record 552 of 3,310
==16447==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==16447==    by 0x36FB47: qemu_extend_irqs (irq.c:55)
==16447==    by 0x36FBD3: qemu_allocate_irqs (irq.c:64)
==16447==    by 0x24E622: pc_init1 (pc_piix.c:287)
==16447==    by 0x24E76A: pc_init_pci (pc_piix.c:310)
==16447==    by 0x2E9360: main (vl.c:4226)

==16447== 128 bytes in 1 blocks are definitely lost in loss record 2,569 of 
3,310
==16447==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==16447==    by 0x36FB47: qemu_extend_irqs (irq.c:55)
==16447==    by 0x36FBD3: qemu_allocate_irqs (irq.c:64)
==16447==    by 0x25BEB2: kvm_i8259_init (i8259.c:133)
==16447==    by 0x24E1F1: pc_init1 (pc_piix.c:219)
==16447==    by 0x24E76A: pc_init_pci (pc_piix.c:310)
==16447==    by 0x2E9360: main (vl.c:4226)

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 6e38a4ba7889083b65729db2144cdbcefbaa303a
      
https://github.com/qemu/qemu/commit/6e38a4ba7889083b65729db2144cdbcefbaa303a
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/ide/pci.c

  Log Message:
  -----------
  hw/ide/pci: Fix memory leak

valgrind complains about:
==16447== 16 bytes in 2 blocks are definitely lost in loss record 1,304 of 3,310
==16447==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==16447==    by 0x36FB47: qemu_extend_irqs (irq.c:55)
==16447==    by 0x36FBD3: qemu_allocate_irqs (irq.c:64)
==16447==    by 0x3B4B44: bmdma_init (pci.c:464)
==16447==    by 0x3B547B: pci_piix_init_ports (piix.c:144)
==16447==    by 0x3B55D2: pci_piix_ide_realize (piix.c:164)
==16447==    by 0x3EAEC6: pci_qdev_realize (pci.c:1790)
==16447==    by 0x36C685: device_set_realized (qdev.c:1058)
==16447==    by 0x47179E: property_set_bool (object.c:1514)
==16447==    by 0x470098: object_property_set (object.c:837)

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d370dfa9f3703cf0af07d96d50ed567413e8ec65
      
https://github.com/qemu/qemu/commit/d370dfa9f3703cf0af07d96d50ed567413e8ec65
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  hw/i386/acpi-build: decref after use

valgrind complains about:
==16447== 48 bytes in 2 blocks are definitely lost in loss record 2,033 of 3,310
==16447==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==16447==    by 0x2E4FD7: malloc_and_trace (vl.c:2546)
==16447==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==16447==    by 0x53EC3F: qint_from_int (qint.c:33)
==16447==    by 0x53B426: qmp_output_type_int (qmp-output-visitor.c:162)
==16447==    by 0x539257: visit_type_uint32 (qapi-visit-core.c:147)
==16447==    by 0x471D07: property_get_uint32_ptr (object.c:1651)
==16447==    by 0x47000C: object_property_get (object.c:822)
==16447==    by 0x472428: object_property_get_qobject (qom-qobject.c:37)
==16447==    by 0x25701A: build_append_pci_bus_devices (acpi-build.c:520)
==16447==    by 0x25902E: build_ssdt (acpi-build.c:1004)
==16447==    by 0x25A0A8: acpi_build (acpi-build.c:1420)

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7df057bac3734ee3c2c052fd0807479602ab5583
      
https://github.com/qemu/qemu/commit/7df057bac3734ee3c2c052fd0807479602ab5583
  Author: Peter Crosthwaite <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M Makefile.objs
    M Makefile.target
    M device_tree.c

  Log Message:
  -----------
  device-tree: Make a common-obj

There is no reason for device tree API to be built per-target.
common-obj it. There is an extraneous inclusion of config.h that
needs to be removed.

Cc: Alexander Graf <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: bd4baf6eebff75c7e0c67a729d1bdb5b0b36fe72
      
https://github.com/qemu/qemu/commit/bd4baf6eebff75c7e0c67a729d1bdb5b0b36fe72
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: fix memory leak spotted by valgrind

valgrind complains about:
==9276== 13 bytes in 1 blocks are definitely lost in loss record 1,046 of 3,673
==9276==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==9276==    by 0x2EAFBB: malloc_and_trace (vl.c:2556)
==9276==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==9276==    by 0x4A28BD: addr_to_string (vnc.c:123)
==9276==    by 0x4A29AD: vnc_socket_local_addr (vnc.c:139)
==9276==    by 0x4A9AFE: vnc_display_local_addr (vnc.c:3240)
==9276==    by 0x2EF4FE: main (vl.c:4321)

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: c18f855697ab6b64a895f37cf47fd7061ce9e798
      
https://github.com/qemu/qemu/commit/c18f855697ab6b64a895f37cf47fd7061ce9e798
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/alpha/dp264.c

  Log Message:
  -----------
  hw/alpha/dp264.c: Fix memory leak spotted by valgrind

valgrind complains about:
==7055== 58 bytes in 1 blocks are definitely lost in loss record 1,471 of 2,192
==7055==    at 0x4C2845D: malloc (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==7055==    by 0x24410F: malloc_and_trace (vl.c:2556)
==7055==    by 0x64C770E: g_malloc (in /usr/lib64/libglib-2.0.so.0.3600.3)
==7055==    by 0x64DEFD7: g_strndup (in /usr/lib64/libglib-2.0.so.0.3600.3)
==7055==    by 0x650181A: g_vasprintf (in /usr/lib64/libglib-2.0.so.0.3600.3)
==7055==    by 0x64DF0CC: g_strdup_vprintf (in 
/usr/lib64/libglib-2.0.so.0.3600.3)
==7055==    by 0x64DF188: g_strdup_printf (in 
/usr/lib64/libglib-2.0.so.0.3600.3)
==7055==    by 0x242F81: qemu_find_file (vl.c:2121)
==7055==    by 0x217A32: clipper_init (dp264.c:105)
==7055==    by 0x2484DA: main (vl.c:4249)

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f19377bf234a3359b0a03844822e97de80ad4f30
      
https://github.com/qemu/qemu/commit/f19377bf234a3359b0a03844822e97de80ad4f30
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/ppc/e500.c

  Log Message:
  -----------
  hw/ppc/e500.c: Fix memory leak

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 9f9b026dc60398224fb035eb27ae0ed083d2d66f
      
https://github.com/qemu/qemu/commit/9f9b026dc60398224fb035eb27ae0ed083d2d66f
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/arm/omap_sx1.c

  Log Message:
  -----------
  hw/arm/omap_sx1.c: Fix memory leak spotted by valgrind

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 9ff7f5bddbe5814bafe5e798d2cf1087b58dc7b6
      
https://github.com/qemu/qemu/commit/9ff7f5bddbe5814bafe5e798d2cf1087b58dc7b6
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/intc/exynos4210_gic.c

  Log Message:
  -----------
  hw/intc/exynos4210_gic.c: Fix memory leak by adjusting order

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 0b0cc076b78976b30360dd7c6ed994f864424779
      
https://github.com/qemu/qemu/commit/0b0cc076b78976b30360dd7c6ed994f864424779
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  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

  Log Message:
  -----------
  hw/i386/pc: Fix misusing qemu_allocate_irqs for single irq

Since pc_allocate_cpu_irq only requests one irq, so let it just call
qemu_allocate_irq.

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: aff0d5e57a71260885d54c07cef5f4a486c8336b
      
https://github.com/qemu/qemu/commit/aff0d5e57a71260885d54c07cef5f4a486c8336b
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/isa/lpc_ich9.c

  Log Message:
  -----------
  hw/isa/lpc_ich9.c: Fix misusing qemu_allocate_irqs for single irq

Since ich9_lpc_pm_init only requests one irq, so let it just call
qemu_allocate_irq.

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 5105505e65ba6bc3e1dc549bcd0d1d33f3546e60
      
https://github.com/qemu/qemu/commit/5105505e65ba6bc3e1dc549bcd0d1d33f3546e60
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/isa/i82378.c

  Log Message:
  -----------
  hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: b64127244d669c33a4ffdcc47e076559497785af
      
https://github.com/qemu/qemu/commit/b64127244d669c33a4ffdcc47e076559497785af
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/timer/arm_timer.c

  Log Message:
  -----------
  hw/timer/arm_timer.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: ca43b97b5f6fa57e79adc7f167b12d3e0545c7e1
      
https://github.com/qemu/qemu/commit/ca43b97b5f6fa57e79adc7f167b12d3e0545c7e1
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: aaaee0b273082ee2836dcc2f61a878ee291a8d9b
      
https://github.com/qemu/qemu/commit/aaaee0b273082ee2836dcc2f61a878ee291a8d9b
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/ppc/prep.c

  Log Message:
  -----------
  hw/ppc/prep.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d4ef00af2598fef06affbd42608e570237a7b276
      
https://github.com/qemu/qemu/commit/d4ef00af2598fef06affbd42608e570237a7b276
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/lm32/lm32_boards.c

  Log Message:
  -----------
  hw/lm32/lm32_boards.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: a9c8a0d8d4217754648decc5921e4b0fcd00ce7f
      
https://github.com/qemu/qemu/commit/a9c8a0d8d4217754648decc5921e4b0fcd00ce7f
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/lm32/milkymist.c

  Log Message:
  -----------
  hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2c85fad022a5c23b835d7c78b653763ae1e3f6eb
      
https://github.com/qemu/qemu/commit/2c85fad022a5c23b835d7c78b653763ae1e3f6eb
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/unicore32/puv3.c

  Log Message:
  -----------
  hw/unicore32/puv3.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 5429273615e7b412402a7b22738737c09ab9f488
      
https://github.com/qemu/qemu/commit/5429273615e7b412402a7b22738737c09ab9f488
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/alpha/typhoon.c

  Log Message:
  -----------
  hw/alpha/typhoon.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 294972ce546107f2215b3b162994b47f08aab7a4
      
https://github.com/qemu/qemu/commit/294972ce546107f2215b3b162994b47f08aab7a4
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/arm/nseries.c

  Log Message:
  -----------
  hw/arm/nseries.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 26c8acb3f326166bf9dc60c3e8184f4b862e8451
      
https://github.com/qemu/qemu/commit/26c8acb3f326166bf9dc60c3e8184f4b862e8451
  Author: Shannon Zhao <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/display/tc6393xb.c

  Log Message:
  -----------
  hw/display/tc6393xb.c: Fix misusing qemu_allocate_irqs for single irq

Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 1597051b84b816c9608e1ee0947f8e6dc9876b56
      
https://github.com/qemu/qemu/commit/1597051b84b816c9608e1ee0947f8e6dc9876b56
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  Add -incoming help text

The help/man text for

-incoming defer

didn't make it through the merge of the code that implemented it.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: b6b099541d6cf3c50b0fb5af916fff0db6508805
      
https://github.com/qemu/qemu/commit/b6b099541d6cf3c50b0fb5af916fff0db6508805
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M translate-all.h

  Log Message:
  -----------
  translate-all: delete prototype for non-existent function

Missed in commit 3a808cc40

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 8b8f1c7e9ddb2e88a144638f6527bf70e32343e3
      
https://github.com/qemu/qemu/commit/8b8f1c7e9ddb2e88a144638f6527bf70e32343e3
  Author: Michael Tokarev <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  slirp: use less predictable directory name in /tmp for smb config 
(CVE-2015-4037)

In this version I used mkdtemp(3) which is:
   _BSD_SOURCE
  || /* Since glibc 2.10: */
      (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)

(POSIX.1-2008), so should be available on systems we care about.

While at it, reset the resulting directory name within smb structure
on error so cleanup function wont try to remove directory which we
failed to create.

Signed-off-by: Michael Tokarev <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: 2801339f2fb2534ccf01561d274398328bdd446d
      
https://github.com/qemu/qemu/commit/2801339f2fb2534ccf01561d274398328bdd446d
  Author: Sai Pavan Boddu <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  cadence_gem: Fix Rx buffer size field mask

This patch corrects the Rx buffer size field mask to mask bits 23 to 16
to match Xilinx UG585 documentation.

Signed-off-by: Sai Pavan Boddu <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: de3852877f1e452321352fdb7e678f079876a41b
      
https://github.com/qemu/qemu/commit/de3852877f1e452321352fdb7e678f079876a41b
  Author: Alex Bennée <address@hidden>
  Date:   2015-06-03 (Wed, 03 Jun 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: postfix --extra-cflags to QEMU_CFLAGS

It makes sense that extra-cflags should be appended after the normal
CFLAGS so they don't get overridden by default behaviour. This way if
you specify something like:

  ./configure --extra-cflags="-O0"

You will see the requested behaviour.

Signed-off-by: Alex Bennée <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 2700a976dba6b107365aa9af7fd927ffb3dd3b21
      
https://github.com/qemu/qemu/commit/2700a976dba6b107365aa9af7fd927ffb3dd3b21
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M Makefile.objs
    M Makefile.target
    M block/iscsi.c
    M configure
    M device_tree.c
    M docs/writing-qmp-commands.txt
    M hw/alpha/dp264.c
    M hw/alpha/typhoon.c
    M hw/arm/nseries.c
    M hw/arm/omap_sx1.c
    M hw/display/tc6393xb.c
    M hw/i386/acpi-build.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ide/pci.c
    M hw/intc/exynos4210_gic.c
    M hw/isa/i82378.c
    M hw/isa/lpc_ich9.c
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c
    M hw/net/cadence_gem.c
    M hw/ppc/e500.c
    M hw/ppc/prep.c
    M hw/sparc/sun4m.c
    M hw/timer/arm_timer.c
    M hw/unicore32/puv3.c
    M include/hw/i386/pc.h
    M net/slirp.c
    M qemu-options.hx
    M target-microblaze/cpu.h
    M translate-all.h
    M util/qemu-sockets.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/mjt/tags/pull-trivial-patches-2015-06-03' into staging

trivial patches for 2015-06-03

# gpg: Signature made Wed Jun  3 14:07:47 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"

* remotes/mjt/tags/pull-trivial-patches-2015-06-03: (30 commits)
  configure: postfix --extra-cflags to QEMU_CFLAGS
  cadence_gem: Fix Rx buffer size field mask
  slirp: use less predictable directory name in /tmp for smb config 
(CVE-2015-4037)
  translate-all: delete prototype for non-existent function
  Add -incoming help text
  hw/display/tc6393xb.c: Fix misusing qemu_allocate_irqs for single irq
  hw/arm/nseries.c: Fix misusing qemu_allocate_irqs for single irq
  hw/alpha/typhoon.c: Fix misusing qemu_allocate_irqs for single irq
  hw/unicore32/puv3.c: Fix misusing qemu_allocate_irqs for single irq
  hw/lm32/milkymist.c: Fix misusing qemu_allocate_irqs for single irq
  hw/lm32/lm32_boards.c: Fix misusing qemu_allocate_irqs for single irq
  hw/ppc/prep.c: Fix misusing qemu_allocate_irqs for single irq
  hw/sparc/sun4m.c: Fix misusing qemu_allocate_irqs for single irq
  hw/timer/arm_timer.c: Fix misusing qemu_allocate_irqs for single irq
  hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq
  hw/isa/lpc_ich9.c: Fix misusing qemu_allocate_irqs for single irq
  hw/i386/pc: Fix misusing qemu_allocate_irqs for single irq
  hw/intc/exynos4210_gic.c: Fix memory leak by adjusting order
  hw/arm/omap_sx1.c: Fix memory leak spotted by valgrind
  hw/ppc/e500.c: Fix memory leak
  ...

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


Compare: https://github.com/qemu/qemu/compare/6fa6b312765f...2700a976dba6

reply via email to

[Prev in Thread] Current Thread [Next in Thread]