Pull request
These patches would have gone through Thomas Huth but he is away on leave. -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl5iXM8ACgkQnKSrs4Gr c8jrWQf/fwbUiGrUaJwFLcYt9trPr0IAR5RxlJgyEcVXFD2PN6IVt1bShvPibYPr 6Eum+xk1PYWI/TBVeGMMn5AV6ABXp/S2Evp++cIXGgZ4OGiGp62UPibSKVqx6/xg ebPzci41vlJ8BN3qyMkikXuyYitfPrrhj32+ReW5CwQodculw3HPeCyntQ3Auii4 Ku7yX0g80pxJDfcKeK/ETYpMyildDH/Z97rBQB4DIHGCtioYSYMvtIQ1pOnPd5Y7 EOAVuwcOrxT5Cn4Nj03unFPRCiTyWnpzBPm0SJYF0n/CrHJynzyuIOzjb2usF44s r6BNmJDwpJdECNeo8tVfiHVOto8fpQ== =sCek -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging Pull request These patches would have gone through Thomas Huth but he is away on leave. # gpg: Signature made Fri 06 Mar 2020 14:23:11 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: tests: Fix a bug with count variables qtest: fix fuzzer-related 80-char limit violations fuzz: fix style/typos in linker-script comments Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
c205828579
3
qtest.c
3
qtest.c
|
@ -794,7 +794,8 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void qtest_server_set_send_handler(void (*send)(void*, const char*), void *opaque)
|
void qtest_server_set_send_handler(void (*send)(void*, const char*),
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
qtest_server_send = send;
|
qtest_server_send = send;
|
||||||
qtest_server_send_opaque = opaque;
|
qtest_server_send_opaque = opaque;
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
/* We adjust linker script modification to place all of the stuff that needs to
|
/*
|
||||||
* persist across fuzzing runs into a contiguous seciton of memory. Then, it is
|
* We adjust linker script modification to place all of the stuff that needs to
|
||||||
|
* persist across fuzzing runs into a contiguous section of memory. Then, it is
|
||||||
* easy to re-map the counter-related memory as shared.
|
* easy to re-map the counter-related memory as shared.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
SECTIONS
|
SECTIONS
|
||||||
{
|
{
|
||||||
|
@ -17,7 +18,8 @@ SECTIONS
|
||||||
}
|
}
|
||||||
.data.fuzz_ordered :
|
.data.fuzz_ordered :
|
||||||
{
|
{
|
||||||
/* Coverage counters. They're not necessary for fuzzing, but are useful
|
/*
|
||||||
|
* Coverage counters. They're not necessary for fuzzing, but are useful
|
||||||
* for analyzing the fuzzing performance
|
* for analyzing the fuzzing performance
|
||||||
*/
|
*/
|
||||||
__start___llvm_prf_cnts = .;
|
__start___llvm_prf_cnts = .;
|
||||||
|
@ -32,6 +34,8 @@ SECTIONS
|
||||||
__FUZZ_COUNTERS_END = .;
|
__FUZZ_COUNTERS_END = .;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* Dont overwrite the SECTIONS in the default linker script. Instead insert the
|
/*
|
||||||
* above into the default script */
|
* Don't overwrite the SECTIONS in the default linker script. Instead insert the
|
||||||
|
* above into the default script
|
||||||
|
*/
|
||||||
INSERT AFTER .data;
|
INSERT AFTER .data;
|
||||||
|
|
|
@ -120,7 +120,10 @@ static void walk_path(QOSGraphNode *orig_path, int len)
|
||||||
QOSGraphNode *path;
|
QOSGraphNode *path;
|
||||||
QOSGraphEdge *edge;
|
QOSGraphEdge *edge;
|
||||||
|
|
||||||
/* etype set to QEDGE_CONSUMED_BY so that machine can add to the command line */
|
/*
|
||||||
|
* etype set to QEDGE_CONSUMED_BY so that machine can add to the command
|
||||||
|
* line
|
||||||
|
*/
|
||||||
QOSEdgeType etype = QEDGE_CONSUMED_BY;
|
QOSEdgeType etype = QEDGE_CONSUMED_BY;
|
||||||
|
|
||||||
/* twice QOS_PATH_MAX_ELEMENT_SIZE since each edge can have its arg */
|
/* twice QOS_PATH_MAX_ELEMENT_SIZE since each edge can have its arg */
|
||||||
|
|
|
@ -235,7 +235,7 @@ static void *rcu_q_updater(void *arg)
|
||||||
j++;
|
j++;
|
||||||
if (target_el == j) {
|
if (target_el == j) {
|
||||||
struct list_element *new_el = g_new(struct list_element, 1);
|
struct list_element *new_el = g_new(struct list_element, 1);
|
||||||
n_nodes += n_nodes_local;
|
n_nodes_local++;
|
||||||
TEST_LIST_INSERT_AFTER_RCU(el, new_el, entry);
|
TEST_LIST_INSERT_AFTER_RCU(el, new_el, entry);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue