Commit 692a5519 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-01-11' into staging 



trivial patches for 2016-01-11

# gpg: Signature made Mon 11 Jan 2016 08:39:32 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2016-01-11:
  hw/s390x: Remove superfluous return statements
  hw/core/qdev: Remove superfluous return statement
  hw/acpi: Remove superfluous return statement
  hw/ide: Remove superfluous return statements
  osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h
  scripts/checkpatch.pl: Don't allow special cases of unspaced operators
  PCI Bonito: QOMify and cleanup
  SH PCI Host: convert to realize()
  gt64120: convert to realize()
  Add missing syscall nrs. according to more recent Linux kernels
  hw/misc/edu: Convert to realize()
  configure: fix trace backend check
  xen/Makefile.objs: simplify
  crypto: Fix typo in example
  MAINTAINERS: Add the correct device_tree.h file
  iscsi: fix readcapacity error message
  net: convert qemu_log to error_report, fix message
  linux-user: enable sigaltstack for all architectures
  unicore32: convert get_sp_from_cpustate from macro to inline

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cc06ca4c fe02fc52

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,8 @@ Device Tree 
M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Alexander Graf <agraf@suse.de>

S: Maintained

F: device_tree.[ch]

F: device_tree.c

F: include/sysemu/device_tree.h



Error reporting

M: Markus Armbruster <armbru@redhat.com>

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp) 
             && retries-- > 0);



    if (task == NULL || task->status != SCSI_STATUS_GOOD) {

        error_setg(errp, "iSCSI: failed to send readcapacity10 command.");

        error_setg(errp, "iSCSI: failed to send readcapacity10/16 command");

    } else if (!iscsilun->block_size ||

               iscsilun->block_size % BDRV_SECTOR_SIZE) {

        error_setg(errp, "iSCSI: the target returned an invalid "

configure

+1 −1
Original line number Diff line number Diff line
@@ -4817,7 +4817,7 @@ echo "libcap-ng support $cap_ng" 
echo "vhost-net support $vhost_net"

echo "vhost-scsi support $vhost_scsi"

echo "Trace backends    $trace_backends"

if test "$trace_backend" = "simple"; then

if have_backend "simple"; then

echo "Trace output file $trace_file-<pid>"

fi

if test "$spice" = "yes"; then

hw/acpi/memory_hotplug.c

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, 
        /* do ACPI magic */

        acpi_send_gpe_event(ar, irq, ACPI_MEMORY_HOTPLUG_STATUS);

    }

    return;

}



void acpi_memory_unplug_request_cb(ACPIREGS *ar, qemu_irq irq,

hw/core/qdev.c

+0 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,6 @@ post_realize_fail: 


fail:

    error_propagate(errp, local_err);

    return;

}



static bool device_get_hotpluggable(Object *obj, Error **errp)