From patchwork Sun Mar 24 16:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="PjcmxB34"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3ZB36Gfz9sQv for ; Mon, 25 Mar 2019 04:01:06 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Ua-0001Hg-EE for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 13:01:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qe-0006aG-8u for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mh-0005ij-Me for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:58 -0400 Received: from m50-112.126.com ([123.125.50.112]:38524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mg-0005hA-Lb for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=trP2SvK1cnJI0vOoq1 aIDU47vOkxDAbsV1gvMz6co4w=; b=PjcmxB34w3FWwmldrkkU7rS2IuYGFbwum1 ra7NJgi8/GanXLNj0zYS1ZkfcRhFjKkw//MpokSO4nTF/3HkEP0pj2kPCZ7oTa7c sgANe+NovpHAud03BUk0LefytuG4Oz6cT3bxzIAgqLFYEs68rqT2whT8NKcBTHF3 bAoXLz76E= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S3; Mon, 25 Mar 2019 00:52:37 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:51:56 +0800 Message-Id: <20190324165206.25766-2-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S3 X-Coremail-Antispam: 1Uf129KBjvAXoWfArWfJFW3ZF1rAFWfJF1DWrg_yoW5JFWrGo WrGF15ta4ruF1UJasagFnrta47XryUXrWxAr4rGFnrGF1vvrWkuFyrJwsxJFWxuaySg3s5 GFyxXry5urs2v3Wfn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUI6pBUUUUU X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaRaBIVpD8EOorQAAsw X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 01/11] qemu_thread: make qemu_thread_create() take Error ** argument X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li qemu_thread_create() abort()s on error. Not nice. Give it a return value and an Error ** argument, so it can return success/failure. Considering qemu_thread_create() is quite widely used in qemu, split this into two steps: this patch passes the &error_abort to qemu_thread_create() everywhere, and the next 10 patches will improve on &error_abort for callers who need. To differentiate callers who need the improvement, temporarily add the "TODO:" comment for them. Cc: Markus Armbruster Cc: Paolo Bonzini Signed-off-by: Fei Li Reviewed-by: Markus Armbruster --- cpus.c | 23 +++++++++++++++-------- dump.c | 3 ++- hw/misc/edu.c | 4 +++- hw/ppc/spapr_hcall.c | 4 +++- hw/rdma/rdma_backend.c | 3 ++- hw/usb/ccid-card-emulated.c | 5 +++-- include/qemu/thread.h | 6 +++--- io/task.c | 3 ++- iothread.c | 3 ++- migration/migration.c | 11 ++++++++--- migration/postcopy-ram.c | 4 +++- migration/ram.c | 12 ++++++++---- migration/savevm.c | 3 ++- tests/atomic_add-bench.c | 3 ++- tests/iothread.c | 2 +- tests/qht-bench.c | 3 ++- tests/rcutorture.c | 3 ++- tests/test-aio.c | 2 +- tests/test-rcu-list.c | 3 ++- ui/vnc-jobs.c | 6 ++++-- util/compatfd.c | 6 ++++-- util/oslib-posix.c | 3 ++- util/qemu-thread-posix.c | 30 +++++++++++++++++++++++------- util/qemu-thread-win32.c | 13 ++++++++++--- util/rcu.c | 3 ++- util/thread-pool.c | 4 +++- 26 files changed, 114 insertions(+), 51 deletions(-) diff --git a/cpus.c b/cpus.c index e83f72b48b..2c70c06da8 100644 --- a/cpus.c +++ b/cpus.c @@ -1962,15 +1962,17 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/TCG", cpu->cpu_index); + /* TODO: let the callers handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_tcg_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); } else { /* share a single thread for all cpus with TCG */ snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "ALL CPUs/TCG"); + /* TODO: let the callers handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_tcg_rr_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); single_tcg_halt_cond = cpu->halt_cond; single_tcg_cpu_thread = cpu->thread; @@ -1998,8 +2000,9 @@ static void qemu_hax_start_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX", cpu->cpu_index); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_hax_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); #ifdef _WIN32 cpu->hThread = qemu_thread_get_handle(cpu->thread); #endif @@ -2014,8 +2017,9 @@ static void qemu_kvm_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/KVM", cpu->cpu_index); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_kvm_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); } static void qemu_hvf_start_vcpu(CPUState *cpu) @@ -2032,8 +2036,9 @@ static void qemu_hvf_start_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HVF", cpu->cpu_index); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_hvf_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); } static void qemu_whpx_start_vcpu(CPUState *cpu) @@ -2045,8 +2050,9 @@ static void qemu_whpx_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/WHPX", cpu->cpu_index); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_whpx_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); + cpu, QEMU_THREAD_JOINABLE, &error_abort); #ifdef _WIN32 cpu->hThread = qemu_thread_get_handle(cpu->thread); #endif @@ -2061,8 +2067,9 @@ static void qemu_dummy_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY", cpu->cpu_index); - qemu_thread_create(cpu->thread, thread_name, qemu_dummy_cpu_thread_fn, cpu, - QEMU_THREAD_JOINABLE); + /* TODO: let the further caller handle the error instead of abort() here */ + qemu_thread_create(cpu->thread, thread_name, qemu_dummy_cpu_thread_fn, + cpu, QEMU_THREAD_JOINABLE, &error_abort); } void qemu_init_vcpu(CPUState *cpu) diff --git a/dump.c b/dump.c index 107a67165a..3401078af4 100644 --- a/dump.c +++ b/dump.c @@ -2021,8 +2021,9 @@ void qmp_dump_guest_memory(bool paging, const char *file, if (detach_p) { /* detached dump */ s->detached = true; + /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(&s->dump_thread, "dump_thread", dump_thread, - s, QEMU_THREAD_DETACHED); + s, QEMU_THREAD_DETACHED, &error_abort); } else { /* sync dump */ dump_process(s, errp); diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 91af452c9e..21adbfddce 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -28,6 +28,7 @@ #include "hw/pci/msi.h" #include "qemu/timer.h" #include "qemu/main-loop.h" /* iothread mutex */ +#include "qapi/error.h" #include "qapi/visitor.h" #define TYPE_PCI_EDU_DEVICE "edu" @@ -355,8 +356,9 @@ static void pci_edu_realize(PCIDevice *pdev, Error **errp) qemu_mutex_init(&edu->thr_mutex); qemu_cond_init(&edu->thr_cond); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&edu->thread, "edu", edu_fact_thread, - edu, QEMU_THREAD_JOINABLE); + edu, QEMU_THREAD_JOINABLE, &error_abort); memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, "edu-mmio", 1 * MiB); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 8a736797b9..900b71f4a6 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -507,8 +507,10 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, pending->shift = shift; pending->ret = H_HARDWARE; + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&pending->thread, "sPAPR HPT prepare", - hpt_prepare_thread, pending, QEMU_THREAD_DETACHED); + hpt_prepare_thread, pending, + QEMU_THREAD_DETACHED, &error_abort); spapr->pending_hpt = pending; diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index d1660b6474..3149105cce 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -281,7 +281,8 @@ static void start_comp_thread(RdmaBackendDev *backend_dev) ibv_get_device_name(backend_dev->ib_dev)); backend_dev->comp_thread.run = true; qemu_thread_create(&backend_dev->comp_thread.thread, thread_name, - comp_handler_thread, backend_dev, QEMU_THREAD_DETACHED); + comp_handler_thread, backend_dev, + QEMU_THREAD_DETACHED, &error_abort); } void rdma_backend_register_comp_handler(void (*handler)(void *ctx, diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 963373ba95..0b170f6328 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -544,10 +544,11 @@ static void emulated_realize(CCIDCardState *base, Error **errp) error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_CCID); goto out2; } + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, - card, QEMU_THREAD_JOINABLE); + card, QEMU_THREAD_JOINABLE, &error_abort); qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread, - card, QEMU_THREAD_JOINABLE); + card, QEMU_THREAD_JOINABLE, &error_abort); return; diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 55d83a907c..ec18d8b171 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -152,9 +152,9 @@ void qemu_event_reset(QemuEvent *ev); void qemu_event_wait(QemuEvent *ev); void qemu_event_destroy(QemuEvent *ev); -void qemu_thread_create(QemuThread *thread, const char *name, - void *(*start_routine)(void *), - void *arg, int mode); +int qemu_thread_create(QemuThread *thread, const char *name, + void *(*start_routine)(void *), + void *arg, int mode, Error **errp); void *qemu_thread_join(QemuThread *thread); void qemu_thread_get_self(QemuThread *thread); bool qemu_thread_is_self(QemuThread *thread); diff --git a/io/task.c b/io/task.c index 64c4c7126a..1499540cdf 100644 --- a/io/task.c +++ b/io/task.c @@ -170,7 +170,8 @@ void qio_task_run_in_thread(QIOTask *task, "io-task-worker", qio_task_thread_worker, task, - QEMU_THREAD_DETACHED); + QEMU_THREAD_DETACHED, + &error_abort); } diff --git a/iothread.c b/iothread.c index 7130be58e3..2d5a5bfe6c 100644 --- a/iothread.c +++ b/iothread.c @@ -198,8 +198,9 @@ static void iothread_complete(UserCreatable *obj, Error **errp) */ name = object_get_canonical_path_component(OBJECT(obj)); thread_name = g_strdup_printf("IO %s", name); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&iothread->thread, thread_name, iothread_run, - iothread, QEMU_THREAD_JOINABLE); + iothread, QEMU_THREAD_JOINABLE, &error_abort); g_free(thread_name); g_free(name); diff --git a/migration/migration.c b/migration/migration.c index df6fd8e0e5..e9e83ab564 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -484,8 +484,10 @@ static void process_incoming_migration_co(void *opaque) goto fail; } + /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming", - colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE); + colo_process_incoming_thread, mis, + QEMU_THREAD_JOINABLE, &error_abort); mis->have_colo_incoming_thread = true; qemu_coroutine_yield(); @@ -2492,8 +2494,10 @@ static int open_return_path_on_source(MigrationState *ms, return 0; } + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&ms->rp_state.rp_thread, "return path", - source_return_path_thread, ms, QEMU_THREAD_JOINABLE); + source_return_path_thread, ms, + QEMU_THREAD_JOINABLE, &error_abort); trace_open_return_path_on_source_continue(); @@ -3338,8 +3342,9 @@ void migrate_fd_connect(MigrationState *s, Error *error_in) migrate_fd_cleanup(s); return; } + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&s->thread, "live_migration", migration_thread, s, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); s->migration_thread_running = true; } diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index e2aa57a701..e9d69c8b1e 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1115,8 +1115,10 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis) } qemu_sem_init(&mis->fault_thread_sem, 0); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&mis->fault_thread, "postcopy/fault", - postcopy_ram_fault_thread, mis, QEMU_THREAD_JOINABLE); + postcopy_ram_fault_thread, mis, + QEMU_THREAD_JOINABLE, &error_abort); qemu_sem_wait(&mis->fault_thread_sem); qemu_sem_destroy(&mis->fault_thread_sem); mis->have_fault_thread = true; diff --git a/migration/ram.c b/migration/ram.c index 35bd6213e9..825d448b31 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -565,9 +565,10 @@ static int compress_threads_save_setup(void) comp_param[i].quit = false; qemu_mutex_init(&comp_param[i].mutex); qemu_cond_init(&comp_param[i].cond); + /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(compress_threads + i, "compress", do_data_compress, comp_param + i, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); } return 0; @@ -1138,8 +1139,9 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) p->c = QIO_CHANNEL(sioc); qio_channel_set_delay(p->c, false); p->running = true; + /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(&p->thread, p->name, multifd_send_thread, p, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); atomic_inc(&multifd_send_state->count); } @@ -1418,8 +1420,9 @@ bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp) p->num_packets = 1; p->running = true; + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); atomic_inc(&multifd_recv_state->count); return atomic_read(&multifd_recv_state->count) == migrate_multifd_channels(); @@ -3801,9 +3804,10 @@ static int compress_threads_load_setup(QEMUFile *f) qemu_cond_init(&decomp_param[i].cond); decomp_param[i].done = true; decomp_param[i].quit = false; + /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(decompress_threads + i, "decompress", do_data_decompress, decomp_param + i, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); } return 0; exit: diff --git a/migration/savevm.c b/migration/savevm.c index 1415001d1c..8cd558be7e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1832,9 +1832,10 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) mis->have_listen_thread = true; /* Start up the listening thread and wait for it to signal ready */ qemu_sem_init(&mis->listen_thread_sem, 0); + /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(&mis->listen_thread, "postcopy/listen", postcopy_ram_listen_thread, NULL, - QEMU_THREAD_DETACHED); + QEMU_THREAD_DETACHED, &error_abort); qemu_sem_wait(&mis->listen_thread_sem); qemu_sem_destroy(&mis->listen_thread_sem); diff --git a/tests/atomic_add-bench.c b/tests/atomic_add-bench.c index 5666f6bbff..52071585a9 100644 --- a/tests/atomic_add-bench.c +++ b/tests/atomic_add-bench.c @@ -2,6 +2,7 @@ #include "qemu/thread.h" #include "qemu/host-utils.h" #include "qemu/processor.h" +#include "qapi/error.h" struct thread_info { uint64_t r; @@ -108,7 +109,7 @@ static void create_threads(void) info->r = (i + 1) ^ time(NULL); qemu_thread_create(&threads[i], NULL, thread_func, info, - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); } } diff --git a/tests/iothread.c b/tests/iothread.c index 777d9eea46..f4ad992e61 100644 --- a/tests/iothread.c +++ b/tests/iothread.c @@ -73,7 +73,7 @@ IOThread *iothread_new(void) qemu_mutex_init(&iothread->init_done_lock); qemu_cond_init(&iothread->init_done_cond); qemu_thread_create(&iothread->thread, NULL, iothread_run, - iothread, QEMU_THREAD_JOINABLE); + iothread, QEMU_THREAD_JOINABLE, &error_abort); /* Wait for initialization to complete */ qemu_mutex_lock(&iothread->init_done_lock); diff --git a/tests/qht-bench.c b/tests/qht-bench.c index e3b512f26f..728c2e06c7 100644 --- a/tests/qht-bench.c +++ b/tests/qht-bench.c @@ -10,6 +10,7 @@ #include "qemu/qht.h" #include "qemu/rcu.h" #include "qemu/xxhash.h" +#include "qapi/error.h" struct thread_stats { size_t rd; @@ -248,7 +249,7 @@ th_create_n(QemuThread **threads, struct thread_info **infos, const char *name, prepare_thread_info(&info[i], offset + i); info[i].func = func; qemu_thread_create(&th[i], name, thread_func, &info[i], - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); } } diff --git a/tests/rcutorture.c b/tests/rcutorture.c index 49311c82ea..0e799ff256 100644 --- a/tests/rcutorture.c +++ b/tests/rcutorture.c @@ -64,6 +64,7 @@ #include "qemu/atomic.h" #include "qemu/rcu.h" #include "qemu/thread.h" +#include "qapi/error.h" long long n_reads = 0LL; long n_updates = 0L; @@ -90,7 +91,7 @@ static void create_thread(void *(*func)(void *)) exit(-1); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads], - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); n_threads++; } diff --git a/tests/test-aio.c b/tests/test-aio.c index 86fb73b3d5..b3ac261724 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -154,7 +154,7 @@ static void test_acquire(void) qemu_thread_create(&thread, "test_acquire_thread", test_acquire_thread, - &data, QEMU_THREAD_JOINABLE); + &data, QEMU_THREAD_JOINABLE, &error_abort); /* Block in aio_poll(), let other thread kick us and acquire context */ aio_context_acquire(ctx); diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c index 6f076473e0..399744f03c 100644 --- a/tests/test-rcu-list.c +++ b/tests/test-rcu-list.c @@ -25,6 +25,7 @@ #include "qemu/rcu.h" #include "qemu/thread.h" #include "qemu/rcu_queue.h" +#include "qapi/error.h" /* * Test variables. @@ -68,7 +69,7 @@ static void create_thread(void *(*func)(void *)) exit(-1); } qemu_thread_create(&threads[n_threads], "test", func, &data[n_threads], - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); n_threads++; } diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 929391f85d..5712f1f501 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -31,6 +31,7 @@ #include "vnc-jobs.h" #include "qemu/sockets.h" #include "qemu/main-loop.h" +#include "qapi/error.h" #include "block/aio.h" /* @@ -339,7 +340,8 @@ void vnc_start_worker_thread(void) return ; q = vnc_queue_init(); - qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q, - QEMU_THREAD_DETACHED); + /* TODO: let the further caller handle the error instead of abort() here */ + qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, + q, QEMU_THREAD_DETACHED, &error_abort); queue = q; /* Set global queue */ } diff --git a/util/compatfd.c b/util/compatfd.c index 980bd33e52..c3d8448264 100644 --- a/util/compatfd.c +++ b/util/compatfd.c @@ -16,6 +16,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/thread.h" +#include "qapi/error.h" #include @@ -88,8 +89,9 @@ static int qemu_signalfd_compat(const sigset_t *mask) memcpy(&info->mask, mask, sizeof(*mask)); info->fd = fds[1]; - qemu_thread_create(&thread, "signalfd_compat", sigwait_compat, info, - QEMU_THREAD_DETACHED); + /* TODO: let the further caller handle the error instead of abort() here */ + qemu_thread_create(&thread, "signalfd_compat", sigwait_compat, + info, QEMU_THREAD_DETACHED, &error_abort); return fds[0]; } diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 88dda9cd39..eb849997cc 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -464,9 +464,10 @@ static bool touch_all_pages(char *area, size_t hpagesize, size_t numpages, memset_thread[i].numpages = (i == (memset_num_threads - 1)) ? numpages : numpages_per_thread; memset_thread[i].hpagesize = hpagesize; + /* TODO: let the callers handle the error instead of abort() here */ qemu_thread_create(&memset_thread[i].pgthread, "touch_pages", do_touch_pages, &memset_thread[i], - QEMU_THREAD_JOINABLE); + QEMU_THREAD_JOINABLE, &error_abort); addr += size_per_thread; numpages -= numpages_per_thread; } diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 1bf5e65dea..06a9e78ba8 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -15,6 +15,7 @@ #include "qemu/atomic.h" #include "qemu/notify.h" #include "qemu-thread-common.h" +#include "qapi/error.h" static bool name_threads; @@ -504,9 +505,18 @@ static void *qemu_thread_start(void *args) return r; } -void qemu_thread_create(QemuThread *thread, const char *name, - void *(*start_routine)(void*), - void *arg, int mode) +/* + * Create a new thread with name @name + * The thread executes @start_routine() with argument @arg. + * The thread will be created in a detached state if @mode is + * QEMU_THREAD_DETACHED, and in a jounable state if it's + * QEMU_THREAD_JOINABLE. + * On success, return 0. + * On failure, store an error through @errp and return negative errno. + */ +int qemu_thread_create(QemuThread *thread, const char *name, + void *(*start_routine)(void *), + void *arg, int mode, Error **errp) { sigset_t set, oldset; int err; @@ -515,7 +525,8 @@ void qemu_thread_create(QemuThread *thread, const char *name, err = pthread_attr_init(&attr); if (err) { - error_exit(err, __func__); + error_setg(errp, "pthread_attr_init failed"); + return -err; } if (mode == QEMU_THREAD_DETACHED) { @@ -538,13 +549,18 @@ void qemu_thread_create(QemuThread *thread, const char *name, err = pthread_create(&thread->thread, &attr, qemu_thread_start, qemu_thread_args); - - if (err) - error_exit(err, __func__); + if (err) { + error_setg(errp, "pthread_create failed"); + pthread_attr_destroy(&attr); + g_free(qemu_thread_args->name); + g_free(qemu_thread_args); + return -err; + } pthread_sigmask(SIG_SETMASK, &oldset, NULL); pthread_attr_destroy(&attr); + return 0; } void qemu_thread_get_self(QemuThread *thread) diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 572f88535d..f2deea5250 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -16,6 +16,7 @@ #include "qemu/thread.h" #include "qemu/notify.h" #include "qemu-thread-common.h" +#include "qapi/error.h" #include static bool name_threads; @@ -384,9 +385,9 @@ void *qemu_thread_join(QemuThread *thread) return ret; } -void qemu_thread_create(QemuThread *thread, const char *name, +int qemu_thread_create(QemuThread *thread, const char *name, void *(*start_routine)(void *), - void *arg, int mode) + void *arg, int mode, Error **errp) { HANDLE hThread; struct QemuThreadData *data; @@ -405,10 +406,16 @@ void qemu_thread_create(QemuThread *thread, const char *name, hThread = (HANDLE) _beginthreadex(NULL, 0, win32_start_routine, data, 0, &thread->tid); if (!hThread) { - error_exit(GetLastError(), __func__); + if (data->mode != QEMU_THREAD_DETACHED) { + DeleteCriticalSection(&data->cs); + } + error_setg(errp, "failed to create win32_start_routine"); + g_free(data); + return -errno; } CloseHandle(hThread); thread->data = data; + return 0; } void qemu_thread_get_self(QemuThread *thread) diff --git a/util/rcu.c b/util/rcu.c index 5676c22bd1..145dcdb0c6 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -32,6 +32,7 @@ #include "qemu/atomic.h" #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qapi/error.h" #if defined(CONFIG_MALLOC_TRIM) #include #endif @@ -325,7 +326,7 @@ static void rcu_init_complete(void) * must have been quiescent even after forking, just recreate it. */ qemu_thread_create(&thread, "call_rcu", call_rcu_thread, - NULL, QEMU_THREAD_DETACHED); + NULL, QEMU_THREAD_DETACHED, &error_abort); rcu_register_thread(); } diff --git a/util/thread-pool.c b/util/thread-pool.c index 610646d131..ad0f980783 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c @@ -22,6 +22,7 @@ #include "trace.h" #include "block/thread-pool.h" #include "qemu/main-loop.h" +#include "qapi/error.h" static void do_spawn_thread(ThreadPool *pool); @@ -132,7 +133,8 @@ static void do_spawn_thread(ThreadPool *pool) pool->new_threads--; pool->pending_threads++; - qemu_thread_create(&t, "worker", worker_thread, pool, QEMU_THREAD_DETACHED); + qemu_thread_create(&t, "worker", worker_thread, pool, + QEMU_THREAD_DETACHED, &error_abort); } static void spawn_thread_bh_fn(void *opaque) From patchwork Sun Mar 24 16:51:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="eE7Rozp1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3cm3vGrz9sSG for ; Mon, 25 Mar 2019 04:03:20 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Wh-0002aG-Gn for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 13:03:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qf-0006bI-60 for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mg-0005iP-Vc for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:57 -0400 Received: from m50-112.126.com ([123.125.50.112]:38532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mf-0005hG-Vs for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=7xLRaOajg7A/Tn+ole GCuVahwX7+EEIxXVorvpXQ21E=; b=eE7Rozp12yMqfC/h95o1vklbE4LdhJNyAW t5vfTAIaGCIaAquNJqfXWBz59dkTJmkpvJSBnYqnXmpXA4jE+d4BA/8Cdv9KsZLv wN5FFfil4fYqZkYdjairZW8ErBCnrdCU83yem+U2eZ5oD1Ji/FikE9+59usBve3W eybXCBAhM= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S4; Mon, 25 Mar 2019 00:52:37 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:51:57 +0800 Message-Id: <20190324165206.25766-3-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S4 X-Coremail-Antispam: 1Uf129KBjvAXoW3Zw4DWr4xZw4UCrW7WF48WFg_yoW8Ww48uo WrArW3Xa48tr1fJF9xurnrta4UtryUJrW3AFs5uF4DW3Z7XFZ8X343tan3Za1aqF4SgrW7 uFySq3ZrXFs3Cr97n29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU-75rUUUUU X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiExeBIVpD4+eFswAAsP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 02/11] qemu_thread: supplement error handling for qemu_X_start_vcpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li The callers of qemu_init_vcpu() already passed the **errp to handle errors. In view of this, add a new Error parameter to qemu_init_vcpu() and all qemu_X_start_vcpu() functions called by qemu_init_vcpu() to propagate the error and let the further callers check it. Besides, make qemu_init_vcpu() return a Boolean value to let its callers know whether it succeeds. Cc: Paolo Bonzini Signed-off-by: Fei Li Reviewed-by: Fam Zheng Reviewed-by: Juan Quintela Reviewed-by: Markus Armbruster Acked-by: David Gibson --- accel/tcg/user-exec-stub.c | 3 +- cpus.c | 74 +++++++++++++++++++++++------------------ include/qom/cpu.h | 2 +- target/alpha/cpu.c | 4 ++- target/arm/cpu.c | 4 ++- target/cris/cpu.c | 4 ++- target/hppa/cpu.c | 4 ++- target/i386/cpu.c | 4 ++- target/lm32/cpu.c | 4 ++- target/m68k/cpu.c | 4 ++- target/microblaze/cpu.c | 4 ++- target/mips/cpu.c | 4 ++- target/moxie/cpu.c | 4 ++- target/nios2/cpu.c | 4 ++- target/openrisc/cpu.c | 4 ++- target/ppc/translate_init.inc.c | 4 ++- target/riscv/cpu.c | 4 ++- target/s390x/cpu.c | 4 ++- target/sh4/cpu.c | 4 ++- target/sparc/cpu.c | 4 ++- target/tilegx/cpu.c | 4 ++- target/tricore/cpu.c | 4 ++- target/unicore32/cpu.c | 4 ++- target/xtensa/cpu.c | 4 ++- 24 files changed, 108 insertions(+), 55 deletions(-) diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c index a32b4496af..f8c38a375c 100644 --- a/accel/tcg/user-exec-stub.c +++ b/accel/tcg/user-exec-stub.c @@ -10,8 +10,9 @@ void cpu_resume(CPUState *cpu) { } -void qemu_init_vcpu(CPUState *cpu) +bool qemu_init_vcpu(CPUState *cpu, Error **errp) { + return true; } /* User mode emulation does not support record/replay yet. */ diff --git a/cpus.c b/cpus.c index 2c70c06da8..fe58940407 100644 --- a/cpus.c +++ b/cpus.c @@ -1932,7 +1932,7 @@ void cpu_remove_sync(CPUState *cpu) /* For temporary buffers for forming a name */ #define VCPU_THREAD_NAME_SIZE 16 -static void qemu_tcg_init_vcpu(CPUState *cpu) +static void qemu_tcg_init_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; static QemuCond *single_tcg_halt_cond; @@ -1962,17 +1962,20 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/TCG", cpu->cpu_index); - /* TODO: let the callers handle the error instead of abort() here */ - qemu_thread_create(cpu->thread, thread_name, qemu_tcg_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(cpu->thread, thread_name, + qemu_tcg_cpu_thread_fn, cpu, + QEMU_THREAD_JOINABLE, errp) < 0) { + return; + } } else { /* share a single thread for all cpus with TCG */ snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "ALL CPUs/TCG"); - /* TODO: let the callers handle the error instead of abort() here */ - qemu_thread_create(cpu->thread, thread_name, - qemu_tcg_rr_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(cpu->thread, thread_name, + qemu_tcg_rr_cpu_thread_fn, cpu, + QEMU_THREAD_JOINABLE, errp) < 0) { + return; + } single_tcg_halt_cond = cpu->halt_cond; single_tcg_cpu_thread = cpu->thread; @@ -1990,7 +1993,7 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) } } -static void qemu_hax_start_vcpu(CPUState *cpu) +static void qemu_hax_start_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; @@ -2000,15 +2003,16 @@ static void qemu_hax_start_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX", cpu->cpu_index); - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(cpu->thread, thread_name, qemu_hax_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(cpu->thread, thread_name, qemu_hax_cpu_thread_fn, + cpu, QEMU_THREAD_JOINABLE, errp) < 0) { + return; + } #ifdef _WIN32 cpu->hThread = qemu_thread_get_handle(cpu->thread); #endif } -static void qemu_kvm_start_vcpu(CPUState *cpu) +static void qemu_kvm_start_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; @@ -2017,12 +2021,11 @@ static void qemu_kvm_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/KVM", cpu->cpu_index); - /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_kvm_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + cpu, QEMU_THREAD_JOINABLE, errp); } -static void qemu_hvf_start_vcpu(CPUState *cpu) +static void qemu_hvf_start_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; @@ -2036,12 +2039,11 @@ static void qemu_hvf_start_vcpu(CPUState *cpu) snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HVF", cpu->cpu_index); - /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_hvf_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + cpu, QEMU_THREAD_JOINABLE, errp); } -static void qemu_whpx_start_vcpu(CPUState *cpu) +static void qemu_whpx_start_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; @@ -2050,15 +2052,16 @@ static void qemu_whpx_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/WHPX", cpu->cpu_index); - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(cpu->thread, thread_name, qemu_whpx_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(cpu->thread, thread_name, qemu_whpx_cpu_thread_fn, + cpu, QEMU_THREAD_JOINABLE, errp) < 0) { + return; + } #ifdef _WIN32 cpu->hThread = qemu_thread_get_handle(cpu->thread); #endif } -static void qemu_dummy_start_vcpu(CPUState *cpu) +static void qemu_dummy_start_vcpu(CPUState *cpu, Error **errp) { char thread_name[VCPU_THREAD_NAME_SIZE]; @@ -2067,16 +2070,16 @@ static void qemu_dummy_start_vcpu(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY", cpu->cpu_index); - /* TODO: let the further caller handle the error instead of abort() here */ qemu_thread_create(cpu->thread, thread_name, qemu_dummy_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE, &error_abort); + cpu, QEMU_THREAD_JOINABLE, errp); } -void qemu_init_vcpu(CPUState *cpu) +bool qemu_init_vcpu(CPUState *cpu, Error **errp) { cpu->nr_cores = smp_cores; cpu->nr_threads = smp_threads; cpu->stopped = true; + Error *local_err = NULL; if (!cpu->as) { /* If the target cpu hasn't set up any address spaces itself, @@ -2087,22 +2090,29 @@ void qemu_init_vcpu(CPUState *cpu) } if (kvm_enabled()) { - qemu_kvm_start_vcpu(cpu); + qemu_kvm_start_vcpu(cpu, &local_err); } else if (hax_enabled()) { - qemu_hax_start_vcpu(cpu); + qemu_hax_start_vcpu(cpu, &local_err); } else if (hvf_enabled()) { - qemu_hvf_start_vcpu(cpu); + qemu_hvf_start_vcpu(cpu, &local_err); } else if (tcg_enabled()) { - qemu_tcg_init_vcpu(cpu); + qemu_tcg_init_vcpu(cpu, &local_err); } else if (whpx_enabled()) { - qemu_whpx_start_vcpu(cpu); + qemu_whpx_start_vcpu(cpu, &local_err); } else { - qemu_dummy_start_vcpu(cpu); + qemu_dummy_start_vcpu(cpu, &local_err); + } + + if (local_err) { + error_propagate(errp, local_err); + return false; } while (!cpu->created) { qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex); } + + return true; } void cpu_stop_current(void) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 1d6099e5d4..a6fa9aabbd 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -1026,7 +1026,7 @@ void end_exclusive(void); * * Initializes a vCPU. */ -void qemu_init_vcpu(CPUState *cpu); +bool qemu_init_vcpu(CPUState *cpu, Error **errp); #define SSTEP_ENABLE 0x1 /* Enable simulated HW single stepping */ #define SSTEP_NOIRQ 0x2 /* Do not use IRQ while single stepping */ diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 1fd95d6c0f..7d24ee1f31 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -66,7 +66,9 @@ static void alpha_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } acc->parent_realize(dev, errp); } diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 96f0ff0ec7..b48a17a7e3 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1201,7 +1201,9 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) } #endif - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } cpu_reset(cs); acc->parent_realize(dev, errp); diff --git a/target/cris/cpu.c b/target/cris/cpu.c index a23aba2688..ec92d69781 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -140,7 +140,9 @@ static void cris_cpu_realizefn(DeviceState *dev, Error **errp) } cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } ccc->parent_realize(dev, errp); } diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 00bf444620..08f600ced9 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -98,7 +98,9 @@ static void hppa_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } acc->parent_realize(dev, errp); #ifndef CONFIG_USER_ONLY diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d6bb57d210..a56142abc7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5330,7 +5330,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) } #endif - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } /* * Most Intel and certain AMD CPUs support hyperthreading. Even though QEMU diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c index b7499cb627..d50b1e4a43 100644 --- a/target/lm32/cpu.c +++ b/target/lm32/cpu.c @@ -139,7 +139,9 @@ static void lm32_cpu_realizefn(DeviceState *dev, Error **errp) cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } lcc->parent_realize(dev, errp); } diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 582e3a73b3..4ab53f2d58 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -231,7 +231,9 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error **errp) m68k_cpu_init_gdb(cpu); cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } mcc->parent_realize(dev, errp); } diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 5596cd5485..310e3d8fd5 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -161,7 +161,9 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } env->pvr.regs[0] = PVR0_USE_EXC_MASK \ | PVR0_USE_ICACHE_MASK \ diff --git a/target/mips/cpu.c b/target/mips/cpu.c index e217fb3e36..1e5aa69c57 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -145,7 +145,9 @@ static void mips_cpu_realizefn(DeviceState *dev, Error **errp) cpu_mips_realize_env(&cpu->env); cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } mcc->parent_realize(dev, errp); } diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 46434e65ba..5d55fcf313 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -66,7 +66,9 @@ static void moxie_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } cpu_reset(cs); mcc->parent_realize(dev, errp); diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index fbfaa2ce26..5c7b4b486e 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -94,7 +94,9 @@ static void nios2_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } cpu_reset(cs); ncc->parent_realize(dev, errp); diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 541b2a66c7..f8ec7deb38 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -83,7 +83,9 @@ static void openrisc_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } cpu_reset(cs); occ->parent_realize(dev, errp); diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 0bd555eb19..a100eacde0 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -9795,7 +9795,9 @@ static void ppc_cpu_realize(DeviceState *dev, Error **errp) gdb_register_coprocessor(cs, gdb_get_spr_reg, gdb_set_spr_reg, pcc->gdb_num_sprs, "power-spr.xml", 0); #endif - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + goto unrealize; + } pcc->parent_realize(dev, errp); diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d61bce6d55..12d18d5ca5 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -307,7 +307,9 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) riscv_cpu_register_gdb_regs_for_features(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } cpu_reset(cs); mcc->parent_realize(dev, errp); diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 698dd9cb82..9959f96b03 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -219,7 +219,9 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); #endif s390_cpu_gdb_init(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } /* * KVM requires the initial CPU reset ioctl to be executed on the target diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index b9f393b7c7..d32ef2e1cb 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -196,7 +196,9 @@ static void superh_cpu_realizefn(DeviceState *dev, Error **errp) } cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } scc->parent_realize(dev, errp); } diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 4a4445bdf5..a511c90dab 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -772,7 +772,9 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } scc->parent_realize(dev, errp); } diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c index bfe9be59b5..234148fabd 100644 --- a/target/tilegx/cpu.c +++ b/target/tilegx/cpu.c @@ -92,7 +92,9 @@ static void tilegx_cpu_realizefn(DeviceState *dev, Error **errp) } cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } tcc->parent_realize(dev, errp); } diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index e8d37e4040..67e3eb03d9 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -96,7 +96,9 @@ static void tricore_cpu_realizefn(DeviceState *dev, Error **errp) set_feature(env, TRICORE_FEATURE_13); } cpu_reset(cs); - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } tcc->parent_realize(dev, errp); } diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 2b49d1ca40..0c737c3187 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -96,7 +96,9 @@ static void uc32_cpu_realizefn(DeviceState *dev, Error **errp) return; } - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } ucc->parent_realize(dev, errp); } diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index a54dbe4260..d2351c9b20 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -131,7 +131,9 @@ static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp) cs->gdb_num_regs = xcc->config->gdb_regmap.num_regs; - qemu_init_vcpu(cs); + if (!qemu_init_vcpu(cs, errp)) { + return; + } xcc->parent_realize(dev, errp); } From patchwork Sun Mar 24 16:51:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="RUx2jCEI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3ZC2cyvz9sSG for ; Mon, 25 Mar 2019 04:01:07 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Ub-0001Je-Aw for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 13:01:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qk-0006aJ-OE for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mg-0005iI-Re for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:56 -0400 Received: from m50-112.126.com ([123.125.50.112]:38536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mf-0005hF-Lz for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=WCFTW zsedRxQd7mcEGcZIwDFkfqox5EooNxf9qGdIT8=; b=RUx2jCEILrb5OYO+1uxKg vAlfAzkFqsgJKTy7HQaHyZRNQnaqhFoJXYQhRYb4unY0VsnMA6prFEMurM2fc+nr c2nULzoa9R1gBeh23oajKkUILhrjhRT9sEs7PCVaUk5gruMr0457v3ZKart8sYyL ArUVBHNHM3XWd3hpIzd590= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S5; Mon, 25 Mar 2019 00:52:38 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:51:58 +0800 Message-Id: <20190324165206.25766-4-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> MIME-Version: 1.0 X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S5 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jw43Cw45WFW5XFWDAF4Dtwb_yoWfCrb_Ja 10q347Gay5J3ZFgF48Ca17Z340v3y8JF1kGa47tr1akrWDtFW3WFyUta1rJF1fGrsxu343 Cr97XrWFya9rujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUnBwZ5UUUUU== X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaReBIVpD8EOosQAAst X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 03/11] qemu_thread: supplement error handling for qmp_dump_guest_memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Utilize the existed errp to propagate the error instead of the temporary &error_abort. Cc: Markus Armbruster Cc: Marc-André Lureau Signed-off-by: Fei Li Reviewed-by: Markus Armbruster --- dump.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dump.c b/dump.c index 3401078af4..4e9cbdf151 100644 --- a/dump.c +++ b/dump.c @@ -2021,9 +2021,8 @@ void qmp_dump_guest_memory(bool paging, const char *file, if (detach_p) { /* detached dump */ s->detached = true; - /* TODO: let the further caller handle the error instead of abort() */ qemu_thread_create(&s->dump_thread, "dump_thread", dump_thread, - s, QEMU_THREAD_DETACHED, &error_abort); + s, QEMU_THREAD_DETACHED, errp); } else { /* sync dump */ dump_process(s, errp); From patchwork Sun Mar 24 16:51:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="qe2ZyQe4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3Vs20dtz9sSG for ; Mon, 25 Mar 2019 03:58:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Rn-0006nn-0B for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 12:58:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qj-0006aF-Qg for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mg-0005i5-MI for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:56 -0400 Received: from m50-112.126.com ([123.125.50.112]:38528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mf-0005hE-Lx for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=72d2JBCA3c6yMVgy+F ILi5CmIMDvMlEdTI+1rSt9N5s=; b=qe2ZyQe4sFlFpVr11aqIe53H1Aq/iZ5jV8 1yiO5n6JaNLi/URoUgUiy0WB8DT5xTd30LkofYjupCtyVIyps38O6AFtNE/XIH+m Xd+Act22/KRtpXpj2BMZrTqEzk/QxNfiZdYrYVd4BXEIP1juvuZhQobbWS5lvRYi pl+omgKN8= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S6; Mon, 25 Mar 2019 00:52:38 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:51:59 +0800 Message-Id: <20190324165206.25766-5-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S6 X-Coremail-Antispam: 1Uf129KBjvJXoWrtw45CrWruF4rXFWxWFW3ZFb_yoW8JF4rpr WDG39xtrZ3JFs3ZrW3JayvvFyUGa1rWF17Gr4xCw4rGwn8ta1Yvry7G3409FyxCFyYyFWr ZFWrJry3Wa1qvrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6v38UUUUU= X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaReBIVpD8EOosQABss X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 04/11] qemu_thread: supplement error handling for pci_edu_realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Slaby , Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Utilize the existed errp to propagate the error and do the corresponding cleanup to replace the temporary &error_abort. Cc: Markus Armbruster Cc: Jiri Slaby Signed-off-by: Fei Li Reviewed-by: Markus Armbruster --- hw/misc/edu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 21adbfddce..8fe232b6d6 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -356,9 +356,14 @@ static void pci_edu_realize(PCIDevice *pdev, Error **errp) qemu_mutex_init(&edu->thr_mutex); qemu_cond_init(&edu->thr_cond); - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&edu->thread, "edu", edu_fact_thread, - edu, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(&edu->thread, "edu", edu_fact_thread, + edu, QEMU_THREAD_JOINABLE, errp) < 0) { + qemu_cond_destroy(&edu->thr_cond); + qemu_mutex_destroy(&edu->thr_mutex); + timer_del(&edu->dma_timer); + msi_uninit(pdev); + return; + } memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu, "edu-mmio", 1 * MiB); From patchwork Sun Mar 24 16:52:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="Zx87wmtA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3cm2Nc4z9sQv for ; Mon, 25 Mar 2019 04:03:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58503 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Wh-0002aJ-9W for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 13:03:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Ql-0006bI-Kz for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mg-0005i0-Lt for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:55 -0400 Received: from m50-112.126.com ([123.125.50.112]:38534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mf-0005hH-Vn for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=/ubb8b8wtHGhdorPRE lnukABdB/FSKpUdzPZoL1jw4U=; b=Zx87wmtA3T0PqrmeqI7GDKgbD4M4LAUdXO 7tFioI2KZdD21zD0FAvCAiw7dgZL/IqFYH3TbaItu2K8Jn6kLz8HZ+ac/dXbR25t D2dsj28r1l79XhTe3lY0smZ48CQ4AMt7uys3QToiAT9OZc/+rtdwoLeX7vcmT2SX J2gSSPlAg= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S7; Mon, 25 Mar 2019 00:52:38 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:52:00 +0800 Message-Id: <20190324165206.25766-6-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF4fuw4DAw4UZF4UAw1xuFg_yoW8WrWDpr Wakr90yr4xG3ZFy39Iyan7Z3W5XrnIga43ArZ3Zw1fCwsxGwsxurW5J3s09rWrCF1xJF4U ZFWS9r1UC3ZxtFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6hFcUUUUU= X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaReBIVpD8EOosQACsv X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Add a local_err to hold the error, and return the corresponding error code to replace the temporary &error_abort. Cc: Markus Armbruster Cc: David Gibson Signed-off-by: Fei Li Acked-by: David Gibson Reviewed-by: Markus Armbruster --- hw/ppc/spapr_hcall.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 900b71f4a6..25e385d9a1 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -447,6 +447,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, SpaprPendingHpt *pending = spapr->pending_hpt; uint64_t current_ram_size; int rc; + Error *local_err = NULL; if (spapr->resize_hpt == SPAPR_RESIZE_HPT_DISABLED) { return H_AUTHORITY; @@ -507,10 +508,13 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, pending->shift = shift; pending->ret = H_HARDWARE; - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&pending->thread, "sPAPR HPT prepare", - hpt_prepare_thread, pending, - QEMU_THREAD_DETACHED, &error_abort); + if (qemu_thread_create(&pending->thread, "sPAPR HPT prepare", + hpt_prepare_thread, pending, + QEMU_THREAD_DETACHED, &local_err) < 0) { + error_reportf_err(local_err, "failed to create hpt_prepare_thread: "); + g_free(pending); + return H_HARDWARE; + } spapr->pending_hpt = pending; From patchwork Sun Mar 24 16:52:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="guL2BANA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3Vs2jcyz9sSc for ; Mon, 25 Mar 2019 03:58:09 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Rj-0006ih-4L for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 12:58:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qf-0006aJ-AM for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mi-0005j3-8N for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:57 -0400 Received: from m50-112.126.com ([123.125.50.112]:38530) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mh-0005hD-In for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=sACYxoMEBpbH5UQf81 munf1Xk0j/ZG/hf1QTtI6yBVo=; b=guL2BANA2h+ik9/H0rJEK3Gt8vN+7nj9QO lN7new1gviqIydQCGDf+zWc6wExyZ51ZDYWiC914ERB7OjUs8FsHhHcxer1Azp0C 2QMZEu7LM5HJYSHigeHOnhjJ5qq+bgIwaHDFtNX0cwiIuaSwxqUMBzpAmYLQ5NQh GCpjFjG2M= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S8; Mon, 25 Mar 2019 00:52:38 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:52:01 +0800 Message-Id: <20190324165206.25766-7-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S8 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr4xGr1Uuw1UGF17ZFb_yoW8Wryxpr yUZFy3tr4xZr1avaya93Z7ZFW5Jws2ga4DG3yxJw1jyw45Xw13ZrWSka4rur43AFyYq348 ZrW5Kr95WFW7tFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j6hFcUUUUU= X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiExeBIVpD4+eFtgAAsK X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 06/11] qemu_thread: supplement error handling for emulated_realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Utilize the existed errp to propagate the error and do the corresponding cleanup to replace the temporary &error_abort. Cc: Markus Armbruster Cc: Gerd Hoffmann Signed-off-by: Fei Li --- hw/usb/ccid-card-emulated.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 0b170f6328..5ffc97dcfe 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -544,11 +544,18 @@ static void emulated_realize(CCIDCardState *base, Error **errp) error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_CCID); goto out2; } - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, - card, QEMU_THREAD_JOINABLE, &error_abort); - qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread, - card, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, + card, QEMU_THREAD_JOINABLE, errp) < 0) { + goto out2; + } + if (qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", + handle_apdu_thread, card, + QEMU_THREAD_JOINABLE, errp) < 0) { + VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL); + vevent_queue_vevent(vevent); /* stop vevent thread */ + qemu_thread_join(&card->event_thread_id); + goto out2; + } return; From patchwork Sun Mar 24 16:52:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fei X-Patchwork-Id: 1063286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.b="oR/HTCcp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44S3Vs340Bz9sSh for ; Mon, 25 Mar 2019 03:58:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:58429 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Rn-0006nY-9r for incoming@patchwork.ozlabs.org; Sun, 24 Mar 2019 12:58:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Qj-0006aG-8D for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:57:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h86Mh-0005ic-L9 for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:56 -0400 Received: from m50-112.126.com ([123.125.50.112]:38526) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h86Mg-0005hB-Qg for qemu-devel@nongnu.org; Sun, 24 Mar 2019 12:52:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=VM7YAJwry+wyZ2yuE+ WkugvtQMJfdLiPFMhwqCS6SXA=; b=oR/HTCcp866PsIycQvgfHGCHrg4HGFKUZ3 FTWTrFf64R7WLUYf5OYpxfPaLfLMhZ8F+LJ6+QMkpE5f6NF6x9vThaACFcQMuWzS rdCGoxEhZWqxn3qhDuGKcARccn+daKxbjlHfAK/Q/yUvV7Ic5BFtFE6bc2KsLlE0 O4VtLZQUs= Received: from n3-021-211.byted.org (unknown [49.7.44.57]) by smtp6 (Coremail) with SMTP id j9KowABnE7HBtZdcGev0AA--.5136S9; Mon, 25 Mar 2019 00:52:38 +0800 (CST) From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Mon, 25 Mar 2019 00:52:02 +0800 Message-Id: <20190324165206.25766-8-lifei1214@126.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190324165206.25766-1-lifei1214@126.com> References: <20190324165206.25766-1-lifei1214@126.com> X-CM-TRANSID: j9KowABnE7HBtZdcGev0AA--.5136S9 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr1fKF45Jr15Cr1Dtrb_yoW8urykpr yDC390qr97ZrnFy3yfJa1kZFy5Xr4FqFW7CryFy3WxAw17uan8XrW8Ka4jgFs3Ca4vqrWr ZFZ8KrZ8G398AFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j66wZUUUUU= X-Originating-IP: [49.7.44.57] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbiaBeBIVpD8K3D9AAAss X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.112 Subject: [Qemu-devel] [PATCH v12 for-4.1 07/11] qemu_thread: supplement error handling for iothread_complete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Peter Xu , "Dr . David Alan Gilbert" , Fei Li , Gerd Hoffmann , Stefan Hajnoczi , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Fei Li Utilize the existed errp to propagate the error and do the corresponding cleanup to replace the temporary &error_abort. Cc: Markus Armbruster Cc: Stefan Hajnoczi Cc: Eric Blake Signed-off-by: Fei Li Reviewed-by: Markus Armbruster --- iothread.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/iothread.c b/iothread.c index 2d5a5bfe6c..1ebacaf089 100644 --- a/iothread.c +++ b/iothread.c @@ -166,6 +166,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) Error *local_error = NULL; IOThread *iothread = IOTHREAD(obj); char *name, *thread_name; + int thread_ok; iothread->stopping = false; iothread->running = true; @@ -188,9 +189,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) &local_error); if (local_error) { error_propagate(errp, local_error); - aio_context_unref(iothread->ctx); - iothread->ctx = NULL; - return; + goto fail; } /* This assumes we are called from a thread with useful CPU affinity for us @@ -198,16 +197,23 @@ static void iothread_complete(UserCreatable *obj, Error **errp) */ name = object_get_canonical_path_component(OBJECT(obj)); thread_name = g_strdup_printf("IO %s", name); - /* TODO: let the further caller handle the error instead of abort() here */ - qemu_thread_create(&iothread->thread, thread_name, iothread_run, - iothread, QEMU_THREAD_JOINABLE, &error_abort); + thread_ok = qemu_thread_create(&iothread->thread, thread_name, iothread_run, + iothread, QEMU_THREAD_JOINABLE, errp); g_free(thread_name); g_free(name); + if (thread_ok < 0) { + qemu_sem_destroy(&iothread->init_done_sem); + goto fail; + } /* Wait for initialization to complete */ while (iothread->thread_id == -1) { qemu_sem_wait(&iothread->init_done_sem); } + return; +fail: + aio_context_unref(iothread->ctx); + iothread->ctx = NULL; } typedef struct {