From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsFsB-0004sY-4j for qemu-devel@nongnu.org; Fri, 30 Oct 2015 16:02:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZsFs7-0000kU-65 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 16:02:03 -0400 Received: from resqmta-po-02v.sys.comcast.net ([2001:558:fe16:19:96:114:154:161]:45619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsFs6-0000kQ-W7 for qemu-devel@nongnu.org; Fri, 30 Oct 2015 16:01:59 -0400 From: Eric Blake Date: Fri, 30 Oct 2015 14:01:53 -0600 Message-Id: <1446235313-2570-1-git-send-email-eblake@redhat.com> In-Reply-To: <1446219774-1802-19-git-send-email-armbru@redhat.com> References: <1446219774-1802-19-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH] fixup! char: Convert to new qapi union layout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , armbru@redhat.com Fix build failure on w32 Signed-off-by: Eric Blake --- 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