diff options
| author | Peter Maydell | 2017-10-16 19:29:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-16 19:29:38 +0200 |
| commit | e24cdd07216890d24468cdcbdd5a3e60b3e9f23b (patch) | |
| tree | d6d3181b72eeee66cebd40f1f23da623a37421fe /tests/libqos/libqos.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | default-configs: Enable CONFIG_VMXNET3_PCI only on x86 (diff) | |
| download | qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.tar.gz qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.tar.xz qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.zip | |
Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging
Some m68k, qtest and config improvements
# gpg: Signature made Mon 16 Oct 2017 13:38:03 BST
# gpg: using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg: aka "Thomas Huth <thuth@redhat.com>"
# gpg: aka "Thomas Huth <huth@tuxfamily.org>"
# gpg: aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth/tags/pull-request-2017-10-16:
default-configs: Enable CONFIG_VMXNET3_PCI only on x86
tests/prom-env: Bump the timeout, and test pseries only in slow mode
tests: use g_new() family of functions
M68K: use g_new() family of functions
hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/libqos/libqos.c')
| -rw-r--r-- | tests/libqos/libqos.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 6226546c28..991bc1aec2 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -17,7 +17,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap) { char *cmdline; - struct QOSState *qs = g_malloc(sizeof(QOSState)); + struct QOSState *qs = g_new(QOSState, 1); cmdline = g_strdup_vprintf(cmdline_fmt, ap); qs->qts = qtest_start(cmdline); |