All of lore.kernel.org
 help / color / mirror / Atom feed
* [PULL 0/9] Trivial branch for 7.0 patches
@ 2022-01-18 12:28 Laurent Vivier
  2022-01-18 12:28 ` [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Laurent Vivier
                   ` (9 more replies)
  0 siblings, 10 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier

The following changes since commit 6621441db50d5bae7e34dbd04bf3c57a27a71b32:

  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20220115' into staging (2022-01-16 20:12:23 +0000)

are available in the Git repository at:

  https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.0-pull-request

for you to fetch changes up to bfadf13f63d63d099bf2be14c9b1863f25a091a2:

  linux-user: Remove MAX_SIGQUEUE_SIZE (2022-01-18 12:44:44 +0100)

----------------------------------------------------------------
trivial patches pull request 20220118

Fix comments and typos
Add vmstate for ETRAX timers
Use ldst in megasas

----------------------------------------------------------------

Bernhard Beschow (1):
  softmmu: Provide a clue as to why device tree loading failed

Peter Maydell (4):
  qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ
  linux-user: Fix comment typo in arm cpu_loop code
  linux-user: Rename user_force_sig tracepoint to match function name
  linux-user: Return void from queue_signal()

Philippe Mathieu-Daudé (3):
  hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
  hw/scsi/megasas: Simplify using the ldst API
  tests: Fix typo in check-help output

Warner Losh (1):
  linux-user: Remove MAX_SIGQUEUE_SIZE

 hw/scsi/megasas.c          | 17 +++--------------
 hw/timer/etraxfs_timer.c   | 34 +++++++++++++++++++++++++++++++++-
 include/hw/qdev-core.h     |  2 +-
 linux-user/arm/cpu_loop.c  |  4 ++--
 linux-user/qemu.h          |  2 --
 linux-user/signal-common.h |  4 ++--
 linux-user/signal.c        |  7 +++----
 linux-user/trace-events    |  2 +-
 softmmu/device_tree.c      |  6 ++++--
 tests/Makefile.include     |  2 +-
 10 files changed, 50 insertions(+), 30 deletions(-)

-- 
2.34.1



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

* [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API Laurent Vivier
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Richard Henderson, Philippe Mathieu-Daudé,
	Laurent Vivier

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Add the vmstate for the ETRAX timers.
This is in theory a migration compatibility break
for the 'AXIS devboard 88' CRIS machine.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20211106105623.510868-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index 4ba662190de3..139e5b86a447 100644
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -26,6 +26,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/reset.h"
 #include "sysemu/runstate.h"
+#include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "hw/irq.h"
@@ -64,7 +65,7 @@ struct ETRAXTimerState {
     ptimer_state *ptimer_t1;
     ptimer_state *ptimer_wd;
 
-    int wd_hits;
+    uint32_t wd_hits;
 
     /* Control registers.  */
     uint32_t rw_tmr0_div;
@@ -83,6 +84,36 @@ struct ETRAXTimerState {
     uint32_t r_masked_intr;
 };
 
+static const VMStateDescription vmstate_etraxfs = {
+    .name = "etraxfs",
+    .version_id = 0,
+    .minimum_version_id = 0,
+    .fields = (VMStateField[]) {
+        VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState),
+        VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState),
+        VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState),
+
+        VMSTATE_UINT32(wd_hits, ETRAXTimerState),
+
+        VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState),
+        VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState),
+        VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState),
+
+        VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState),
+        VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState),
+        VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState),
+
+        VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState),
+
+        VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState),
+        VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState),
+        VMSTATE_UINT32(r_intr, ETRAXTimerState),
+        VMSTATE_UINT32(r_masked_intr, ETRAXTimerState),
+
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 static uint64_t
 timer_read(void *opaque, hwaddr addr, unsigned int size)
 {
@@ -357,6 +388,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass, void *data)
     ResettableClass *rc = RESETTABLE_CLASS(klass);
 
     dc->realize = etraxfs_timer_realize;
+    dc->vmsd = &vmstate_etraxfs;
     rc->phases.enter = etraxfs_timer_reset_enter;
     rc->phases.hold = etraxfs_timer_reset_hold;
 }
-- 
2.34.1



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

* [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
  2022-01-18 12:28 ` [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ Laurent Vivier
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Richard Henderson, Philippe Mathieu-Daudé,
	Laurent Vivier

From: Philippe Mathieu-Daudé <philmd@redhat.com>

This code is easier to review using the load/store API.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20211218111912.1499377-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 hw/scsi/megasas.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index dc9bbdb740e7..83c321ec208a 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -383,8 +383,7 @@ static int megasas_setup_inquiry(uint8_t *cdb, int pg, int len)
         cdb[1] = 0x1;
         cdb[2] = pg;
     }
-    cdb[3] = (len >> 8) & 0xff;
-    cdb[4] = (len & 0xff);
+    stw_be_p(&cdb[3], len);
     return len;
 }
 
@@ -400,18 +399,8 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba,
     } else {
         cdb[0] = READ_16;
     }
-    cdb[2] = (lba >> 56) & 0xff;
-    cdb[3] = (lba >> 48) & 0xff;
-    cdb[4] = (lba >> 40) & 0xff;
-    cdb[5] = (lba >> 32) & 0xff;
-    cdb[6] = (lba >> 24) & 0xff;
-    cdb[7] = (lba >> 16) & 0xff;
-    cdb[8] = (lba >> 8) & 0xff;
-    cdb[9] = (lba) & 0xff;
-    cdb[10] = (len >> 24) & 0xff;
-    cdb[11] = (len >> 16) & 0xff;
-    cdb[12] = (len >> 8) & 0xff;
-    cdb[13] = (len) & 0xff;
+    stq_be_p(&cdb[2], lba);
+    stl_be_p(&cdb[2 + 8], len);
 }
 
 /*
-- 
2.34.1



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

* [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
  2022-01-18 12:28 ` [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Laurent Vivier
  2022-01-18 12:28 ` [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 4/9] tests: Fix typo in check-help output Laurent Vivier
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Laurent Vivier

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

Fix a comment in qdev-core.h where we incorrectly referred
to TYPE_IRQ_SPLIT when we meant TYPE_SPLIT_IRQ.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220111172655.3546766-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 include/hw/qdev-core.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index d19c94175203..92c3d6520866 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -493,7 +493,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n);
  * qemu_irqs at once, or to connect multiple outbound GPIOs to the
  * same qemu_irq. (Warning: there is no assertion or other guard to
  * catch this error: the model will just not do the right thing.)
- * Instead, for fan-out you can use the TYPE_IRQ_SPLIT device: connect
+ * Instead, for fan-out you can use the TYPE_SPLIT_IRQ device: connect
  * a device's outbound GPIO to the splitter's input, and connect each
  * of the splitter's outputs to a different device.  For fan-in you
  * can use the TYPE_OR_IRQ device, which is a model of a logical OR
-- 
2.34.1



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

* [PULL 4/9] tests: Fix typo in check-help output
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (2 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed Laurent Vivier
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Philippe Mathieu-Daudé, Laurent Vivier

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Fix typo in 'make check-help' output.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220111175528.22294-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 tests/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 4c564cf7899e..3aba62240099 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -23,7 +23,7 @@ endif
 	@echo " $(MAKE) check-clean          Clean the tests and related data"
 	@echo
 	@echo "The following are useful for CI builds"
-	@echo " $(MAKE) check-build          Build most test binaris"
+	@echo " $(MAKE) check-build          Build most test binaries"
 	@echo " $(MAKE) get-vm-images        Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)"
 	@echo
 	@echo
-- 
2.34.1



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

* [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (3 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 4/9] tests: Fix typo in check-help output Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code Laurent Vivier
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Laurent Vivier, Philippe Mathieu-Daudé,
	Alistair Francis, Bernhard Beschow, David Gibson

From: Bernhard Beschow <shentey@gmail.com>

fdt_open_into() obligingly returns an error code in case the operation
failed. So be obliging as well and use it in the error message.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220116114649.40859-1-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 softmmu/device_tree.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c
index 3965c834ca62..31d106694048 100644
--- a/softmmu/device_tree.c
+++ b/softmmu/device_tree.c
@@ -60,7 +60,8 @@ void *create_device_tree(int *sizep)
     }
     ret = fdt_open_into(fdt, fdt, *sizep);
     if (ret) {
-        error_report("Unable to copy device tree in memory");
+        error_report("%s: Unable to copy device tree into memory: %s",
+                     __func__, fdt_strerror(ret));
         exit(1);
     }
 
@@ -104,7 +105,8 @@ void *load_device_tree(const char *filename_path, int *sizep)
 
     ret = fdt_open_into(fdt, fdt, dt_size);
     if (ret) {
-        error_report("Unable to copy device tree in memory");
+        error_report("%s: Unable to copy device tree into memory: %s",
+                     __func__, fdt_strerror(ret));
         goto fail;
     }
 
-- 
2.34.1



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

* [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (4 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name Laurent Vivier
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Peter Maydell, Laurent Vivier, Warner Losh

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

Fix a typo in a comment in the arm cpu_loop code.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20220114182535.3804783-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/arm/cpu_loop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index f153ab503a8a..032e1ffddfbd 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -434,8 +434,8 @@ void cpu_loop(CPUARMState *env)
             case 0x6: /* Access flag fault, level 2 */
             case 0x9: /* Domain fault, level 1 */
             case 0xb: /* Domain fault, level 2 */
-            case 0xd: /* Permision fault, level 1 */
-            case 0xf: /* Permision fault, level 2 */
+            case 0xd: /* Permission fault, level 1 */
+            case 0xf: /* Permission fault, level 2 */
                 si_signo = TARGET_SIGSEGV;
                 si_code = TARGET_SEGV_ACCERR;
                 break;
-- 
2.34.1



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

* [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (5 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 8/9] linux-user: Return void from queue_signal() Laurent Vivier
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Peter Maydell, Philippe Mathieu-Daudé, Laurent Vivier

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

In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig()
function to dump_core_and_abort(), but we forgot to rename the
associated tracepoint.  Rename the tracepoint to to match the
function it's called from.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220114153732.3767229-3-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/signal.c     | 2 +-
 linux-user/trace-events | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux-user/signal.c b/linux-user/signal.c
index f813b4f18e44..bfbbeab9ad2e 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -734,7 +734,7 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
     struct sigaction act;
 
     host_sig = target_to_host_signal(target_sig);
-    trace_user_force_sig(env, target_sig, host_sig);
+    trace_user_dump_core_and_abort(env, target_sig, host_sig);
     gdb_signalled(env, target_sig);
 
     /* dump core if supported by target binary format */
diff --git a/linux-user/trace-events b/linux-user/trace-events
index e7d2f54e9401..f33717f248af 100644
--- a/linux-user/trace-events
+++ b/linux-user/trace-events
@@ -9,7 +9,7 @@ user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
 user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64
-user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)"
+user_dump_core_and_abort(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)"
 user_handle_signal(void *env, int target_sig) "env=%p signal %d"
 user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d)"
 user_queue_signal(void *env, int target_sig) "env=%p signal %d"
-- 
2.34.1



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

* [PULL 8/9] linux-user: Return void from queue_signal()
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (6 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-18 12:28 ` [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE Laurent Vivier
  2022-01-19 11:48 ` [PULL 0/9] Trivial branch for 7.0 patches Peter Maydell
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Peter Maydell, Philippe Mathieu-Daudé, Laurent Vivier

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

The linux-user queue_signal() function always returns 1, and none of
its callers check the return value.  Give it a void return type
instead.

The return value is a leftover from the old pre-2016 linux-user
signal handling code, which really did have a queue of signals and so
might return a failure indication if too many signals were queued at
once.  The current design avoids having to ever have more than one
signal queued via queue_signal() at once, so it can never fail.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220114153732.3767229-4-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/signal-common.h | 4 ++--
 linux-user/signal.c        | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/linux-user/signal-common.h b/linux-user/signal-common.h
index 42aa479080b8..2113165a7583 100644
--- a/linux-user/signal-common.h
+++ b/linux-user/signal-common.h
@@ -59,8 +59,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,
 
 void process_pending_signals(CPUArchState *cpu_env);
 void signal_init(void);
-int queue_signal(CPUArchState *env, int sig, int si_type,
-                 target_siginfo_t *info);
+void queue_signal(CPUArchState *env, int sig, int si_type,
+                  target_siginfo_t *info);
 void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info);
 void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo);
 int target_to_host_signal(int sig);
diff --git a/linux-user/signal.c b/linux-user/signal.c
index bfbbeab9ad2e..32854bb3752d 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -780,8 +780,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig)
 
 /* queue a signal so that it will be send to the virtual CPU as soon
    as possible */
-int queue_signal(CPUArchState *env, int sig, int si_type,
-                 target_siginfo_t *info)
+void queue_signal(CPUArchState *env, int sig, int si_type,
+                  target_siginfo_t *info)
 {
     CPUState *cpu = env_cpu(env);
     TaskState *ts = cpu->opaque;
@@ -794,7 +794,6 @@ int queue_signal(CPUArchState *env, int sig, int si_type,
     ts->sync_signal.pending = sig;
     /* signal that a new signal is pending */
     qatomic_set(&ts->signal_pending, 1);
-    return 1; /* indicates that the signal was queued */
 }
 
 
-- 
2.34.1



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

* [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (7 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 8/9] linux-user: Return void from queue_signal() Laurent Vivier
@ 2022-01-18 12:28 ` Laurent Vivier
  2022-01-19 11:48 ` [PULL 0/9] Trivial branch for 7.0 patches Peter Maydell
  9 siblings, 0 replies; 13+ messages in thread
From: Laurent Vivier @ 2022-01-18 12:28 UTC (permalink / raw)
  To: qemu-devel
  Cc: qemu-trivial, Peter Maydell, Philippe Mathieu-Daudé,
	Warner Losh, Laurent Vivier

From: Warner Losh <imp@bsdimp.com>

It's been unused for 7 years since 907f5fddaa67 when linux-user stopped
queueing any signals.

Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220116204423.16133-2-imp@bsdimp.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/qemu.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 5c713fa8ab26..7910ce59cc8c 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -89,8 +89,6 @@ struct vm86_saved_state {
 #include "nwfpe/fpa11.h"
 #endif
 
-#define MAX_SIGQUEUE_SIZE 1024
-
 struct emulated_sigtable {
     int pending; /* true if signal is pending */
     target_siginfo_t info;
-- 
2.34.1



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

* Re: [PULL 0/9] Trivial branch for 7.0 patches
  2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
                   ` (8 preceding siblings ...)
  2022-01-18 12:28 ` [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE Laurent Vivier
@ 2022-01-19 11:48 ` Peter Maydell
  9 siblings, 0 replies; 13+ messages in thread
From: Peter Maydell @ 2022-01-19 11:48 UTC (permalink / raw)
  To: Laurent Vivier; +Cc: qemu-trivial, qemu-devel

On Tue, 18 Jan 2022 at 13:32, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 6621441db50d5bae7e34dbd04bf3c57a27a71b32:
>
>   Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios-20220115' into staging (2022-01-16 20:12:23 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.0-pull-request
>
> for you to fetch changes up to bfadf13f63d63d099bf2be14c9b1863f25a091a2:
>
>   linux-user: Remove MAX_SIGQUEUE_SIZE (2022-01-18 12:44:44 +0100)
>
> ----------------------------------------------------------------
> trivial patches pull request 20220118
>
> Fix comments and typos
> Add vmstate for ETRAX timers
> Use ldst in megasas


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.

-- PMM


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

* Re: [PULL 0/9] Trivial branch for 7.0 patches
  2021-12-17 20:10 Laurent Vivier
@ 2021-12-18  2:04 ` Richard Henderson
  0 siblings, 0 replies; 13+ messages in thread
From: Richard Henderson @ 2021-12-18  2:04 UTC (permalink / raw)
  To: Laurent Vivier, qemu-devel; +Cc: qemu-trivial

On 12/17/21 12:10 PM, Laurent Vivier wrote:
> The following changes since commit 29eb5c2c86f935b0e9700fad2ecfe8a32b011d57:
> 
>    Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2021-12-16 08:39:20 -0800)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.0-pull-request
> 
> for you to fetch changes up to ce2ff9cccf0c5f123f9d1e3d5e4fc07d1c2c159d:
> 
>    checkpatch: Do not allow deprecated g_memdup() (2021-12-17 11:57:35 +0100)
> 
> ----------------------------------------------------------------
> Trivial patches pull request 20211217
> 
> ----------------------------------------------------------------
> 
> Leonardo Garcia (1):
>    hw/virtio/vhost: Fix typo in comment.
> 
> Philippe Mathieu-Daudé (7):
>    configure: Symlink binaries using .exe suffix with MinGW
>    target/i386/kvm: Replace use of __u32 type
>    qemu-keymap: Add license in generated files
>    hw/avr: Realize AVRCPU qdev object using qdev_realize()
>    glib-compat: Introduce g_memdup2() wrapper
>    tests/qtest: Replace g_memdup() by g_memdup2()
>    checkpatch: Do not allow deprecated g_memdup()
> 
> Zhang Chen (1):
>    docs/block-replication.txt: Fix replication top-id command demo
> 
>   configure                   |  2 +-
>   docs/block-replication.txt  |  2 +-
>   hw/avr/atmega.c             |  2 +-
>   hw/virtio/vhost.c           |  2 +-
>   include/glib-compat.h       | 37 +++++++++++++++++++++++++++++++++++++
>   qemu-keymap.c               |  1 +
>   scripts/checkpatch.pl       |  5 +++++
>   target/i386/kvm/kvm.c       |  2 +-
>   tests/qtest/libqos/ahci.c   |  6 +++---
>   tests/qtest/libqos/qgraph.c |  2 +-
>   10 files changed, 52 insertions(+), 9 deletions(-)

Applied, thanks.


r~


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

* [PULL 0/9] Trivial branch for 7.0 patches
@ 2021-12-17 20:10 Laurent Vivier
  2021-12-18  2:04 ` Richard Henderson
  0 siblings, 1 reply; 13+ messages in thread
From: Laurent Vivier @ 2021-12-17 20:10 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier

The following changes since commit 29eb5c2c86f935b0e9700fad2ecfe8a32b011d57:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2021-12-16 08:39:20 -0800)

are available in the Git repository at:

  https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.0-pull-request

for you to fetch changes up to ce2ff9cccf0c5f123f9d1e3d5e4fc07d1c2c159d:

  checkpatch: Do not allow deprecated g_memdup() (2021-12-17 11:57:35 +0100)

----------------------------------------------------------------
Trivial patches pull request 20211217

----------------------------------------------------------------

Leonardo Garcia (1):
  hw/virtio/vhost: Fix typo in comment.

Philippe Mathieu-Daudé (7):
  configure: Symlink binaries using .exe suffix with MinGW
  target/i386/kvm: Replace use of __u32 type
  qemu-keymap: Add license in generated files
  hw/avr: Realize AVRCPU qdev object using qdev_realize()
  glib-compat: Introduce g_memdup2() wrapper
  tests/qtest: Replace g_memdup() by g_memdup2()
  checkpatch: Do not allow deprecated g_memdup()

Zhang Chen (1):
  docs/block-replication.txt: Fix replication top-id command demo

 configure                   |  2 +-
 docs/block-replication.txt  |  2 +-
 hw/avr/atmega.c             |  2 +-
 hw/virtio/vhost.c           |  2 +-
 include/glib-compat.h       | 37 +++++++++++++++++++++++++++++++++++++
 qemu-keymap.c               |  1 +
 scripts/checkpatch.pl       |  5 +++++
 target/i386/kvm/kvm.c       |  2 +-
 tests/qtest/libqos/ahci.c   |  6 +++---
 tests/qtest/libqos/qgraph.c |  2 +-
 10 files changed, 52 insertions(+), 9 deletions(-)

-- 
2.33.1



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

end of thread, other threads:[~2022-01-19 12:23 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-18 12:28 [PULL 0/9] Trivial branch for 7.0 patches Laurent Vivier
2022-01-18 12:28 ` [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Laurent Vivier
2022-01-18 12:28 ` [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API Laurent Vivier
2022-01-18 12:28 ` [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ Laurent Vivier
2022-01-18 12:28 ` [PULL 4/9] tests: Fix typo in check-help output Laurent Vivier
2022-01-18 12:28 ` [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed Laurent Vivier
2022-01-18 12:28 ` [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code Laurent Vivier
2022-01-18 12:28 ` [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name Laurent Vivier
2022-01-18 12:28 ` [PULL 8/9] linux-user: Return void from queue_signal() Laurent Vivier
2022-01-18 12:28 ` [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE Laurent Vivier
2022-01-19 11:48 ` [PULL 0/9] Trivial branch for 7.0 patches Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2021-12-17 20:10 Laurent Vivier
2021-12-18  2:04 ` Richard Henderson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.