[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] fixup! char: Convert to new qapi union layout
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH] fixup! char: Convert to new qapi union layout |
Date: |
Fri, 30 Oct 2015 14:01:53 -0600 |
Fix build failure on w32
Signed-off-by: Eric Blake <address@hidden>
---
Hopefully, this is the only use of qapi union types hiding
behind #ifdefs (I relied on the compiler to tell me which spots
need conversion, but that doesn't work for spots that aren't
compiled in my setup)
qemu-char.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 8f04a9d..5448b0f 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4048,7 +4048,7 @@ static CharDriverState *qmp_chardev_open_file(const char
*id,
ChardevReturn *ret,
Error **errp)
{
- ChardevFile *file = backend->file;
+ ChardevFile *file = backend->u.file;
HANDLE out;
if (file->has_in) {
@@ -4070,7 +4070,7 @@ static CharDriverState *qmp_chardev_open_serial(const
char *id,
ChardevReturn *ret,
Error **errp)
{
- ChardevHostdev *serial = backend->serial;
+ ChardevHostdev *serial = backend->u.serial;
return qemu_chr_open_win_path(serial->device, errp);
}
--
2.4.3
- [Qemu-devel] [PULL 09/25] qapi: Prefer typesafe upcasts to qapi base classes, (continued)
- [Qemu-devel] [PULL 09/25] qapi: Prefer typesafe upcasts to qapi base classes, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 20/25] memory: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 01/25] tests/qapi-schema: Test for reserved names, empty struct, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 17/25] net: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 15/25] block: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 22/25] qapi: Finish converting to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 14/25] tests: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 11/25] qapi-visit: Remove redundant functions for flat union base, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 19/25] input: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PULL 18/25] char: Convert to new qapi union layout, Markus Armbruster, 2015/10/30
- [Qemu-devel] [PATCH] fixup! char: Convert to new qapi union layout,
Eric Blake <=
- [Qemu-devel] [PULL 23/25] qapi: Reserve 'u' member name, Markus Armbruster, 2015/10/30
- Re: [Qemu-devel] [PULL 00/25] QAPI patches, Peter Maydell, 2015/10/30