Commit 199e19ee authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging 



trivial patches for 2017-06-05

# gpg: Signature made Mon 05 Jun 2017 15:23:46 BST
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (21 commits)
  hw/core: nmi.c can be compiled as common-obj nowadays
  dump: fix memory_mapping_filter leak
  ide-test: check return of fwrite
  help: Add newline to end of thread option help text
  qemu-ga: remove useless allocation
  scsi/lsi53c895a: Remove unused lsi_mem_*() return value
  qapi: Fix some QMP documentation regressions
  hw/mips: add missing include
  register: display register prefix (name) since it is available
  hw/sparc: use ARRAY_SIZE() macro
  hw/xtensa: sim: use g_string/g_new
  target/arm: add data cache invalidation cp15 instruction to cortex-r5
  block: Correct documentation for BLOCK_WRITE_THRESHOLD
  trivial: Remove unneeded ifndef in memory.h
  altera_timer: fix incorrect memset
  configure: Detect native NetBSD curses(3)
  tests/libqtest: Print error instead of aborting when env variable is missing
  docs/qdev-device-use.txt: update section Default Devices
  docs qemu-doc: Avoid ide-drive, it's deprecated
  qemu-doc: Add hyperlinks to further license information
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cb8b8ef4 03e947f9

configure

+1 −2
Original line number Diff line number Diff line
@@ -3042,14 +3042,13 @@ if test "$curses" != "no" ; then 
#include <curses.h>

#include <wchar.h>

int main(void) {

  const char *s = curses_version();

  wchar_t wch = L'w';

  setlocale(LC_ALL, "");

  resize_term(0, 0);

  addwstr(L"wide chars\n");

  addnwstr(&wch, 1);

  add_wch(WACS_DEGREE);

  return s != 0;

  return 0;

}

EOF

  IFS=:

docs/bootindex.txt

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Let's assume we have a QEMU machine with two NICs (virtio, e1000) and two 
disks (IDE, virtio):



qemu -drive file=disk1.img,if=none,id=disk1

     -device ide-drive,drive=disk1,bootindex=4

     -device ide-hd,drive=disk1,bootindex=4

     -drive file=disk2.img,if=none,id=disk2

     -device virtio-blk-pci,drive=disk2,bootindex=3

     -netdev type=user,id=net0 -device virtio-net-pci,netdev=net0,bootindex=2

docs/qdev-device-use.txt

+7 −6
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ A QEMU block device (drive) has a host and a guest part. 


In the general case, the guest device is connected to a controller

device.  For instance, the IDE controller provides two IDE buses, each

of which can have up to two ide-drive devices, and each ide-drive

device is a guest part, and is connected to a host part.

of which can have up to two devices, and each device is a guest part,

and is connected to a host part.



Except we sometimes lump controller, bus(es) and drive device(s) all

together into a single device.  For instance, the ISA floppy
@@ -399,12 +399,13 @@ type. 
some DEVNAMEs:



    default device      suppressing DEVNAMEs

    CD-ROM              ide-cd, ide-drive, scsi-cd

    isa-fdc's driveA    isa-fdc

    CD-ROM              ide-cd, ide-drive, ide-hd, scsi-cd, scsi-hd

    isa-fdc's driveA    floppy, isa-fdc

    parallel            isa-parallel

    serial              isa-serial

    VGA                 VGA, cirrus-vga, vmware-svga

    virtioconsole       virtio-serial-pci, virtio-serial-s390, virtio-serial

    VGA                 VGA, cirrus-vga, isa-vga, isa-cirrus-vga,

                        vmware-svga, qxl-vga, virtio-vga

    virtioconsole       virtio-serial-pci, virtio-serial



The default NIC is connected to a default part created along with it.

It is *not* suppressed by configuring a NIC with -device (you may call

hw/core/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ common-obj-y += fw-path-provider.o 
# irq.o needed for qdev GPIO handling:

common-obj-y += irq.o

common-obj-y += hotplug.o

obj-y += nmi.o

common-obj-y += nmi.o



common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o

common-obj-$(CONFIG_XILINX_AXI) += stream.o

hw/core/register.c

+4 −4
Original line number Diff line number Diff line
@@ -195,8 +195,8 @@ void register_write_memory(void *opaque, hwaddr addr, 
    }



    if (!reg) {

        qemu_log_mask(LOG_GUEST_ERROR, "Write to unimplemented register at " \

                      "address: %#" PRIx64 "\n", addr);

        qemu_log_mask(LOG_GUEST_ERROR, "%s: write to unimplemented register " \

                      "at address: %#" PRIx64 "\n", reg_array->prefix, addr);

        return;

    }
@@ -224,8 +224,8 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, 
    }



    if (!reg) {

        qemu_log_mask(LOG_GUEST_ERROR, "Read to unimplemented register at " \

                      "address: %#" PRIx64 "\n", addr);

        qemu_log_mask(LOG_GUEST_ERROR, "%s:  read to unimplemented register " \

                      "at address: %#" PRIx64 "\n", reg_array->prefix, addr);

        return 0;

    }