Commit b72566a4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging 



Trivial patches (2018-12-18)

# gpg: Signature made Tue 18 Dec 2018 14:28:41 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  error: Remove NULL checks on error_propagate() calls
  vl: Use error_fatal to simplify obvious fatal errors (again)
  i386: hvf: drop debug printf in decode_sldtgroup
  docs/devel/build-system: fix 'softmu' typo

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents adf02c44 b2322003

blockdev.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

        }

        goto fail;

    } else {

        assert(!local_err);

docs/devel/build-system.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

hw/s390x/s390-pci-bus.c

+1 −3
Original line number Diff line number Diff line
@@ -731,10 +731,8 @@ 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);

}

}



static int s390_pci_msix_init(S390PCIBusDevice *pbdev)

{

qga/commands-posix.c

+2 −5
Original line number Diff line number Diff line
@@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode, Error **errp) 
        return true;

    }



    if (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);

    }

}

target/i386/hvf/x86_decode.c

+0 −2
Original line number Diff line number Diff line
@@ -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)