[Qemu-commits] [qemu/qemu] fc11eb: qemu-img: Error out for excess argume

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] fc11eb: qemu-img: Error out for excess argume

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] fc11eb: qemu-img: Error out for excess arguments
Date:	Wed, 07 Aug 2013 12:30:10 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fc11eb26cee7e3621645dd40cd9de944201f590b
      
https://github.com/qemu/qemu/commit/fc11eb26cee7e3621645dd40cd9de944201f590b
  Author: Kevin Wolf <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Error out for excess arguments

Don't silently ignore excess arguments at the end of the command line,
but error out instead. This can catch typos like 'resize test.img + 1G',
which doesn't increase the image size by 1G as intended, but truncates
the image to 1G. Even for less dangerous commands, the old behaviour is
confusing.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 526eda14a68d5b3596be715505289b541288ef2a
      
https://github.com/qemu/qemu/commit/526eda14a68d5b3596be715505289b541288ef2a
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M qemu-img.c
    M qemu-io.c

  Log Message:
  -----------
  ignore SIGPIPE in qemu-img and qemu-io

This prevents the tools from being stopped when they write data to a
closed connection in the other side.

Signed-off-by: MORITA Kazutaka <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 840042901710c2dc1a3ac3e5af9bed449c339701
      
https://github.com/qemu/qemu/commit/840042901710c2dc1a3ac3e5af9bed449c339701
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M util/iov.c

  Log Message:
  -----------
  iov: handle EOF in iov_send_recv

Without this patch, iov_send_recv() never returns when do_send_recv()
returns zero.

Signed-off-by: MORITA Kazutaka <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 9580498b9a599b38c3a28599dcd40bd59f12af2c
      
https://github.com/qemu/qemu/commit/9580498b9a599b38c3a28599dcd40bd59f12af2c
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M tests/qemu-iotests/051.out
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  qemu-iotests: filter QEMU version in monitor banner

Filter out the QEMU monitor version banner so that tests do not break
when the QEMU version number is changed.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e4f5c1bf8f6f6fe0bb4c743452bf8288033e80ba
      
https://github.com/qemu/qemu/commit/e4f5c1bf8f6f6fe0bb4c743452bf8288033e80ba
  Author: Liu Yuan <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: add missing .bdrv_has_zero_init

Commit 3ac21627 changed the behaviour of bdrv_has_zero_init() to default
to 0. In the review for Sheepdog it turned out that enabling it is safe,
so that commit updated one BlockDriver definition of sheepdog to use
bdrv_has_zero_init_1, missed however that there are more BlockDrivers in
the driver. Fix these now.

Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Reviewed-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 5d8caa543c9714bee36b04899797a3721dff4090
      
https://github.com/qemu/qemu/commit/5d8caa543c9714bee36b04899797a3721dff4090
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED

It's best to make it consistent that all on disk structures are
QEMU_PACKED.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: e98768d43799cd3f00b358bfbe455fdae793d3e8
      
https://github.com/qemu/qemu/commit/e98768d43799cd3f00b358bfbe455fdae793d3e8
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: use unsigned values for on disk header fields

The size and offset fields are all non-negative values, use uint64_t for
them to avoid getting negative in memory value by int overflow.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 23ea2ecc2a43d850bc9482068201ece5da36a448
      
https://github.com/qemu/qemu/commit/23ea2ecc2a43d850bc9482068201ece5da36a448
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  qemu-iotests: add poke_file utility function

The new poke_file function sets bytes at an offset in a file given a
printf-style format string.  It can be used to corrupt an image file for
test coverage of error paths.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ca6cbb657d66a7beb70f9d91848c80d1a72b1674
      
https://github.com/qemu/qemu/commit/ca6cbb657d66a7beb70f9d91848c80d1a72b1674
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    A tests/qemu-iotests/059
    A tests/qemu-iotests/059.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qemu-iotests: add empty test case for vmdk

Will add vmdk specific tests later here.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 8aa1331c09a9b899f48d97f097bb49b7d458be1c
      
https://github.com/qemu/qemu/commit/8aa1331c09a9b899f48d97f097bb49b7d458be1c
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c
    M tests/qemu-iotests/059
    M tests/qemu-iotests/059.out

  Log Message:
  -----------
  vmdk: check granularity field in opening

Granularity is used to calculate the cluster size and allocate r/w
buffer. Check the value from image before using it, so we don't abort()
for unbounded memory allocation.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f8ce04036e333aae480b1d06d969f6436652633d
      
https://github.com/qemu/qemu/commit/f8ce04036e333aae480b1d06d969f6436652633d
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c
    M tests/qemu-iotests/059
    M tests/qemu-iotests/059.out

  Log Message:
  -----------
  vmdk: check l2 table size when opening

header.num_gtes_per_gte determines size for L2 table. Check for too big
value before using it. Limit to 512M entries (2GB per one L2 table).

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 2c43e43c8cec130fff95ef720a860e91efb36685
      
https://github.com/qemu/qemu/commit/2c43e43c8cec130fff95ef720a860e91efb36685
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c
    M tests/qemu-iotests/059
    M tests/qemu-iotests/059.out

  Log Message:
  -----------
  vmdk: check l1 size before opening image

L1 table size is calculated from capacity, granularity and l2 table
size. If capacity is too big or later two are too small, the L1 table
will be too big to allocate in memory. Limit it to a reasonable range.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: bf81507de38fdfa4cb6e9b46fb38691a25cb1499
      
https://github.com/qemu/qemu/commit/bf81507de38fdfa4cb6e9b46fb38691a25cb1499
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: use heap allocation for whole_grain

We should never grow the stack beyond 1 MB, otherwise we'll fall off the
end.  Thread stacks and coroutine stacks (1 MB) do not grow.
get_cluster_offset() allocates a big stack offset, it will fail for big
cluster images, change to heap allocated buffer.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ca8804ced9fdba7a1925ed81084dfb7a5b6ffa9f
      
https://github.com/qemu/qemu/commit/ca8804ced9fdba7a1925ed81084dfb7a5b6ffa9f
  Author: Fam Zheng <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: rename num_gtes_per_gte to num_gtes_per_gt

num_gtes_per_gte is a historical typo, rename it to a more sensible
name. It means "number of GrainTableEntries per GrainTable".

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: cd7b87ffe9b6b7b0089ec8c71555f3b942bc6daf
      
https://github.com/qemu/qemu/commit/cd7b87ffe9b6b7b0089ec8c71555f3b942bc6daf
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M hw/i386/pc.c
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: Fix X86CPU error handling

Error **errp argument is not for emitting warnings, it means an error
has occurred and the caller should not make any assumptions about the
state of other return values (unless otherwise documented).

Therefore cpu_x86_create() must unref the new X86CPU itself, and
pc_new_cpu() must check for an Error rather than NULL return value.

While at it, clean up a superfluous NULL check.

Reported-by: Jan Kiszka <address@hidden>
Cc: address@hidden
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: cafffa545420a2c6dc33f9cb58401c606af59572
      
https://github.com/qemu/qemu/commit/cafffa545420a2c6dc33f9cb58401c606af59572
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M block/sheepdog.c
    M block/vmdk.c
    M qemu-img.c
    M qemu-io.c
    M tests/qemu-iotests/051.out
    A tests/qemu-iotests/059
    A tests/qemu-iotests/059.out
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/group
    M util/iov.c

  Log Message:
  -----------
  Merge remote-tracking branch 'kwolf/for-anthony' into staging

# By Fam Zheng (8) and others
# Via Kevin Wolf
* kwolf/for-anthony:
  vmdk: rename num_gtes_per_gte to num_gtes_per_gt
  vmdk: use heap allocation for whole_grain
  vmdk: check l1 size before opening image
  vmdk: check l2 table size when opening
  vmdk: check granularity field in opening
  qemu-iotests: add empty test case for vmdk
  qemu-iotests: add poke_file utility function
  vmdk: use unsigned values for on disk header fields
  vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED
  sheepdog: add missing .bdrv_has_zero_init
  qemu-iotests: filter QEMU version in monitor banner
  iov: handle EOF in iov_send_recv
  ignore SIGPIPE in qemu-img and qemu-io
  qemu-img: Error out for excess arguments

Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 6c0f48f5b6c4cf3e1ec8ec6fa7bfe1b97dc92a9c
      
https://github.com/qemu/qemu/commit/6c0f48f5b6c4cf3e1ec8ec6fa7bfe1b97dc92a9c
  Author: Anthony Liguori <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M hw/i386/pc.c
    M target-i386/cpu.c

  Log Message:
  -----------
  Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging

QOM CPUState refactorings

* Clean up X86CPU error handling

# gpg: Signature made Tue 06 Aug 2013 01:57:34 PM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  target-i386: Fix X86CPU error handling


  Commit: 0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6
      
https://github.com/qemu/qemu/commit/0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6
  Author: Martijn van den Broek <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M hw/core/loader.c

  Log Message:
  -----------
  Bugfix for loading multiboot kernels

This patch fixes a bug in rom_copy introduced by
commit d60fa42e8bae39440f997ebfe8fe328269a57d16.

rom_copy failed to load roms with a "datasize" of 0.
As a result, multiboot kernels were not loaded correctly
when they contain a segment with a "file size" of 0.

https://bugs.launchpad.net/qemu/+bug/1208944

Signed-off-by: Martijn van den Broek <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: a7d6b9f084765a834110bb9a2a0329b1a96de792
      
https://github.com/qemu/qemu/commit/a7d6b9f084765a834110bb9a2a0329b1a96de792
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M target-ppc/cpu-models.c
    M target-ppc/cpu-models.h

  Log Message:
  -----------
  target-ppc: Fix POWER7+ model

Commit 03a15a5436ed7723f406f15cc3798aa9991e75b5 claimed to add a POWER7+
model but instead added a "POWER7P" model, with an unhelpful "POWER7P"
description on top. Fix this to "POWER7+" as we already have "POWER3+",
"POWER4+" and "POWER5+" and there being no reason to deviate with the
user-visible command line -cpu POWER7P from the marketing name POWER7+.

Further, don't needlessly deviate from the scheme of naming PVR constant,
QOM type and device description after the exact revision that is in fact
encoded in the PVR used.
That way, we can change the user-friendly alias -cpu POWER7+ to point to a
different revision if we so desire, while not polluting the type namespace.

This naming scheme is sensible and completely orthogonal to how PVRs may
or may not get matched to CPU types.

Cc: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 171777a4b38a0f6331ae60c2546a5baf84c4b359
      
https://github.com/qemu/qemu/commit/171777a4b38a0f6331ae60c2546a5baf84c4b359
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M target-ppc/cpu-models.c
    M target-ppc/cpu-models.h

  Log Message:
  -----------
  target-ppc: Turn POWER5gs CPU into alias for POWER5+

Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 469296f1578e1e7b69c267de39d17134b950b93a
      
https://github.com/qemu/qemu/commit/469296f1578e1e7b69c267de39d17134b950b93a
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M target-ppc/cpu-models.c
    M target-ppc/cpu-models.h

  Log Message:
  -----------
  target-ppc: Turn POWER5gr CPU into alias for POWER5

Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 35ebcb2b7a469739e6452d27379181bfbfc0388d
      
https://github.com/qemu/qemu/commit/35ebcb2b7a469739e6452d27379181bfbfc0388d
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M target-ppc/cpu-models.c
    M target-ppc/translate_init.c

  Log Message:
  -----------
  target-ppc: Prepare POWER5P CPU family

It is ISA 2.03. Modelled as 970FX minus AltiVec flag.

Cc: Benjamin Herrenschmidt <address@hidden>
Cc: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: f71d4c4673d0b2b92bccd46eb06f6c1723d6bb0f
      
https://github.com/qemu/qemu/commit/f71d4c4673d0b2b92bccd46eb06f6c1723d6bb0f
  Author: Andreas Färber <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M target-ppc/cpu-models.c
    M target-ppc/cpu-models.h

  Log Message:
  -----------
  target-ppc: Add POWER5+ v2.1 CPU model

Let's avoid -cpu host barfing at this PVR.
Linux recognizes it as "POWER5+ (gs) v2.1".

Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: e9a72359a54978f7364f6486973cea50ceb52173
      
https://github.com/qemu/qemu/commit/e9a72359a54978f7364f6486973cea50ceb52173
  Author: Stefan Weil <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M po/de_DE.po
    M po/fr_FR.po
    M po/hu.po
    M po/it.po
    M po/messages.po
    M po/tr.po

  Log Message:
  -----------
  po: Update all *.po files

Running "make install" modified the *.po files because
they were no longer up to date.

Synchronize them with latest ui/gtk.c and modified build
rules which use paths relative to the project root.

Signed-off-by: Stefan Weil <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f
      
https://github.com/qemu/qemu/commit/6fdf98f281f85ae6e2883bed2f691bcfe33b1f9f
  Author: Paolo Bonzini <address@hidden>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M hw/nvram/fw_cfg.c

  Log Message:
  -----------
  fw_cfg: the I/O port variant expects little-endian

The I/O port variant of fw_cfg is used by sparc64, which is a big-endian 
machine.
Firmware swaps bytes before sending them to fw_cfg, so we need to unswap them in
the device.

This is only used on sparc64 and on (little-endian) x86, so it does not affect
any other target.  32-bit Sparc and PPC all use memory-mapped fw_cfg.

Reported-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Tested-by: Mark Cave-Ayland <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a1fc6246b396...6fdf98f281f8
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] fc11eb: qemu-img: Error out for excess arguments, GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] a1fc62: target-mips: fix decoding of microMIPS POOL32Axf i...
Next by Date: [Qemu-commits] [qemu/qemu] 9b9734: Update version for 1.6.0-rc2
Previous by thread: [Qemu-commits] [qemu/qemu] a1fc62: target-mips: fix decoding of microMIPS POOL32Axf i...
Next by thread: [Qemu-commits] [qemu/qemu] 9b9734: Update version for 1.6.0-rc2
Index(es):
- Date
- Thread