diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-09 13:36:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-09 13:36:10 +0100 |
| commit | 68a7b9724fe80bedb85060bde605213ce3f9baec (patch) | |
| tree | a635803eb845b9c8f90331698e74180c461fa696 /configure | |
| parent | c56247e55bde4386003365bb5e40b2875e88f779 (diff) | |
| parent | 2d2023c3b99edb33ad4bb9791f70456ea1a1c049 (diff) | |
| download | qemu-68a7b9724fe80bedb85060bde605213ce3f9baec.zip qemu-68a7b9724fe80bedb85060bde605213ce3f9baec.tar.gz qemu-68a7b9724fe80bedb85060bde605213ce3f9baec.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
Pull request trivial branch 2019-05-03
# gpg: Signature made Fri 03 May 2019 12:26:34 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
sockets: avoid string truncation warnings when copying UNIX path
hw/sparc/leon3: Allow load of uImage firmwares
Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts
net: Print output of "-net nic, model=help" to stdout instead of stderr
Header cleanups
Update configure
configure: fix pam test warning
qom: use object_new_with_type in object_new_with_propv
doc: fix the configuration path
CODING_STYLE: indent example code as all others
CODING_STYLE: specify the indent rule for multiline code
hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -2937,9 +2937,9 @@ if test "$auth_pam" != "no"; then int main(void) { const char *service_name = "qemu"; const char *user = "frank"; - const struct pam_conv *pam_conv = NULL; + const struct pam_conv pam_conv = { 0 }; pam_handle_t *pamh = NULL; - pam_start(service_name, user, pam_conv, &pamh); + pam_start(service_name, user, &pam_conv, &pamh); return 0; } EOF @@ -7882,7 +7882,6 @@ LINKS="$LINKS python" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.lid \ - $source_path/pc-bios/*.aml \ $source_path/pc-bios/*.rom \ $source_path/pc-bios/*.dtb \ $source_path/pc-bios/*.img \ |