qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27
@ 2015-07-27 19:54 Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset Michael Tokarev
                   ` (10 more replies)
  0 siblings, 11 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev

There are a few patches from the trivial queue which are, I think,
suitable for 2.4.  These are fixing or adding docs/comments, are
minor/trivial cleanups, or small bugfixes.

Please consider applying for 2.4.

The rest of the trivial tree will be pushed once 2.5 development
window will be open, hopefully  I will be able to do that by when.

/mjt

The following changes since commit edec47cfef96209987cb7922286cb384916aae02:

  main-loop: fix qemu_notify_event for aio_notify optimization (2015-07-27 17:12:19 +0100)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-07-27

for you to fetch changes up to 226d007dbd75ec8d0f12d0f9e1ce66caf55d49e4:

  gdbstub: Set current CPU on interruptions (2015-07-27 22:46:16 +0300)

----------------------------------------------------------------
trivial patches for 2015-07-27

----------------------------------------------------------------
Jan Kiszka (1):
      gdbstub: Set current CPU on interruptions

Johannes Schlatow (1):
      Fix Cortex-A9 global timer

Kamalesh Babulal (1):
      device_tree: Fix a typo

Laszlo Ersek (2):
      hw/acpi/ich9: clear smi_en on reset
      hw/acpi/ich9: clean up stale comment about KVM not supporting SMM

Marc-André Lureau (2):
      vmstate: remove unused declaration
      qapi: add missing @

Michal Privoznik (1):
      gitignore: Ignore shader generated files

Peter Maydell (1):
      qemu-common.h: Document cutils.c string functions

Stefan Weil (1):
      make: Clean build messages

 .gitignore                  |   2 +
 Makefile                    |   2 +-
 device_tree.c               |   2 +-
 gdbstub.c                   |   1 +
 hw/acpi/ich9.c              |   4 +-
 include/hw/timer/a9gtimer.h |   2 +-
 include/migration/vmstate.h |   3 --
 include/qemu-common.h       | 114 +++++++++++++++++++++++++++++++++++++++++++-
 qapi-schema.json            |   2 +-
 tests/Makefile              |   4 +-
 10 files changed, 124 insertions(+), 12 deletions(-)

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

* [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 20:50   ` Michael S. Tsirkin
  2015-07-27 19:54 ` [Qemu-devel] [PULL 02/10] hw/acpi/ich9: clean up stale comment about KVM not supporting SMM Michael Tokarev
                   ` (9 subsequent siblings)
  10 siblings, 1 reply; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel
  Cc: Michael S. Tsirkin, qemu-trivial, Michael Tokarev, Gerd Hoffmann,
	Paolo Bonzini, Igor Mammedov, Laszlo Ersek

From: Laszlo Ersek <lersek@redhat.com>

Otherwise on reboot firmware might think (due to APMC_EN remaining set
from the previous boot) that SMI support is absent.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/acpi/ich9.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index f04f6dc..8da5a2d 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -221,6 +221,7 @@ static void pm_reset(void *opaque)
     acpi_pm_tmr_reset(&pm->acpi_regs);
     acpi_gpe_reset(&pm->acpi_regs);
 
+    pm->smi_en = 0;
     if (!pm->smm_enabled) {
         /* Mark SMM as already inited to prevent SMM from running. KVM does not
          * support SMM mode. */
-- 
2.1.4

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

* [Qemu-devel] [PULL 02/10] hw/acpi/ich9: clean up stale comment about KVM not supporting SMM
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 03/10] device_tree: Fix a typo Michael Tokarev
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel
  Cc: Michael S. Tsirkin, qemu-trivial, Michael Tokarev, Gerd Hoffmann,
	Paolo Bonzini, Igor Mammedov, Laszlo Ersek

From: Laszlo Ersek <lersek@redhat.com>

Commit fba72476c6 ("ich9: add smm_enabled field and arguments") detached
SMM availability from kvm_enabled(). However, the comment in pm_reset()
was not updated; let's do it now.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 hw/acpi/ich9.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 8da5a2d..1c7fcfa 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -223,8 +223,7 @@ static void pm_reset(void *opaque)
 
     pm->smi_en = 0;
     if (!pm->smm_enabled) {
-        /* Mark SMM as already inited to prevent SMM from running. KVM does not
-         * support SMM mode. */
+        /* Mark SMM as already inited to prevent SMM from running. */
         pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN;
     }
     pm->smi_en_wmask = ~0;
-- 
2.1.4

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

* [Qemu-devel] [PULL 03/10] device_tree: Fix a typo
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 02/10] hw/acpi/ich9: clean up stale comment about KVM not supporting SMM Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 04/10] qemu-common.h: Document cutils.c string functions Michael Tokarev
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Kamalesh Babulal

From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>

Fix spelling of 'allocting' -> 'allocating'.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 device_tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_tree.c b/device_tree.c
index d2de580..a9f5f8e 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -241,7 +241,7 @@ uint32_t qemu_fdt_alloc_phandle(void *fdt)
 
     /*
      * We need to find out if the user gave us special instruction at
-     * which phandle id to start allocting phandles.
+     * which phandle id to start allocating phandles.
      */
     if (!phandle) {
         phandle = machine_phandle_start(current_machine);
-- 
2.1.4

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

* [Qemu-devel] [PULL 04/10] qemu-common.h: Document cutils.c string functions
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (2 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 03/10] device_tree: Fix a typo Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 05/10] make: Clean build messages Michael Tokarev
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Michael Tokarev

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

Add documentation comments for various utility string functions
which we have implemented in util/cutils.c:
 pstrcpy()
 strpadcpy()
 pstrcat()
 strstart()
 stristart()
 qemu_strnlen()
 qemu_strsep()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/qemu-common.h | 114 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 1 deletion(-)

diff --git a/include/qemu-common.h b/include/qemu-common.h
index 237d654..fb3da6c 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -148,13 +148,125 @@ static inline bool is_help_option(const char *s)
     return !strcmp(s, "?") || !strcmp(s, "help");
 }
 
-/* cutils.c */
+/* util/cutils.c */
+/**
+ * pstrcpy:
+ * @buf: buffer to copy string into
+ * @buf_size: size of @buf in bytes
+ * @str: string to copy
+ *
+ * Copy @str into @buf, including the trailing NUL, but do not
+ * write more than @buf_size bytes. The resulting buffer is
+ * always NUL terminated (even if the source string was too long).
+ * If @buf_size is zero or negative then no bytes are copied.
+ *
+ * This function is similar to strncpy(), but avoids two of that
+ * function's problems:
+ *  * if @str fits in the buffer, pstrcpy() does not zero-fill the
+ *    remaining space at the end of @buf
+ *  * if @str is too long, pstrcpy() will copy the first @buf_size-1
+ *    bytes and then add a NUL
+ */
 void pstrcpy(char *buf, int buf_size, const char *str);
+/**
+ * strpadcpy:
+ * @buf: buffer to copy string into
+ * @buf_size: size of @buf in bytes
+ * @str: string to copy
+ * @pad: character to pad the remainder of @buf with
+ *
+ * Copy @str into @buf (but *not* its trailing NUL!), and then pad the
+ * rest of the buffer with the @pad character. If @str is too large
+ * for the buffer then it is truncated, so that @buf contains the
+ * first @buf_size characters of @str, with no terminator.
+ */
 void strpadcpy(char *buf, int buf_size, const char *str, char pad);
+/**
+ * pstrcat:
+ * @buf: buffer containing existing string
+ * @buf_size: size of @buf in bytes
+ * @s: string to concatenate to @buf
+ *
+ * Append a copy of @s to the string already in @buf, but do not
+ * allow the buffer to overflow. If the existing contents of @buf
+ * plus @str would total more than @buf_size bytes, then write
+ * as much of @str as will fit followed by a NUL terminator.
+ *
+ * @buf must already contain a NUL-terminated string, or the
+ * behaviour is undefined.
+ *
+ * Returns: @buf.
+ */
 char *pstrcat(char *buf, int buf_size, const char *s);
+/**
+ * strstart:
+ * @str: string to test
+ * @val: prefix string to look for
+ * @ptr: NULL, or pointer to be written to indicate start of
+ *       the remainder of the string
+ *
+ * Test whether @str starts with the prefix @val.
+ * If it does (including the degenerate case where @str and @val
+ * are equal) then return true. If @ptr is not NULL then a
+ * pointer to the first character following the prefix is written
+ * to it. If @val is not a prefix of @str then return false (and
+ * @ptr is not written to).
+ *
+ * Returns: true if @str starts with prefix @val, false otherwise.
+ */
 int strstart(const char *str, const char *val, const char **ptr);
+/**
+ * stristart:
+ * @str: string to test
+ * @val: prefix string to look for
+ * @ptr: NULL, or pointer to be written to indicate start of
+ *       the remainder of the string
+ *
+ * Test whether @str starts with the case-insensitive prefix @val.
+ * This function behaves identically to strstart(), except that the
+ * comparison is made after calling qemu_toupper() on each pair of
+ * characters.
+ *
+ * Returns: true if @str starts with case-insensitive prefix @val,
+ *          false otherwise.
+ */
 int stristart(const char *str, const char *val, const char **ptr);
+/**
+ * qemu_strnlen:
+ * @s: string
+ * @max_len: maximum number of bytes in @s to scan
+ *
+ * Return the length of the string @s, like strlen(), but do not
+ * examine more than @max_len bytes of the memory pointed to by @s.
+ * If no NUL terminator is found within @max_len bytes, then return
+ * @max_len instead.
+ *
+ * This function has the same behaviour as the POSIX strnlen()
+ * function.
+ *
+ * Returns: length of @s in bytes, or @max_len, whichever is smaller.
+ */
 int qemu_strnlen(const char *s, int max_len);
+/**
+ * qemu_strsep:
+ * @input: pointer to string to parse
+ * @delim: string containing delimiter characters to search for
+ *
+ * Locate the first occurrence of any character in @delim within
+ * the string referenced by @input, and replace it with a NUL.
+ * The location of the next character after the delimiter character
+ * is stored into @input.
+ * If the end of the string was reached without finding a delimiter
+ * character, then NULL is stored into @input.
+ * If @input points to a NULL pointer on entry, return NULL.
+ * The return value is always the original value of *@input (and
+ * so now points to a NUL-terminated string corresponding to the
+ * part of the input up to the first delimiter).
+ *
+ * This function has the same behaviour as the BSD strsep() function.
+ *
+ * Returns: the pointer originally in @input.
+ */
 char *qemu_strsep(char **input, const char *delim);
 time_t mktimegm(struct tm *tm);
 int qemu_fls(int i);
-- 
2.1.4

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

* [Qemu-devel] [PULL 05/10] make: Clean build messages
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (3 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 04/10] qemu-common.h: Document cutils.c string functions Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 06/10] vmstate: remove unused declaration Michael Tokarev
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Michael Tokarev

From: Stefan Weil <sw@weilnetz.de>

We want to have uniform build messages, so fix some messages
which did not follow the standard pattern.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 Makefile       | 2 +-
 tests/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c9be643..340d9c8 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ endif
 	 else \
 	  mv $@.tmp $@; \
 	  cp -p $@ $@.old; \
-	 fi, "  GEN  $@");
+	 fi, "  GEN   $@");
 
 defconfig:
 	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)
diff --git a/tests/Makefile b/tests/Makefile
index 8d26736..7494582 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -487,10 +487,10 @@ check-report-unit.xml: $(check-unit-y)
 # Reports and overall runs
 
 check-report.xml: $(patsubst %,check-report-qtest-%.xml, $(QTEST_TARGETS)) check-report-unit.xml
-	$(call quiet-command,$(SRC_PATH)/scripts/gtester-cat $^ > $@, "  GEN    $@")
+	$(call quiet-command,$(SRC_PATH)/scripts/gtester-cat $^ > $@, "  GEN   $@")
 
 check-report.html: check-report.xml
-	$(call quiet-command,gtester-report $< > $@, "  GEN    $@")
+	$(call quiet-command,gtester-report $< > $@, "  GEN   $@")
 
 
 # Other tests
-- 
2.1.4

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

* [Qemu-devel] [PULL 06/10] vmstate: remove unused declaration
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (4 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 05/10] make: Clean build messages Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 07/10] gitignore: Ignore shader generated files Michael Tokarev
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Marc-André Lureau

From: Marc-André Lureau <marcandre.lureau@gmail.com>

Since 38e0735e, register_device_unmigratable() has been removed

Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/migration/vmstate.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index f51ff69..2e5a97d 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -75,9 +75,6 @@ int register_savevm_live(DeviceState *dev,
                          void *opaque);
 
 void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);
-void register_device_unmigratable(DeviceState *dev, const char *idstr,
-                                                                void *opaque);
-
 
 typedef struct VMStateInfo VMStateInfo;
 typedef struct VMStateDescription VMStateDescription;
-- 
2.1.4

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

* [Qemu-devel] [PULL 07/10] gitignore: Ignore shader generated files
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (5 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 06/10] vmstate: remove unused declaration Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 08/10] Fix Cortex-A9 global timer Michael Tokarev
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michal Privoznik, Michael Tokarev

From: Michal Privoznik <mprivozn@redhat.com>

As of d98bc0b65 there are two files that are automatically generated:
ui/shader/texture-blit-frag.h and /ui/shader/texture-blit-vert.h. None
of them is wanted to be tracked by git. Put them into the ignore file
then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index aed0e1f..61bc492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,8 @@
 /trace/generated-tcg-tracers.h
 /trace/generated-ust-provider.h
 /trace/generated-ust.c
+/ui/shader/texture-blit-frag.h
+/ui/shader/texture-blit-vert.h
 /libcacard/trace/generated-tracers.c
 *-timestamp
 /*-softmmu
-- 
2.1.4

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

* [Qemu-devel] [PULL 08/10] Fix Cortex-A9 global timer
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (6 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 07/10] gitignore: Ignore shader generated files Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 09/10] qapi: add missing @ Michael Tokarev
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Johannes Schlatow

From: Johannes Schlatow <schlatow@ida.ing.tu-bs.de>

The auto increment bit of the timer control register was wrongly
defined.

See Cortex-A9 MPcore Technical Reference Manual, Section 4.4.2.

Signed-off-by: Johannes Schlatow <schlatow@ida.ing.tu-bs.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 include/hw/timer/a9gtimer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/timer/a9gtimer.h b/include/hw/timer/a9gtimer.h
index b88c02a..98d8e0a 100644
--- a/include/hw/timer/a9gtimer.h
+++ b/include/hw/timer/a9gtimer.h
@@ -37,7 +37,7 @@
 #define R_CONTROL_TIMER_ENABLE      (1 << 0)
 #define R_CONTROL_COMP_ENABLE       (1 << 1)
 #define R_CONTROL_IRQ_ENABLE        (1 << 2)
-#define R_CONTROL_AUTO_INCREMENT    (1 << 2)
+#define R_CONTROL_AUTO_INCREMENT    (1 << 3)
 #define R_CONTROL_PRESCALER_SHIFT   8
 #define R_CONTROL_PRESCALER_LEN     8
 #define R_CONTROL_PRESCALER_MASK    (((1 << R_CONTROL_PRESCALER_LEN) - 1) << \
-- 
2.1.4

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

* [Qemu-devel] [PULL 09/10] qapi: add missing @
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (7 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 08/10] Fix Cortex-A9 global timer Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-27 19:54 ` [Qemu-devel] [PULL 10/10] gdbstub: Set current CPU on interruptions Michael Tokarev
  2015-07-28 12:22 ` [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Peter Maydell
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Marc-André Lureau, Michael Tokarev

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 qapi-schema.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index a0a45f7..4342a08 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -15,7 +15,7 @@
 { 'include': 'qapi/trace.json' }
 
 ##
-# LostTickPolicy:
+# @LostTickPolicy:
 #
 # Policy for handling lost ticks in timer devices.
 #
-- 
2.1.4

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

* [Qemu-devel] [PULL 10/10] gdbstub: Set current CPU on interruptions
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (8 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 09/10] qapi: add missing @ Michael Tokarev
@ 2015-07-27 19:54 ` Michael Tokarev
  2015-07-28 12:22 ` [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Peter Maydell
  10 siblings, 0 replies; 14+ messages in thread
From: Michael Tokarev @ 2015-07-27 19:54 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Jan Kiszka, Michael Tokarev

From: Jan Kiszka <jan.kiszka@siemens.com>

gdb expects that the thread ID for c and g-class operations is set to
the CPU we provide when reporting VM stop conditions. If the stub is
still tuned to a different CPU, the wrong information is delivered to
the gdb frontend.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 gdbstub.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdbstub.c b/gdbstub.c
index 92b2f81..ffe7e6e 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -1285,6 +1285,7 @@ static void gdb_vm_state_change(void *opaque, int running, RunState state)
         ret = GDB_SIGNAL_UNKNOWN;
         break;
     }
+    gdb_set_stop_cpu(cpu);
     snprintf(buf, sizeof(buf), "T%02xthread:%02x;", ret, cpu_index(cpu));
 
 send_packet:
-- 
2.1.4

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

* Re: [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset
  2015-07-27 19:54 ` [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset Michael Tokarev
@ 2015-07-27 20:50   ` Michael S. Tsirkin
  2015-07-27 20:54     ` Michael S. Tsirkin
  0 siblings, 1 reply; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-07-27 20:50 UTC (permalink / raw)
  To: Michael Tokarev
  Cc: qemu-trivial, qemu-devel, Gerd Hoffmann, Paolo Bonzini,
	Igor Mammedov, Laszlo Ersek

On Mon, Jul 27, 2015 at 10:54:04PM +0300, Michael Tokarev wrote:
> From: Laszlo Ersek <lersek@redhat.com>
> 
> Otherwise on reboot firmware might think (due to APMC_EN remaining set
> from the previous boot) that SMI support is absent.
> 
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: qemu-trivial@nongnu.org
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


Confused.  Why are you merging these patches through your tree?
I was preparing a pull request myself, while likely git
will figure it out fine, this commit will appear twice in
history and it's kind of messy.

I guess I could drop this - but it's more work ...


> ---
>  hw/acpi/ich9.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> index f04f6dc..8da5a2d 100644
> --- a/hw/acpi/ich9.c
> +++ b/hw/acpi/ich9.c
> @@ -221,6 +221,7 @@ static void pm_reset(void *opaque)
>      acpi_pm_tmr_reset(&pm->acpi_regs);
>      acpi_gpe_reset(&pm->acpi_regs);
>  
> +    pm->smi_en = 0;
>      if (!pm->smm_enabled) {
>          /* Mark SMM as already inited to prevent SMM from running. KVM does not
>           * support SMM mode. */
> -- 
> 2.1.4

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

* Re: [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset
  2015-07-27 20:50   ` Michael S. Tsirkin
@ 2015-07-27 20:54     ` Michael S. Tsirkin
  0 siblings, 0 replies; 14+ messages in thread
From: Michael S. Tsirkin @ 2015-07-27 20:54 UTC (permalink / raw)
  To: Michael Tokarev
  Cc: qemu-trivial, qemu-devel, Gerd Hoffmann, Paolo Bonzini,
	Igor Mammedov, Laszlo Ersek

On Mon, Jul 27, 2015 at 11:50:08PM +0300, Michael S. Tsirkin wrote:
> On Mon, Jul 27, 2015 at 10:54:04PM +0300, Michael Tokarev wrote:
> > From: Laszlo Ersek <lersek@redhat.com>
> > 
> > Otherwise on reboot firmware might think (due to APMC_EN remaining set
> > from the previous boot) that SMI support is absent.
> > 
> > Cc: "Michael S. Tsirkin" <mst@redhat.com>
> > Cc: Igor Mammedov <imammedo@redhat.com>
> > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: qemu-trivial@nongnu.org
> > Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> 
> 
> Confused.  Why are you merging these patches through your tree?
> I was preparing a pull request myself, while likely git
> will figure it out fine, this commit will appear twice in
> history and it's kind of messy.
> 
> I guess I could drop this - but it's more work ...
> 

Oh I see it's because Laszlo said in the cover letter
they are trivial. Never mind.

> > ---
> >  hw/acpi/ich9.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
> > index f04f6dc..8da5a2d 100644
> > --- a/hw/acpi/ich9.c
> > +++ b/hw/acpi/ich9.c
> > @@ -221,6 +221,7 @@ static void pm_reset(void *opaque)
> >      acpi_pm_tmr_reset(&pm->acpi_regs);
> >      acpi_gpe_reset(&pm->acpi_regs);
> >  
> > +    pm->smi_en = 0;
> >      if (!pm->smm_enabled) {
> >          /* Mark SMM as already inited to prevent SMM from running. KVM does not
> >           * support SMM mode. */
> > -- 
> > 2.1.4

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

* Re: [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27
  2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
                   ` (9 preceding siblings ...)
  2015-07-27 19:54 ` [Qemu-devel] [PULL 10/10] gdbstub: Set current CPU on interruptions Michael Tokarev
@ 2015-07-28 12:22 ` Peter Maydell
  10 siblings, 0 replies; 14+ messages in thread
From: Peter Maydell @ 2015-07-28 12:22 UTC (permalink / raw)
  To: Michael Tokarev; +Cc: QEMU Trivial, QEMU Developers

On 27 July 2015 at 20:54, Michael Tokarev <mjt@tls.msk.ru> wrote:
> There are a few patches from the trivial queue which are, I think,
> suitable for 2.4.  These are fixing or adding docs/comments, are
> minor/trivial cleanups, or small bugfixes.
>
> Please consider applying for 2.4.
>
> The rest of the trivial tree will be pushed once 2.5 development
> window will be open, hopefully  I will be able to do that by when.
>
> /mjt
>
> The following changes since commit edec47cfef96209987cb7922286cb384916aae02:
>
>   main-loop: fix qemu_notify_event for aio_notify optimization (2015-07-27 17:12:19 +0100)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2015-07-27
>
> for you to fetch changes up to 226d007dbd75ec8d0f12d0f9e1ce66caf55d49e4:
>
>   gdbstub: Set current CPU on interruptions (2015-07-27 22:46:16 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2015-07-27

Applied, thanks.

-- PMM

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

end of thread, other threads:[~2015-07-28 12:23 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-27 19:54 [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 01/10] hw/acpi/ich9: clear smi_en on reset Michael Tokarev
2015-07-27 20:50   ` Michael S. Tsirkin
2015-07-27 20:54     ` Michael S. Tsirkin
2015-07-27 19:54 ` [Qemu-devel] [PULL 02/10] hw/acpi/ich9: clean up stale comment about KVM not supporting SMM Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 03/10] device_tree: Fix a typo Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 04/10] qemu-common.h: Document cutils.c string functions Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 05/10] make: Clean build messages Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 06/10] vmstate: remove unused declaration Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 07/10] gitignore: Ignore shader generated files Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 08/10] Fix Cortex-A9 global timer Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 09/10] qapi: add missing @ Michael Tokarev
2015-07-27 19:54 ` [Qemu-devel] [PULL 10/10] gdbstub: Set current CPU on interruptions Michael Tokarev
2015-07-28 12:22 ` [Qemu-devel] [PULL for-2.4 00/10] Trivial patches for 2015-07-27 Peter Maydell

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).