commit | 6c2679fc19560699679200fb42ab4659bcbe7f79 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <anthony@codemonkey.ws> | Tue Sep 17 10:01:24 2013 -0500 |
committer | Anthony Liguori <anthony@codemonkey.ws> | Tue Sep 17 10:01:24 2013 -0500 |
tree | 8bc60715e3ac0eb73a3ea14d8161098dc35a8c3d | |
parent | 5dc11192b23fbb09fab277d58ac3c42b9699a8b0 [diff] | |
parent | 426e3e6ce1abdb0d85faefbfac3cf4dcc7f224a3 [diff] |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging # By Liu Ping Fan (3) and Jan Kiszka (1) # Via Jan Kiszka * kiszka/queues/slirp: slirp: clean up slirp_update_timeout slirp: set mainloop timeout with more precise value slirp: define timeout as macro slirp: make timeout local Message-id: cover.1379415024.git.jan.kiszka@siemens.com