From cf9258ce168d4e709a196c59ec40cda869b8fcc8 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Wed, 28 Nov 2018 10:34:23 -0500 Subject: docs/devel/build-system: fix 'softmu' typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Emilio G. Cota Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20181128153423.11916-1-cota@braap.org> Signed-off-by: Laurent Vivier --- docs/devel/build-system.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index 52501f2ad9..f9fd27fab0 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -393,7 +393,7 @@ all use $(obj) as a prefix to the target, e.g. This file provides the entry point used to build each individual system or userspace emulator target. Each enabled target has its own subdirectory. For example if configure is run with the argument -'--target-list=x86_64-softmmu', then a sub-directory 'x86_64-softmu' +'--target-list=x86_64-softmmu', then a sub-directory 'x86_64-softmmu' will be created, containing a 'Makefile' which symlinks back to Makefile.target -- cgit v1.2.3 From bcdc5081901e172a4b7c5ecc2faa2d4eae1f67a9 Mon Sep 17 00:00:00 2001 From: Roman Bolshakov Date: Mon, 3 Dec 2018 13:04:15 +0300 Subject: i386: hvf: drop debug printf in decode_sldtgroup It's going to clutter QEMU logs if 0x0f00 is trapped. Signed-off-by: Roman Bolshakov Message-Id: <20181203100415.53027-2-r.bolshakov@yadro.com> Signed-off-by: Laurent Vivier --- target/i386/hvf/x86_decode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/i386/hvf/x86_decode.c b/target/i386/hvf/x86_decode.c index d125a6ef83..5f513c5563 100644 --- a/target/i386/hvf/x86_decode.c +++ b/target/i386/hvf/x86_decode.c @@ -525,8 +525,6 @@ static void decode_sldtgroup(CPUX86State *env, struct x86_decode *decode) X86_DECODE_CMD_INVL }; decode->cmd = group[decode->modrm.reg]; - printf("%llx: decode_sldtgroup: %d\n", env->hvf_emul->fetch_rip, - decode->modrm.reg); } static void decode_lidtgroup(CPUX86State *env, struct x86_decode *decode) -- cgit v1.2.3 From 92917cd25103569ad8992dbc5b4dc2dcacfdda7f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 13 Dec 2018 18:58:07 +0100 Subject: vl: Use error_fatal to simplify obvious fatal errors (again) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch created mechanically by rerunning: $ spatch --in-place --sp-file scripts/coccinelle/use-error_fatal.cocci \ --macro-file scripts/cocci-macro-file.h vl.c Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20181213175807.12039-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- vl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index 2a8b2ee16d..530fad6a71 100644 --- a/vl.c +++ b/vl.c @@ -3133,11 +3133,8 @@ int main(int argc, char **argv, char **envp) Visitor *v; BlockdevOptions_queue *bdo; - v = qobject_input_visitor_new_str(optarg, "driver", &err); - if (!v) { - error_report_err(err); - exit(1); - } + v = qobject_input_visitor_new_str(optarg, "driver", + &error_fatal); bdo = g_new(BlockdevOptions_queue, 1); visit_type_BlockdevOptions(v, NULL, &bdo->bdo, -- cgit v1.2.3 From b2322003b6389c7c98104c8626ffa342928ba83c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 13 Dec 2018 18:31:13 +0100 Subject: error: Remove NULL checks on error_propagate() calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch created mechanically by rerunning: $ spatch --sp-file scripts/coccinelle/error_propagate_null.cocci \ --macro-file scripts/cocci-macro-file.h \ --dir . --in-place Whitespace tidied up manually. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20181213173113.11211-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- blockdev.c | 4 +--- hw/s390x/s390-pci-bus.c | 4 +--- qga/commands-posix.c | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/blockdev.c b/blockdev.c index e6c8349409..a6f71f9d83 100644 --- a/blockdev.c +++ b/blockdev.c @@ -992,9 +992,7 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type, blk = blockdev_init(filename, bs_opts, &local_err); bs_opts = NULL; if (!blk) { - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); goto fail; } else { assert(!local_err); diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 99d0368868..f7458445c0 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -731,9 +731,7 @@ static void s390_pcihost_realize(DeviceState *dev, Error **errp) css_register_io_adapters(CSS_IO_ADAPTER_PCI, true, false, S390_ADAPTER_SUPPRESSIBLE, &local_err); - if (local_err) { - error_propagate(errp, local_err); - } + error_propagate(errp, local_err); } static int s390_pci_msix_init(S390PCIBusDevice *pbdev) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1877976522..2e719d9b6b 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode, Error **errp) return true; } - if (local_err) { - error_propagate(errp, local_err); - } - + error_propagate(errp, local_err); return false; } @@ -1782,7 +1779,7 @@ static void guest_suspend(SuspendMode mode, Error **errp) if (!mode_supported) { error_setg(errp, "the requested suspend mode is not supported by the guest"); - } else if (local_err) { + } else { error_propagate(errp, local_err); } } -- cgit v1.2.3