Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
backends
/
testdev.c
diff --git
a/qemu/backends/testdev.c
b/qemu/backends/testdev.c
index
eba396a
..
3ab1c90
100644
(file)
--- a/
qemu/backends/testdev.c
+++ b/
qemu/backends/testdev.c
@@
-23,6
+23,7
@@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
+#include "qemu/osdep.h"
#include "qemu-common.h"
#include "sysemu/char.h"
#include "qemu-common.h"
#include "sysemu/char.h"
@@
-108,13
+109,16
@@
static void testdev_close(struct CharDriverState *chr)
g_free(testdev);
}
g_free(testdev);
}
-CharDriverState *chr_testdev_init(void)
+static CharDriverState *chr_testdev_init(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
TestdevCharState *testdev;
CharDriverState *chr;
{
TestdevCharState *testdev;
CharDriverState *chr;
- testdev = g_
malloc0(sizeof(TestdevCharState)
);
- testdev->chr = chr = g_
malloc0(sizeof(CharDriverState)
);
+ testdev = g_
new0(TestdevCharState, 1
);
+ testdev->chr = chr = g_
new0(CharDriverState, 1
);
chr->opaque = testdev;
chr->chr_write = testdev_write;
chr->opaque = testdev;
chr->chr_write = testdev_write;
@@
-125,7
+129,8
@@
CharDriverState *chr_testdev_init(void)
static void register_types(void)
{
static void register_types(void)
{
- register_char_driver("testdev", CHARDEV_BACKEND_KIND_TESTDEV, NULL);
+ register_char_driver("testdev", CHARDEV_BACKEND_KIND_TESTDEV, NULL,
+ chr_testdev_init);
}
type_init(register_types);
}
type_init(register_types);