Commit 4b8abfb7 authored Apr 24, 2014 by Peter Maydell

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-04-18' into staging



trivial patches for 2014-04-18

# gpg: Signature made Fri 18 Apr 2014 07:36:15 BST 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>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-04-18:
  Fix grammar in comment
  doc: grammify "allows to"
  configure: Remove redundant message for -Werror
  scripts: add sample model file for Coverity Scan
  xbzrle.c: Avoid undefined behaviour with signed arithmetic
  int128.h: Avoid undefined behaviours involving signed arithmetic
  hw/ide/ahci.c: Avoid shift left into sign bit
  net: Report error when device / hub combo is not found.
  configure: Fix indentation of help for --enable/disable-debug-info
  qga: trivial fix for unclear documentation of guest-set-time
  vl: Report accelerator not supported for target more nicely

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents 2d03b49c b36dc67b

configure

+2 −3

Original line number	Diff line number	Diff line
		@@ -4095,7 +4095,6 @@ echo "sparse enabled $sparse"
		echo "strip binaries $strip_opt"
		echo "profiler $profiler"
		echo "static build $static"
		echo "-Werror enabled $werror"
		if test "$darwin" = "yes" ; then
		echo "Cocoa support $cocoa"
		fi

hw/i2c/smbus_eeprom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static void eeprom_write_data(SMBusDevice dev, uint8_t cmd, uint8_t buf, int l
		printf("eeprom_write_byte: addr=0x%02x cmd=0x%02x val=0x%02x\n",
		dev->i2c.address, cmd, buf[0]);
		#endif
		/* An page write operation is not a valid SMBus command.
		/* A page write operation is not a valid SMBus command.
		It is a block write without a length byte. Fortunately we
		get the full block anyway. */
		/* TODO: Should this set the current location? */

hw/ide/ahci.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -438,9 +438,9 @@ static void check_cmd(AHCIState *s, int port)

		if ((pr->cmd & PORT_CMD_START) && pr->cmd_issue) {
		for (slot = 0; (slot < 32) && pr->cmd_issue; slot++) {
		if ((pr->cmd_issue & (1 << slot)) &&
		if ((pr->cmd_issue & (1U << slot)) &&
		!handle_cmd(s, port, slot)) {
		pr->cmd_issue &= ~(1 << slot);
		pr->cmd_issue &= ~(1U << slot);
		}
		}
		}

include/qemu/int128.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ static inline Int128 int128_rshift(Int128 a, int n)
		if (n >= 64) {
		return (Int128) { h, h >> 63 };
		} else {
		return (Int128) { (a.lo >> n) \| (a.hi << (64 - n)), h };
		return (Int128) { (a.lo >> n) \| ((uint64_t)a.hi << (64 - n)), h };
		}
		}

		@@ -78,7 +78,7 @@ static inline Int128 int128_neg(Int128 a)

		static inline Int128 int128_sub(Int128 a, Int128 b)
		{
		return (Int128){ a.lo - b.lo, a.hi - b.hi - (a.lo < b.lo) };
		return (Int128){ a.lo - b.lo, (uint64_t)a.hi - b.hi - (a.lo < b.lo) };
		}

		static inline bool int128_nonneg(Int128 a)

net/net.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -952,10 +952,12 @@ void net_host_device_remove(Monitor mon, const QDict qdict)

		nc = net_hub_find_client_by_name(vlan_id, device);
		if (!nc) {
		error_report("Host network device '%s' on hub '%d' not found",
		device, vlan_id);
		return;
		}
		if (!net_host_check_device(nc->model)) {
		monitor_printf(mon, "invalid host network device %s\n", device);
		error_report("invalid host network device '%s'", device);
		return;
		}
		qemu_del_net_client(nc);