xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-24 03:59:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Miscellaneous patches for 2019-03-26

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJcmdBfAAoJEDhwtADrkYZTAJsP/3a4aUwqEZaMXqjMgTcRNJnG
 cRVRTQcrvjA5nGParVlrBW2V27jBM/1Vvi8U0lcG82v1dAbjq1GfWDv06XWHQyrf
 neEVBbL18pZlRkmc1RcHIpsRSCk0mlgwfgON3maTDjTvk8fmANC1dG5Zjuk9GbiI
 5NOIn1+9IM2S3krQ6oaozk/sGarIdTzL6ItIKMx6tFtheSV8FhcCWc+E+u2rVj/a
 BtBVO+Uctops52PZ4pkUXGGffDXHSbu18L3Sj6HRm+I9pJQ7AvdVDDGZJEoiB1fz
 kFtGl/CBD+p/foB3nhHlVhV/TsE/EteRD/YB5tSVMiMTwqvydcJOdRDFAuzbU0sd
 duELT273BB+b5tN6vaNjYwwpMvXMoXV7N/EIOMZL9hOjlNEUOcIoRy56hII8rKdY
 u6AEraYgGgTYtglDXEro0XiMQU9iogvk5MA2azdw2CZOLjVKs5mWfYCF4EHxhbX7
 joqFtG6y+3NDEtcbr530PEu9oyvAhXf126TZzwPqH2Qf6bhHs15qZ7l1xLwaRYCh
 WqaV1mUyMN7cDRaHdXE/9UsBEkjByLTgCmky/WgpmEVY8HDy55L7BaQ1MIMxVNLw
 fTTho+seLY842gBzAK68Cu0OsCWDA90met2SSQ5DUOtSRZ6jLrWIEZ0FXeuGzGHd
 36OfJTXO6Eh0ejkmcGmZ
 =v8KN
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-03-26' into staging

Miscellaneous patches for 2019-03-26

# gpg: Signature made Tue 26 Mar 2019 07:10:23 GMT
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-misc-2019-03-26:
  qapi/qmp-dispatch: fix return value in do_qmp_dispatch
  json: Fix off-by-one assert check in next_state()
  xen-block: Replace qdict_put_obj() by qdict_put() where appropriate
  util/error: Remove an unnecessary NULL check

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-03-26 09:28:24 +00:00
commit 199f8d94be
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/block/xen-block.c
View File

@ -771,7 +771,7 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
QDict *cache_qdict = qdict_new();
qdict_put_bool(cache_qdict, "direct", true);
qdict_put_obj(file_layer, "cache", QOBJECT(cache_qdict));
qdict_put(file_layer, "cache", cache_qdict);
qdict_put_str(file_layer, "aio", "native");
}
@ -796,7 +796,7 @@ static XenBlockDrive *xen_block_drive_create(const char *id,
qdict_put_str(driver_layer, "driver", driver);
g_free(driver);
qdict_put_obj(driver_layer, "file", QOBJECT(file_layer));
qdict_put(driver_layer, "file", file_layer);
g_assert(!drive->node_name);
drive->node_name = xen_block_blockdev_add(drive->id, driver_layer,

2
qapi/qmp-dispatch.c
View File

@ -111,7 +111,7 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request,
if (oob && !(cmd->options & QCO_ALLOW_OOB)) {
error_setg(errp, "The command %s does not support OOB",
command);
return false;
return NULL;
}
if (runstate_check(RUN_STATE_PRECONFIG) &&

2
qobject/json-lexer.c
View File

@ -266,7 +266,7 @@ static inline uint8_t next_state(JSONLexer *lexer, char ch, bool flush,
{
uint8_t next;
assert(lexer->state <= ARRAY_SIZE(json_lexer));
assert(lexer->state < ARRAY_SIZE(json_lexer));
next = json_lexer[lexer->state][(uint8_t)ch];
*char_consumed = !flush && !(next & LOOKAHEAD);
return next & ~LOOKAHEAD;

4
util/error.c
View File

@ -103,10 +103,6 @@ void error_setg_errno_internal(Error **errp,
va_list ap;
int saved_errno = errno;
if (errp == NULL) {
return;
}
va_start(ap, fmt);
error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap,
os_errno != 0 ? strerror(os_errno) : NULL);