Commit ffb5a69c 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-01-24

# gpg: Signature made Tue 24 Jan 2017 20:27:08 GMT
# 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: (31 commits)
  hw/isa/isa-bus: Set category of the "isabus-bridge" device
  usb: Set category and description of the MTP device
  gdbstub.c: update old error report statements
  gdbstub.c: fix GDB connection segfault caused by empty machines
  scsi-disk: add 'fall through' comment to switch VERIFY cases
  Drop duplicate display option documentation
  hw/display/framebuffer.c: Avoid overflow for framebuffers > 4GB
  win32: use glib gpoll if glib >= 2.50
  util/mmap-alloc: refactor a little bit for readability
  util/mmap-alloc: check parameter before using
  vfio: remove a duplicated word in comments
  docs: sync pci-ids.txt
  disas/cris.c: Fix Coverity warning about unchecked NULL
  lm32: milkymist-tmu2: fix another integer overflow
  hw/i386/kvmvapic: Remove dead code in patch_hypercalls()
  doc/usb2: fix typo
  qga: fix erroneous argument to strerror
  block: remove dead check
  pci-assign: avoid pointless stat
  qemu-img: remove dead check
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d2648712 5658ffa3

README

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ of other UNIX targets. The simple steps to build QEMU are: 
Additional information can also be found online via the QEMU website:



  http://qemu-project.org/Hosts/Linux

  http://qemu-project.org/Hosts/Mac

  http://qemu-project.org/Hosts/W32

block.c

+1 −1
Original line number Diff line number Diff line
@@ -1851,7 +1851,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename, 
    bdrv_refresh_filename(bs);



    /* Check if any unknown options were used */

    if (options && (qdict_size(options) != 0)) {

    if (qdict_size(options) != 0) {

        const QDictEntry *entry = qdict_first(options);

        if (flags & BDRV_O_PROTOCOL) {

            error_setg(errp, "Block protocol '%s' doesn't support the option "

disas/cris.c

+1 −1
Original line number Diff line number Diff line
@@ -2490,7 +2490,7 @@ print_with_operands (const struct cris_opcode *opcodep, 
	const struct cris_spec_reg *sregp

	  = spec_reg_info ((insn >> 12) & 15, disdata->distype);



	if (sregp->name == NULL)

	if (sregp == NULL || sregp->name == NULL)

	  /* Should have been caught as a non-match earlier.  */

	  *tp++ = '?';

	else

docs/specs/pci-ids.txt

+3 −0
Original line number Diff line number Diff line
@@ -57,7 +57,10 @@ PCI devices (other than virtio): 
1b36:0005  PCI test device (docs/specs/pci-testdev.txt)

1b36:0006  PCI Rocker Ethernet switch device

1b36:0007  PCI SD Card Host Controller Interface (SDHCI)

1b36:0008  PCIe host bridge

1b36:0009  PCI Expander Bridge (-device pxb)

1b36:000a  PCI-PCI bridge (multiseat)

1b36:000b  PCIe Expander Bridge (-device pxb-pcie)



All these devices are documented in docs/specs.

docs/usb-storage.txt

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ with tree logical units: 
Number three emulates the classic bulk-only transport protocol too.

It's called "usb-bot".  It shares most code with "usb-storage", and

the guest will not be able to see the difference.  The qemu command

line interface is simliar to usb-uas though, i.e. no automatic scsi

line interface is similar to usb-uas though, i.e. no automatic scsi

disk creation.  It also features support for up to 16 LUNs.  The LUN

numbers must be continuous, i.e. for three devices you must use 0+1+2.

The 0+1+5 numbering from the "usb-uas" example isn't going to work