qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15
@ 2015-01-15  8:30 Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 01/12] vt82c686: avoid out-of-bounds read Michael Tokarev
                   ` (12 more replies)
  0 siblings, 13 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev

This is a next trivial-patches pull request, since the previous one
which was at 2014-12-11 - 4 weeks ago.  Only 12 patches in 4 weeks.
There's nothing exciting in there, but there are several (small)
bugfixes.

Please consider applying/pulling.

With the introduction of pbonzini's "misc" patches tree I'm not
sure current trivial-patches is worth to keep.  Paolo does much
better job in this area than me.

Thanks,

/mjt

The following changes since commit b629a38a13745d62d44de8ebb00f4e38ec6d8f7e:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2015-01-14 18:02:47 +0000)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-01-15

for you to fetch changes up to 99efa84d5c02e33bcca7be83dd7cabc4b0f22f14:

  vl.c: fix some alignment issues (2015-01-15 10:44:13 +0300)

----------------------------------------------------------------
trivial patches for 2015-01-15

----------------------------------------------------------------
David Morrison (1):
      target-openrisc: bugfix for dec_sys to decode instructions correctly

Don Slutz (1):
      Do not hang on full PTY

Marcel Apfelbaum (1):
      vl.c: fix some alignment issues

Paolo Bonzini (2):
      vt82c686: avoid out-of-bounds read
      blizzard: do not depend on VGA internals

Peter Maydell (2):
      tests/hd-geo-test.c: Remove unused test_image variable
      migration/qemu-file.c: Don't shift left into sign bit

SeokYeon Hwang (1):
      translate-all: Mark map_exec() with the 'unused' attribute

Stefan Weil (3):
      target-tricore: Fix new typos
      target-arm: Fix typo in comment (seperately -> separately)
      misc: Fix new typos in comments

Thomas Huth (1):
      Makefile: Remove config.status and common.env during 'make distclean'

 Makefile                         |  4 ++--
 hw/display/blizzard.c            |  1 -
 hw/isa/vt82c686.c                |  2 +-
 include/hw/hotplug.h             |  2 +-
 migration/qemu-file.c            |  2 +-
 qemu-char.c                      |  1 +
 target-arm/helper.c              |  2 +-
 target-openrisc/translate.c      |  2 +-
 target-tricore/csfr.def          |  2 +-
 target-tricore/translate.c       |  2 +-
 target-tricore/tricore-opcodes.h |  4 ++--
 tests/ahci-test.c                |  2 +-
 tests/hd-geo-test.c              |  2 --
 translate-all.c                  |  4 ++--
 vl.c                             | 38 +++++++++++++++++++-------------------
 15 files changed, 34 insertions(+), 36 deletions(-)

^ permalink raw reply	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 01/12] vt82c686: avoid out-of-bounds read
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 02/12] tests/hd-geo-test.c: Remove unused test_image variable Michael Tokarev
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, qemu-stable

From: Paolo Bonzini <pbonzini@redhat.com>

superio_ioport_readb can read the 256th element of the array.
Coverity reports an out-of-bounds write in superio_ioport_writeb,
but it does not show the corresponding out-of-bounds read
because it cannot prove that it can happen.  Fix the root
cause of the problem (zhanghailang's patch instead fixes
the logic in superio_ioport_writeb).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: qemu-stable@nongnu.org
---
 hw/isa/vt82c686.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 223b947..2f53bf8 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -36,7 +36,7 @@
 
 typedef struct SuperIOConfig
 {
-    uint8_t config[0xff];
+    uint8_t config[0x100];
     uint8_t index;
     uint8_t data;
 } SuperIOConfig;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 02/12] tests/hd-geo-test.c: Remove unused test_image variable
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 01/12] vt82c686: avoid out-of-bounds read Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 03/12] translate-all: Mark map_exec() with the 'unused' attribute Michael Tokarev
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Michael Tokarev

From: Peter Maydell <peter.maydell@linaro.org>

Remove unused variable test_image; this silences a clang warning.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 tests/hd-geo-test.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 7cc8dff..00afc20 100644
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -22,8 +22,6 @@
 #include "qemu-common.h"
 #include "libqtest.h"
 
-static const char test_image[] = "/tmp/qtest.XXXXXX";
-
 static char *create_test_img(int secs)
 {
     char *template = strdup("/tmp/qtest.XXXXXX");
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 03/12] translate-all: Mark map_exec() with the 'unused' attribute
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 01/12] vt82c686: avoid out-of-bounds read Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 02/12] tests/hd-geo-test.c: Remove unused test_image variable Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 04/12] migration/qemu-file.c: Don't shift left into sign bit Michael Tokarev
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Michael Tokarev, SeokYeon Hwang

From: SeokYeon Hwang <syeon.hwang@samsung.com>

Mark map_exec() with the 'unused' attribute to avoid '-Wunused-function'
warnings on clang 3.4 or later. This means we don't need to mark it
'inline', which is what we were previously using to suppress the warning
(a trick which only works with gcc, not clang).

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
[PMM: tweaked comment message a little]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 translate-all.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/translate-all.c b/translate-all.c
index 8fa4378..687ba7d 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -276,14 +276,14 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t retaddr)
 }
 
 #ifdef _WIN32
-static inline void map_exec(void *addr, long size)
+static __attribute__((unused)) void map_exec(void *addr, long size)
 {
     DWORD old_protect;
     VirtualProtect(addr, size,
                    PAGE_EXECUTE_READWRITE, &old_protect);
 }
 #else
-static inline void map_exec(void *addr, long size)
+static __attribute__((unused)) void map_exec(void *addr, long size)
 {
     unsigned long start, end, page_size;
 
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 04/12] migration/qemu-file.c: Don't shift left into sign bit
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (2 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 03/12] translate-all: Mark map_exec() with the 'unused' attribute Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 05/12] target-tricore: Fix new typos Michael Tokarev
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Michael Tokarev

From: Peter Maydell <peter.maydell@linaro.org>

Add a cast in qemu_get_be32() to avoid shifting left into the sign
bit of a signed integer (which is undefined behaviour in C).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 migration/qemu-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index d2d4007..a7f2a34 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -503,7 +503,7 @@ unsigned int qemu_get_be16(QEMUFile *f)
 unsigned int qemu_get_be32(QEMUFile *f)
 {
     unsigned int v;
-    v = qemu_get_byte(f) << 24;
+    v = (unsigned int)qemu_get_byte(f) << 24;
     v |= qemu_get_byte(f) << 16;
     v |= qemu_get_byte(f) << 8;
     v |= qemu_get_byte(f);
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 05/12] target-tricore: Fix new typos
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (3 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 04/12] migration/qemu-file.c: Don't shift left into sign bit Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 06/12] target-arm: Fix typo in comment (seperately -> separately) Michael Tokarev
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Michael Tokarev, Bastian Koppelmann

From: Stefan Weil <sw@weilnetz.de>

adress -> address
managment -> management

Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 target-tricore/csfr.def          | 2 +-
 target-tricore/translate.c       | 2 +-
 target-tricore/tricore-opcodes.h | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target-tricore/csfr.def b/target-tricore/csfr.def
index 5b219b4..05c45dd 100644
--- a/target-tricore/csfr.def
+++ b/target-tricore/csfr.def
@@ -90,7 +90,7 @@ A(0xE200, CPM0, TRICORE_FEATURE_13)
 A(0xE280, CPM1, TRICORE_FEATURE_13)
 A(0xE300, CPM2, TRICORE_FEATURE_13)
 A(0xE380, CPM3, TRICORE_FEATURE_13)
-/* memory Managment Registers */
+/* memory management registers */
 A(0x8000, MMU_CON, TRICORE_FEATURE_13)
 A(0x8004, MMU_ASI, TRICORE_FEATURE_13)
 A(0x800C, MMU_TVA, TRICORE_FEATURE_13)
diff --git a/target-tricore/translate.c b/target-tricore/translate.c
index 3b83782..def7f4a 100644
--- a/target-tricore/translate.c
+++ b/target-tricore/translate.c
@@ -5022,7 +5022,7 @@ static void decode_32Bit_opc(CPUTriCoreState *env, DisasContext *ctx)
     case OPCM_32_RR_LOGICAL_SHIFT:
         decode_rr_logical_shift(env, ctx);
         break;
-    case OPCM_32_RR_ADRESS:
+    case OPCM_32_RR_ADDRESS:
         decode_rr_address(env, ctx);
         break;
     case OPCM_32_RR_IDIRECT:
diff --git a/target-tricore/tricore-opcodes.h b/target-tricore/tricore-opcodes.h
index 919063e..82bd161 100644
--- a/target-tricore/tricore-opcodes.h
+++ b/target-tricore/tricore-opcodes.h
@@ -503,7 +503,7 @@ enum {
 /* RR Format */
     OPCM_32_RR_LOGICAL_SHIFT                         = 0x0f,
     OPCM_32_RR_ACCUMULATOR                           = 0x0b,
-    OPCM_32_RR_ADRESS                                = 0x01,
+    OPCM_32_RR_ADDRESS                               = 0x01,
     OPCM_32_RR_DIVIDE                                = 0x4b,
     OPCM_32_RR_IDIRECT                               = 0x2d,
 /* RR1 Format */
@@ -1082,7 +1082,7 @@ enum {
     OPC2_32_RR_XOR_LT_U                          = 0x32,
     OPC2_32_RR_XOR_NE                            = 0x30,
 };
-/* OPCM_32_RR_ADRESS                                */
+/* OPCM_32_RR_ADDRESS                               */
 enum {
     OPC2_32_RR_ADD_A                             = 0x01,
     OPC2_32_RR_ADDSC_A                           = 0x60,
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 06/12] target-arm: Fix typo in comment (seperately -> separately)
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (4 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 05/12] target-tricore: Fix new typos Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 07/12] misc: Fix new typos in comments Michael Tokarev
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Stefan Weil, Greg Bellows, Michael Tokarev,
	Peter Maydell

From: Stefan Weil <sw@weilnetz.de>

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Greg Bellows <greg.bellows@linaro.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 target-arm/helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 3ef0f1f..1a5e067 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -972,7 +972,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
      * The override is necessary because of the overly-broad TLB_LOCKDOWN
      * definition.
      */
-     /* MAIR0/1 are defined seperately from their 64-bit counterpart which
+     /* MAIR0/1 are defined separately from their 64-bit counterpart which
       * allows them to assign the correct fieldoffset based on the endianness
       * handled in the field definitions.
       */
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 07/12] misc: Fix new typos in comments
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (5 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 06/12] target-arm: Fix typo in comment (seperately -> separately) Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 08/12] Do not hang on full PTY Michael Tokarev
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Stefan Weil, Michael Tokarev, John Snow,
	Igor Mammedov

From: Stefan Weil <sw@weilnetz.de>

recieve -> receive
suprise -> surprise

Cc: Igor Mammedov <imammedo@redhat.com>
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/hw/hotplug.h | 2 +-
 tests/ahci-test.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h
index 050d2f0..2db025d 100644
--- a/include/hw/hotplug.h
+++ b/include/hw/hotplug.h
@@ -52,7 +52,7 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler,
  *                  require asynchronous unplug handling.
  * @unplug: unplug callback.
  *          Used for device removal with devices that implement
- *          asynchronous and synchronous (suprise) removal.
+ *          asynchronous and synchronous (surprise) removal.
  */
 typedef struct HotplugHandlerClass {
     /* <private> */
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index e77fa3a..b1a59f2 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -1289,7 +1289,7 @@ static void ahci_test_identify(QPCIDevice *ahci, void *hba_base)
     PX_WREG(i, AHCI_PX_IS, reg);
     g_assert_cmphex(PX_RREG(i, AHCI_PX_IS), ==, 0);
 
-    /* Wipe the FIS-Recieve Buffer */
+    /* Wipe the FIS-Receive Buffer */
     fb = PX_RREG(i, AHCI_PX_FB);
     g_assert_cmphex(fb, !=, 0);
     qmemset(fb, 0x00, 0x100);
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 08/12] Do not hang on full PTY
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (6 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 07/12] misc: Fix new typos in comments Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 09/12] target-openrisc: bugfix for dec_sys to decode instructions correctly Michael Tokarev
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Don Slutz

From: Don Slutz <dslutz@verizon.com>

Signed-off-by: Don Slutz <dslutz@verizon.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 qemu-char.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qemu-char.c b/qemu-char.c
index 5430b87..98d4342 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1402,6 +1402,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
     }
 
     close(slave_fd);
+    qemu_set_nonblock(master_fd);
 
     chr = qemu_chr_alloc();
 
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 09/12] target-openrisc: bugfix for dec_sys to decode instructions correctly
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (7 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 08/12] Do not hang on full PTY Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 10/12] Makefile: Remove config.status and common.env during 'make distclean' Michael Tokarev
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, David Morrison, Michael Tokarev

From: David Morrison <dmorrison@invlim.com>

Fixed the decoding of "system" instructions (starting with 0x2)
in dec_sys() in translate.c.  In particular, the l.trap instruction
is now correctly decoded, which enables for singlestepping and
breakpoints to be set in GDB.

Signed-off-by: David R. Morrison <dmorrison@invlim.com>
Acked-by: Jia Liu <proljc@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 target-openrisc/translate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target-openrisc/translate.c b/target-openrisc/translate.c
index 7dea405..b90181d 100644
--- a/target-openrisc/translate.c
+++ b/target-openrisc/translate.c
@@ -1320,7 +1320,7 @@ static void dec_sys(DisasContext *dc, uint32_t insn)
 #ifdef OPENRISC_DISAS
     uint32_t K16;
 #endif
-    op0 = extract32(insn, 16, 8);
+    op0 = extract32(insn, 16, 10);
 #ifdef OPENRISC_DISAS
     K16 = extract32(insn, 0, 16);
 #endif
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 10/12] Makefile: Remove config.status and common.env during 'make distclean'
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (8 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 09/12] target-openrisc: bugfix for dec_sys to decode instructions correctly Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 11/12] blizzard: do not depend on VGA internals Michael Tokarev
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Thomas Huth

From: Thomas Huth <thuth@linux.vnet.ibm.com>

config.status and tests/qemu-iotests/common.env are generated files
that should be deleted during 'make distclean'.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index f505202..6817c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -313,8 +313,8 @@ qemu-%.tar.bz2:
 
 distclean: clean
 	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi
-	rm -f config-all-devices.mak config-all-disas.mak
-	rm -f po/*.mo
+	rm -f config-all-devices.mak config-all-disas.mak config.status
+	rm -f po/*.mo tests/qemu-iotests/common.env
 	rm -f roms/seabios/config.mak roms/vgabios/config.mak
 	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi
 	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 11/12] blizzard: do not depend on VGA internals
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (9 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 10/12] Makefile: Remove config.status and common.env during 'make distclean' Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15  8:30 ` [Qemu-devel] [PULL 12/12] vl.c: fix some alignment issues Michael Tokarev
  2015-01-15 11:55 ` [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Peter Maydell
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev

From: Paolo Bonzini <pbonzini@redhat.com>

There is nothing that is used by this ARM-specific device.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/display/blizzard.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 92b1fac..5019bbb 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -21,7 +21,6 @@
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/devices.h"
-#include "vga_int.h"
 #include "ui/pixel_ops.h"
 
 typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [Qemu-devel] [PULL 12/12] vl.c: fix some alignment issues
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (10 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 11/12] blizzard: do not depend on VGA internals Michael Tokarev
@ 2015-01-15  8:30 ` Michael Tokarev
  2015-01-15 11:55 ` [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Peter Maydell
  12 siblings, 0 replies; 15+ messages in thread
From: Michael Tokarev @ 2015-01-15  8:30 UTC (permalink / raw)
  To: qemu-devel; +Cc: Marcel Apfelbaum, qemu-trivial, Michael Tokarev

From: Marcel Apfelbaum <marcel@redhat.com>

The misalignment was caused by tabs which were used instead of spaces.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 vl.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/vl.c b/vl.c
index 6adb36e..fbf4240 100644
--- a/vl.c
+++ b/vl.c
@@ -2873,7 +2873,7 @@ int main(int argc, char **argv, char **envp)
         if (optind >= argc)
             break;
         if (argv[optind][0] != '-') {
-	    hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS);
+            hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS);
         } else {
             const QEMUOption *popt;
 
@@ -2918,15 +2918,15 @@ int main(int argc, char **argv, char **envp)
                 if (drive_def(optarg) == NULL) {
                     exit(1);
                 }
-	        break;
+                break;
             case QEMU_OPTION_set:
                 if (qemu_set_option(optarg) != 0)
                     exit(1);
-	        break;
+                break;
             case QEMU_OPTION_global:
                 if (qemu_global_option(optarg) != 0)
                     exit(1);
-	        break;
+                break;
             case QEMU_OPTION_mtdblock:
                 drive_add(IF_MTD, -1, optarg, MTD_OPTS);
                 break;
@@ -2978,7 +2978,7 @@ int main(int argc, char **argv, char **envp)
                         fprintf(stderr, "qemu: invalid physical CHS format\n");
                         exit(1);
                     }
-		    if (hda_opts != NULL) {
+                    if (hda_opts != NULL) {
                         char num[16];
                         snprintf(num, sizeof(num), "%d", cyls);
                         qemu_opt_set(hda_opts, "cyls", num);
@@ -3152,9 +3152,9 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_S:
                 autostart = 0;
                 break;
-	    case QEMU_OPTION_k:
-		keyboard_layout = optarg;
-		break;
+            case QEMU_OPTION_k:
+                keyboard_layout = optarg;
+                break;
             case QEMU_OPTION_localtime:
                 rtc_utc = 0;
                 break;
@@ -3362,9 +3362,9 @@ int main(int argc, char **argv, char **envp)
             case QEMU_OPTION_debugcon:
                 add_device_config(DEV_DEBUGCON, optarg);
                 break;
-	    case QEMU_OPTION_loadvm:
-		loadvm = optarg;
-		break;
+            case QEMU_OPTION_loadvm:
+                loadvm = optarg;
+                break;
             case QEMU_OPTION_full_screen:
                 full_screen = 1;
                 break;
@@ -3476,7 +3476,7 @@ int main(int argc, char **argv, char **envp)
                     exit(1);
                 }
                 break;
-	    case QEMU_OPTION_vnc:
+            case QEMU_OPTION_vnc:
 #ifdef CONFIG_VNC
                 display_remote++;
                 vnc_display = optarg;
@@ -3514,11 +3514,11 @@ int main(int argc, char **argv, char **envp)
                 }
                 qemu_uuid_set = true;
                 break;
-	    case QEMU_OPTION_option_rom:
-		if (nb_option_roms >= MAX_OPTION_ROMS) {
-		    fprintf(stderr, "Too many option ROMs\n");
-		    exit(1);
-		}
+            case QEMU_OPTION_option_rom:
+                if (nb_option_roms >= MAX_OPTION_ROMS) {
+                    fprintf(stderr, "Too many option ROMs\n");
+                    exit(1);
+                }
                 opts = qemu_opts_parse(qemu_find_opts("option-rom"), optarg, 1);
                 if (!opts) {
                     exit(1);
@@ -3530,8 +3530,8 @@ int main(int argc, char **argv, char **envp)
                     fprintf(stderr, "Option ROM file is not specified\n");
                     exit(1);
                 }
-		nb_option_roms++;
-		break;
+                nb_option_roms++;
+                break;
             case QEMU_OPTION_semihosting:
                 semihosting_enabled = 1;
                 semihosting_target = SEMIHOSTING_TARGET_AUTO;
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15
  2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
                   ` (11 preceding siblings ...)
  2015-01-15  8:30 ` [Qemu-devel] [PULL 12/12] vl.c: fix some alignment issues Michael Tokarev
@ 2015-01-15 11:55 ` Peter Maydell
  2015-01-15 12:08   ` Paolo Bonzini
  12 siblings, 1 reply; 15+ messages in thread
From: Peter Maydell @ 2015-01-15 11:55 UTC (permalink / raw)
  To: Michael Tokarev; +Cc: QEMU Trivial, Paolo Bonzini, QEMU Developers

On 15 January 2015 at 08:30, Michael Tokarev <mjt@tls.msk.ru> wrote:
> This is a next trivial-patches pull request, since the previous one
> which was at 2014-12-11 - 4 weeks ago.  Only 12 patches in 4 weeks.
> There's nothing exciting in there, but there are several (small)
> bugfixes.
>
> Please consider applying/pulling.

Applied, thanks.

> With the introduction of pbonzini's "misc" patches tree I'm not
> sure current trivial-patches is worth to keep.  Paolo does much
> better job in this area than me.

I'll leave that up to the two of you, but splitting the load
of review and testing seems to me like it would make sense.
In any case, thanks to both of you for the efforts you've
put in to this sort of patch curation -- I think it's really
important for the project.

thanks
-- PMM

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15
  2015-01-15 11:55 ` [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Peter Maydell
@ 2015-01-15 12:08   ` Paolo Bonzini
  0 siblings, 0 replies; 15+ messages in thread
From: Paolo Bonzini @ 2015-01-15 12:08 UTC (permalink / raw)
  To: Peter Maydell, Michael Tokarev; +Cc: QEMU Trivial, QEMU Developers



On 15/01/2015 12:55, Peter Maydell wrote:
> > With the introduction of pbonzini's "misc" patches tree I'm not
> > sure current trivial-patches is worth to keep.  Paolo does much
> > better job in this area than me.
>
> I'll leave that up to the two of you, but splitting the load
> of review and testing seems to me like it would make sense.
> In any case, thanks to both of you for the efforts you've
> put in to this sort of patch curation -- I think it's really
> important for the project.

The trivial patches tree is still very useful.

The meaning of "misc patches" is almost always "I don't want to send a
separate pull request because this is touching too many areas"
(typically three or more among: qemu-char, SCSI, KVM, x86, and stuff
that I touched and got a Reviewed-by).

5-10% of the "misc patches", instead, correspond to unmaintained
areas---basically the patches that Anthony used to apply directly---but
luckily by now there are very few of those.

In any case, most patches in the "misc patches" pull request are not
trivial.  They could very well break something and if they do I
sometimes get to fix them... which is why I'm very happy that someone
else picks up the _really_ trivial patches!

So, the trivial patches tree is still as useful as it has always been,
and I use it myself relatively often for patches outside the areas I
maintain.

Paolo

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2015-01-15 12:09 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15  8:30 [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 01/12] vt82c686: avoid out-of-bounds read Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 02/12] tests/hd-geo-test.c: Remove unused test_image variable Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 03/12] translate-all: Mark map_exec() with the 'unused' attribute Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 04/12] migration/qemu-file.c: Don't shift left into sign bit Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 05/12] target-tricore: Fix new typos Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 06/12] target-arm: Fix typo in comment (seperately -> separately) Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 07/12] misc: Fix new typos in comments Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 08/12] Do not hang on full PTY Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 09/12] target-openrisc: bugfix for dec_sys to decode instructions correctly Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 10/12] Makefile: Remove config.status and common.env during 'make distclean' Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 11/12] blizzard: do not depend on VGA internals Michael Tokarev
2015-01-15  8:30 ` [Qemu-devel] [PULL 12/12] vl.c: fix some alignment issues Michael Tokarev
2015-01-15 11:55 ` [Qemu-devel] [PULL 00/12] Trivial patches for 2015-01-15 Peter Maydell
2015-01-15 12:08   ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).