Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 8 March 2018 at 07:47, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here are a couple of last-minute fixes for SPARC. Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit f32408f3b472a088467474ab152be3b6285b2d7b:
>
>   misc: don't use hwaddr as a type in trace events (2018-03-06 14:24:30 +)
>
> are available in the git repository at:
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to 6e10f37c86068e35151f982c976a85f1bec07ef2:
>
>   sparc: fix leon3 casa instruction when MMU is disabled (2018-03-08 07:22:03 
> +)
>
> 
> qemu-sparc update
>
> 
> KONRAD Frederic (1):
>   sparc: fix leon3 casa instruction when MMU is disabled
>
> Thomas Huth (1):
>   hw/sparc/sun4m: Fix implicit creation of "-drive if=scsi" devices
>
>  hw/sparc/sun4m.c | 1 +
>  target/sparc/translate.c | 5 +
>  2 files changed, 6 insertions(+)



Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 27 February 2018 at 19:16, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here is a pull request containing the loader fix which enables 
> qemu-system-sparc to work when
> used with -kernel again.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 3ec7b5d819da9245dd37a6f7e7d150f064cf584c:
>
>   Merge remote-tracking branch 
> 'remotes/kraxel/tags/vga-20180227-pull-request' into staging (2018-02-27 
> 14:01:19 +)
>
> are available in the git repository at:
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to ca316c11526a1bc221fb542bdce6bac7238dde69:
>
>   loader: don't perform overlapping address check for memory region ROM 
> images (2018-02-27 18:57:14 +)
>
> 
> qemu-sparc update
>
> 
> Mark Cave-Ayland (1):
>   loader: don't perform overlapping address check for memory region ROM 
> images
>
>  hw/core/loader.c | 20 +++-
>  1 file changed, 11 insertions(+), 9 deletions(-)


Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 25 January 2018 at 13:48, Mark Cave-Ayland
 wrote:
> Sorry yes, those format strings were taken from some very old code so I
> should have paid a bit more attention.
>
> I've fixed up these events and re-pushed the qemu-sparc-signed tag to github
> which should resolve the issue.

Thanks, applied the updated version.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Mark Cave-Ayland]

On 25/01/18 12:51, Peter Maydell wrote:


On 24 January 2018 at 19:58, Mark Cave-Ayland
 wrote:

Hi Peter,

Here are the latest updates for SPARC. Please pull.


ATB,

Mark.


The following changes since commit 52483b067cce4a88ffbf8fbeea26de7549d2ad23:

   Merge remote-tracking branch 'remotes/huth/tags/pull-request-2018-01-22' 
into staging (2018-01-23 10:15:09 +)

are available in the git repository at:

   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed

for you to fetch changes up to 9a323c89102f741e3a91a42906c26186a43f379e:

   sun4u: implement power device (2018-01-24 19:46:10 +)


qemu-sparc update



Hi; I'm afraid this has format-string issues:

In file included from hw/sparc64/trace.h:69:0,
  from hw/sparc64/trace.c:4:
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_count':
hw/sparc64/trace.h:466:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_set_count " "%s
set_count count=0x%016lx (npt %s) p=%p" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_get_count':
hw/sparc64/trace.h:490:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_get_count " "%s
get_count count=0x%016lx (npt %s) p=%p" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_limit':
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 9 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 10 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 11 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
"%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
  qemu_log(FMT, ## __VA_ARGS__);  \
   ^

Printing uint64_t requires the PRIx64 macros.


Sorry yes, those format strings were taken from some very old code so I 
should have paid a bit more attention.


I've fixed up these events and re-pushed the qemu-sparc-signed tag to 
github which should resolve the issue.



ATB,

Mark.

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 24 January 2018 at 19:58, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here are the latest updates for SPARC. Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 52483b067cce4a88ffbf8fbeea26de7549d2ad23:
>
>   Merge remote-tracking branch 'remotes/huth/tags/pull-request-2018-01-22' 
> into staging (2018-01-23 10:15:09 +)
>
> are available in the git repository at:
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to 9a323c89102f741e3a91a42906c26186a43f379e:
>
>   sun4u: implement power device (2018-01-24 19:46:10 +)
>
> 
> qemu-sparc update
>

Hi; I'm afraid this has format-string issues:

In file included from hw/sparc64/trace.h:69:0,
 from hw/sparc64/trace.c:4:
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_count':
hw/sparc64/trace.h:466:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_set_count " "%s
set_count count=0x%016lx (npt %s) p=%p" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_get_count':
hw/sparc64/trace.h:490:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_get_count " "%s
get_count count=0x%016lx (npt %s) p=%p" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^
hw/sparc64/trace.h: In function '_nocheck__trace_sparc64_cpu_tick_set_limit':
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 6 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 9 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 10 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^
hw/sparc64/trace.h:514:23: error: format '%lx' expects argument of
type 'long unsigned int', but argument 11 has type 'uint64_t {aka long
long unsigned int}' [-Werror=format=]
   "%d@%zd.%06zd:sparc64_cpu_tick_set_limit " "%s
set_limit limit=0x%016lx (%s) p=%p called with limit=0x%016lx at
0x%016lx (delta=0x%016lx)" "\n",
   ^
/home/peter.maydell/qemu/include/qemu/log.h:94:22: note: in definition
of macro 'qemu_log_mask'
 qemu_log(FMT, ## __VA_ARGS__);  \
  ^

Printing uint64_t requires the PRIx64 macros.


thanks
-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 9 January 2018 at 22:18, Mark Cave-Ayland
 wrote:
> Thanks for the hint - while it didn't crash locally, I was certainly able to
> reproduce the above trace in valgrind.
>
> Turns out the issue was that thought I could move pci_register_bus() from
> realize to init in patch 10, but evidently not :)
>
> I've moved it back and repushed the signed tag if you can try and apply the
> PR once again?

Applied updated version, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Mark Cave-Ayland]

On 09/01/18 18:22, Peter Maydell wrote:


The following changes since commit 4124ea4f5bd367ca6412fb2dfe7ac4d80e1504d9:

   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20171229' into 
staging (2018-01-08 16:17:04 +)

are available in the git repository at:

   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed

for you to fetch changes up to 6a52624720e5abc6a1f067a7e7b8239b428e0c95:

   sun4u_iommu: add trace event for IOMMU translations (2018-01-08 19:07:55 
+)


qemu-sparc update




Hi. This seems to crash in 'make check'. One of the crashes has a
memory corruption splat:

TEST: tests/device-introspect-test... (pid=20423)
   /sparc64/device/introspect/list: OK
   /sparc64/device/introspect/list-fields:  OK
   /sparc64/device/introspect/none: OK
   /sparc64/device/introspect/abstract: OK
   /sparc64/device/introspect/concrete:
*** Error in `sparc64-softmmu/qemu-system-spar
c64': corrupted double-linked list (not small): 0x010033b823a0 ***
=== Backtrace: =
/lib64/libc.so.6(+0xb0b94)[0x3fff90ce0b94]
/lib64/libc.so.6(+0xb5b18)[0x3fff90ce5b18]
/lib64/libc.so.6(__libc_calloc-0x14b664)[0x3fff90ce9934]
/lib64/libglib-2.0.so.0(g_malloc0-0x100d54)[0x3fff97a634d4]
sparc64-softmmu/qemu-system-sparc64[0x1030a9bc]
sparc64-softmmu/qemu-system-sparc64[0x103062c8]
sparc64-softmmu/qemu-system-sparc64[0x103062a0]

Running it under valgrind with
QTEST_QEMU_BINARY='valgrind sparc64-softmmu/qemu-system-sparc64'
./tests/device-introspect-test -p /sparc64/device/introspect/concrete

gives this write-after-free:

==1931== Invalid write of size 8
==1931==at 0x55EA51: pci_host_bus_register (pci.c:331)
==1931==by 0x55ECBD: pci_bus_init (pci.c:393)
==1931==by 0x55EE18: pci_bus_new (pci.c:424)
==1931==by 0x55EEE2: pci_register_bus (pci.c:447)
==1931==by 0x55D14F: pci_pbm_init (apb.c:464)
==1931==by 0x69179B: object_init_with_type (object.c:353)
==1931==by 0x6919D0: object_initialize_with_type (object.c:384)
==1931==by 0x691E3B: object_new_with_type (object.c:492)
==1931==by 0x691E78: object_new (object.c:502)
==1931==by 0x479A3C: qmp_device_list_properties (qmp.c:537)
==1931==by 0x455479: qdev_device_help (qdev-monitor.c:279)
==1931==by 0x456C9E: qmp_device_add (qdev-monitor.c:802)
==1931==  Address 0x2ca7af08 is 1,528 bytes inside a block of size 3,312 free'd
==1931==at 0x4C2EDEB: free (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1931==by 0x691DC6: object_finalize (object.c:480)
==1931==by 0x692CBD: object_unref (object.c:911)
==1931==by 0x479B91: qmp_device_list_properties (qmp.c:572)
==1931==by 0x469EA0: qmp_marshal_device_list_properties (qmp-marshal.c:1393)
==1931==by 0x7A25D2: do_qmp_dispatch (qmp-dispatch.c:104)
==1931==by 0x7A2703: qmp_dispatch (qmp-dispatch.c:131)
==1931==by 0x39E36D: handle_qmp_command (monitor.c:3839)
==1931==by 0x7AA357: json_message_process_token (json-streamer.c:105)
==1931==by 0x7D70CB: json_lexer_feed_char (json-lexer.c:323)
==1931==by 0x7D7213: json_lexer_feed (json-lexer.c:373)
==1931==by 0x7AA3FE: json_message_parser_feed (json-streamer.c:124)
==1931==  Block was alloc'd at
==1931==at 0x4C2DB8F: malloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1931==by 0x1C004718: g_malloc (in
/lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.2)
==1931==by 0x691E1C: object_new_with_type (object.c:491)
==1931==by 0x691E78: object_new (object.c:502)
==1931==by 0x479A3C: qmp_device_list_properties (qmp.c:537)
==1931==by 0x469EA0: qmp_marshal_device_list_properties (qmp-marshal.c:1393)
==1931==by 0x7A25D2: do_qmp_dispatch (qmp-dispatch.c:104)
==1931==by 0x7A2703: qmp_dispatch (qmp-dispatch.c:131)
==1931==by 0x39E36D: handle_qmp_command (monitor.c:3839)
==1931==by 0x7AA357: json_message_process_token (json-streamer.c:105)
==1931==by 0x7D70CB: json_lexer_feed_char (json-lexer.c:323)
==1931==by 0x7D7213: json_lexer_feed (json-lexer.c:373)


Thanks for the hint - while it didn't crash locally, I was certainly 
able to reproduce the above trace in valgrind.


Turns out the issue was that thought I could move pci_register_bus() 
from realize to init in patch 10, but evidently not :)


I've moved it back and repushed the signed tag if you can try and apply 
the PR once again?



Many thanks,

Mark.

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 8 January 2018 at 19:31, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here is the first set of SPARC updates for 2.12. Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 4124ea4f5bd367ca6412fb2dfe7ac4d80e1504d9:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20171229' into 
> staging (2018-01-08 16:17:04 +)
>
> are available in the git repository at:
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to 6a52624720e5abc6a1f067a7e7b8239b428e0c95:
>
>   sun4u_iommu: add trace event for IOMMU translations (2018-01-08 19:07:55 
> +)
>
> 
> qemu-sparc update
>
> 

Hi. This seems to crash in 'make check'. One of the crashes has a
memory corruption splat:

TEST: tests/device-introspect-test... (pid=20423)
  /sparc64/device/introspect/list: OK
  /sparc64/device/introspect/list-fields:  OK
  /sparc64/device/introspect/none: OK
  /sparc64/device/introspect/abstract: OK
  /sparc64/device/introspect/concrete:
*** Error in `sparc64-softmmu/qemu-system-spar
c64': corrupted double-linked list (not small): 0x010033b823a0 ***
=== Backtrace: =
/lib64/libc.so.6(+0xb0b94)[0x3fff90ce0b94]
/lib64/libc.so.6(+0xb5b18)[0x3fff90ce5b18]
/lib64/libc.so.6(__libc_calloc-0x14b664)[0x3fff90ce9934]
/lib64/libglib-2.0.so.0(g_malloc0-0x100d54)[0x3fff97a634d4]
sparc64-softmmu/qemu-system-sparc64[0x1030a9bc]
sparc64-softmmu/qemu-system-sparc64[0x103062c8]
sparc64-softmmu/qemu-system-sparc64[0x103062a0]

Running it under valgrind with
QTEST_QEMU_BINARY='valgrind sparc64-softmmu/qemu-system-sparc64'
./tests/device-introspect-test -p /sparc64/device/introspect/concrete

gives this write-after-free:

==1931== Invalid write of size 8
==1931==at 0x55EA51: pci_host_bus_register (pci.c:331)
==1931==by 0x55ECBD: pci_bus_init (pci.c:393)
==1931==by 0x55EE18: pci_bus_new (pci.c:424)
==1931==by 0x55EEE2: pci_register_bus (pci.c:447)
==1931==by 0x55D14F: pci_pbm_init (apb.c:464)
==1931==by 0x69179B: object_init_with_type (object.c:353)
==1931==by 0x6919D0: object_initialize_with_type (object.c:384)
==1931==by 0x691E3B: object_new_with_type (object.c:492)
==1931==by 0x691E78: object_new (object.c:502)
==1931==by 0x479A3C: qmp_device_list_properties (qmp.c:537)
==1931==by 0x455479: qdev_device_help (qdev-monitor.c:279)
==1931==by 0x456C9E: qmp_device_add (qdev-monitor.c:802)
==1931==  Address 0x2ca7af08 is 1,528 bytes inside a block of size 3,312 free'd
==1931==at 0x4C2EDEB: free (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1931==by 0x691DC6: object_finalize (object.c:480)
==1931==by 0x692CBD: object_unref (object.c:911)
==1931==by 0x479B91: qmp_device_list_properties (qmp.c:572)
==1931==by 0x469EA0: qmp_marshal_device_list_properties (qmp-marshal.c:1393)
==1931==by 0x7A25D2: do_qmp_dispatch (qmp-dispatch.c:104)
==1931==by 0x7A2703: qmp_dispatch (qmp-dispatch.c:131)
==1931==by 0x39E36D: handle_qmp_command (monitor.c:3839)
==1931==by 0x7AA357: json_message_process_token (json-streamer.c:105)
==1931==by 0x7D70CB: json_lexer_feed_char (json-lexer.c:323)
==1931==by 0x7D7213: json_lexer_feed (json-lexer.c:373)
==1931==by 0x7AA3FE: json_message_parser_feed (json-streamer.c:124)
==1931==  Block was alloc'd at
==1931==at 0x4C2DB8F: malloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==1931==by 0x1C004718: g_malloc (in
/lib/x86_64-linux-gnu/libglib-2.0.so.0.4800.2)
==1931==by 0x691E1C: object_new_with_type (object.c:491)
==1931==by 0x691E78: object_new (object.c:502)
==1931==by 0x479A3C: qmp_device_list_properties (qmp.c:537)
==1931==by 0x469EA0: qmp_marshal_device_list_properties (qmp-marshal.c:1393)
==1931==by 0x7A25D2: do_qmp_dispatch (qmp-dispatch.c:104)
==1931==by 0x7A2703: qmp_dispatch (qmp-dispatch.c:131)
==1931==by 0x39E36D: handle_qmp_command (monitor.c:3839)
==1931==by 0x7AA357: json_message_process_token (json-streamer.c:105)
==1931==by 0x7D70CB: json_lexer_feed_char (json-lexer.c:323)
==1931==by 0x7D7213: json_lexer_feed (json-lexer.c:373)



thanks
-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 19 October 2017 at 07:58, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here are my sun4u patches for 2.11. Note that because of the machine changes
> there is an openbios-sparc64 binary update included in the first patch to
> maintain bisectability. There will be a follow-up patch for OpenBIOS which 
> will
> update binaries for all architectures to the latest and update the submodule
> shortly.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 861cd431c99e56ddb5953ca1da164a9c32b477ca:
>
>   Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171017' 
> into staging (2017-10-17 15:26:51 +0100)
>
> are available in the git repository at:
>
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to bcf9e2c2f2b7a610efaafc4bd6d0bee9181c2345:
>
>   sun4u: fix assert when adding NICs which aren't the in-built model 
> (2017-10-19 07:45:35 +0100)
>
> 
> qemu-sparc update
>
> 
> Mark Cave-Ayland (2):
>   sun4u: update PCI topology to include simba PCI bridges
>   sun4u: fix assert when adding NICs which aren't the in-built model

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 21 September 2017 at 08:51, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> This contains the code for the new Sun HME (Happy Meal Ethernet) card and 
> switches the sun4u machine
> over to use it as the default. Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit b62b7ed0fc9c58e373b8946c9bd2e193be98dae6:
>
>   Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging 
> (2017-09-20 20:33:48 +0100)
>
> are available in the git repository at:
>
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to 8d9329719cc0996e5837fb466ca4d7be8030f8c9:
>
>   sun4u: use sunhme as default on-board NIC (2017-09-21 08:38:42 +0100)
>
> 
> qemu-sparc update
>
> 
> Mark Cave-Ayland (2):
>   net: add Sun HME (Happy Meal Ethernet) on-board NIC
>   sun4u: use sunhme as default on-board NIC

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 4 September 2017 at 18:51, Mark Cave-Ayland
 wrote:
> Hi Peter,
>
> Here is the first patchset in preparation for updating the sun4u machine PCI 
> topology. Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 2b483739791b33c46e6084b51edcf62107058ae1:
>
>   Merge remote-tracking branch 
> 'remotes/pmaydell/tags/pull-target-arm-20170904-2' into staging (2017-09-04 
> 17:21:24 +0100)
>
> are available in the git repository at:
>
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to e5fd1eb05ec918e9877640d85ec45680cf106632:
>
>   apb: add busA qdev property to PBM PCI bridge (2017-09-04 18:41:01 +0100)
>
> 
> qemu-sparc update
>
> 
> Mark Cave-Ayland (6):
>   sun4u: pass PCIDevice into pci_ebus_init() instead of PCIBus
>   sun4u: switch to using qdev to instantiate fw_cfg interface
>   sun4u: expose fw_cfg and NVRAM on ebus PCI IO address space
>   apb: fix up PCI bus nomenclature
>   apb: fix endianness for APB and PCI config accesses
>   apb: add busA qdev property to PBM PCI bridge
>
>  hw/pci-host/apb.c  |   62 
> +---
>  hw/sparc64/sun4u.c |   27 ++-
>  2 files changed, 61 insertions(+), 28 deletions(-)


Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 2 June 2017 at 06:32, Mark Cave-Ayland  wrote:
> Hi Peter,
>
> This request contains the SPARC QOMify work which fell through the cracks 
> during the last release.
> Please pull.
>
>
> ATB,
>
> Mark.
>
>
> The following changes since commit 43771d5d92312504305c19abe29ec5bfabd55f01:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-05-31' 
> into staging (2017-06-01 16:39:16 +0100)
>
> are available in the git repository at:
>
>
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
>
> for you to fetch changes up to 78fb261db18d3e12f68304c0d91a85e0a3bbc757:
>
>   hw/sparc64: QOM'ify sun4u.c (2017-06-02 05:54:43 +0100)
>
> 
> qemu-sparc update
>
> 
> xiaoqiang zhao (8):
>   hw/misc: QOM'ify eccmemctl.c
>   hw/dma: QOM'ify sparc32_dma.c
>   hw/dma: QOM'ify sun4m_iommu.c
>   hw/misc: QOM'ify slavio_misc.c
>   hw/timer: QOM'ify m48txx_sysbus
>   hw/timer: QOM'ify slavio_timer
>   hw/sparc: QOM'ify sun4m.c
>   hw/sparc64: QOM'ify sun4u.c

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Stefan Hajnoczi]

On Fri, May 05, 2017 at 09:57:24AM +0100, Mark Cave-Ayland wrote:
> Hi Stefan,
> 
> This pull request contains just the fixes for the Coverity warnings spotted 
> by Peter from
> the last set of cg3/tcx patches. Please pull.
> 
> 
> ATB,
> 
> Mark.
> 
> 
> The following changes since commit e619b14746e5d8c0e53061661fd0e1da01fd4d60:
> 
>   Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging 
> (2017-05-02 15:16:29 +0100)
> 
> are available in the git repository at:
> 
> 
>   https://github.com/mcayland/qemu.git tags/qemu-sparc-signed
> 
> for you to fetch changes up to 8eb57ae3f9afdd8d911f3b2862e05cd0bb042b4e:
> 
>   cg3: add explicit ram_addr_t cast to scanline page variable (2017-05-05 
> 09:49:00 +0100)
> 
> 
> qemu-sparc update
> 
> 
> Mark Cave-Ayland (2):
>   tcx: fix cut/paste error in update_palette_entries()
>   cg3: add explicit ram_addr_t cast to scanline page variable
> 
>  hw/display/cg3.c |2 +-
>  hw/display/tcx.c |1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan


signature.asc
Description: PGP signature

Re: [Qemu-devel] [PULL] qemu-sparc updates

[Peter Maydell]

On 17 August 2014 13:50, Mark Cave-Ayland mark.cave-ayl...@ilande.co.uk wrote:
 Hi Peter,

 I've updated my qemu-sparc branch with the latest set of SPARC64 fixes. 
 Please pull.


 ATB,

 Mark.


 The following changes since commit f2c85a2f36f57f155cda7bc9f7c42b44f1a2439e:

   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 
 (2014-08-15 17:43:51 +0100)

 are available in the git repository at:


   https://github.com/mcayland/qemu.git qemu-sparc

 for you to fetch changes up to 2a5fade753e66ae68f0131962391cd78b99afa53:

   target-sparc64: implement Short Floating-Point Store Instructions 
 (2014-08-17 13:24:27 +0100)

 
 Artyom Tarasenko (1):
   target-sparc64: implement Short Floating-Point Store Instructions

 Mark Cave-Ayland (2):
   sun4u: switch second PCI-ebus bridge BAR over to PCI IO space
   apb: add IOMMU flush register implementation

  hw/pci-host/apb.c  |   12 ++--
  hw/sparc64/sun4u.c |4 ++--
  target-sparc/ldst_helper.c |   15 ++-
  3 files changed, 26 insertions(+), 5 deletions(-)

Applied, thanks.

-- PMM