mirror of https://github.com/xemu-project/xemu.git
becceedc4d
There's no reason to do two malloc's for an alternate type visiting
a QAPI struct; let's just inline the struct directly as the C union
branch of the struct.
Surprisingly, no clients were actually using the struct member prior
to this patch outside of the testsuite; an earlier patch in the series
added some testsuite coverage to make the effect of this patch more
obvious.
In qapi.py, c_type() gains a new is_unboxed flag to control when we
are emitting a C struct unboxed within the context of an outer
struct (different from our other two modes of usage with no flags
for normal local variable declarations, and with is_param for adding
'const' in a parameter list). I don't know if there is any more
pythonic way of collapsing the two flags into a single parameter,
as we never have a caller setting both flags at once.
Ultimately, we want to also unbox branches for QAPI unions, but as
that touches a lot more client code, it is better as separate
patches. But since unions and alternates share gen_variants(), I
had to hack in a way to test if we are visiting an alternate type
for setting the is_unboxed flag: look for a non-object branch.
This works because alternates have at least two branches, with at
most one object branch, while unions have only object branches.
The hack will go away in a later patch.
The generated code difference to qapi-types.h is relatively small:
| struct BlockdevRef {
| QType type;
| union { /* union tag is @type */
| void *data;
|- BlockdevOptions *definition;
|+ BlockdevOptions definition;
| char *reference;
| } u;
| };
The corresponding spot in qapi-visit.c calls visit_type_FOO(), which
first calls visit_start_struct() to allocate or deallocate the member
and handle a layer of {} from the JSON stream, then visits the
members. To peel off the indirection and the memory management that
comes with it, we inline this call, then suppress allocation /
deallocation by passing NULL to visit_start_struct(), and adjust the
member visit:
| switch ((*obj)->type) {
| case QTYPE_QDICT:
|- visit_type_BlockdevOptions(v, name, &(*obj)->u.definition, &err);
|+ visit_start_struct(v, name, NULL, 0, &err);
|+ if (err) {
|+ break;
|+ }
|+ visit_type_BlockdevOptions_fields(v, &(*obj)->u.definition, &err);
|+ error_propagate(errp, err);
|+ err = NULL;
|+ visit_end_struct(v, &err);
| break;
| case QTYPE_QSTRING:
| visit_type_str(v, name, &(*obj)->u.reference, &err);
The visit of non-object fields is unchanged.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1455778109-6278-13-git-send-email-eblake@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
||
|---|---|---|
| audio | ||
| backends | ||
| block | ||
| bsd-user | ||
| contrib | ||
| crypto | ||
| default-configs | ||
| disas | ||
| docs | ||
| dtc@65cc4d2748 | ||
| fpu | ||
| fsdev | ||
| gdb-xml | ||
| hw | ||
| include | ||
| io | ||
| libdecnumber | ||
| linux-headers | ||
| linux-user | ||
| migration | ||
| nbd | ||
| net | ||
| pc-bios | ||
| pixman@87eea99e44 | ||
| po | ||
| qapi | ||
| qga | ||
| qobject | ||
| qom | ||
| replay | ||
| roms | ||
| scripts | ||
| slirp | ||
| stubs | ||
| target-alpha | ||
| target-arm | ||
| target-cris | ||
| target-i386 | ||
| target-lm32 | ||
| target-m68k | ||
| target-microblaze | ||
| target-mips | ||
| target-moxie | ||
| target-openrisc | ||
| target-ppc | ||
| target-s390x | ||
| target-sh4 | ||
| target-sparc | ||
| target-tilegx | ||
| target-tricore | ||
| target-unicore32 | ||
| target-xtensa | ||
| tcg | ||
| tests | ||
| trace | ||
| ui | ||
| util | ||
| .dir-locals.el | ||
| .exrc | ||
| .gitignore | ||
| .gitmodules | ||
| .mailmap | ||
| .travis.yml | ||
| CODING_STYLE | ||
| COPYING | ||
| COPYING.LIB | ||
| Changelog | ||
| HACKING | ||
| LICENSE | ||
| MAINTAINERS | ||
| Makefile | ||
| Makefile.objs | ||
| Makefile.target | ||
| README | ||
| VERSION | ||
| accel.c | ||
| aio-posix.c | ||
| aio-win32.c | ||
| arch_init.c | ||
| async.c | ||
| balloon.c | ||
| block.c | ||
| blockdev-nbd.c | ||
| blockdev.c | ||
| blockjob.c | ||
| bootdevice.c | ||
| bt-host.c | ||
| bt-vhci.c | ||
| configure | ||
| cpu-exec-common.c | ||
| cpu-exec.c | ||
| cpus.c | ||
| cputlb.c | ||
| device-hotplug.c | ||
| device_tree.c | ||
| disas.c | ||
| dma-helpers.c | ||
| dump.c | ||
| exec.c | ||
| gdbstub.c | ||
| hmp-commands-info.hx | ||
| hmp-commands.hx | ||
| hmp.c | ||
| hmp.h | ||
| iohandler.c | ||
| ioport.c | ||
| iothread.c | ||
| kvm-all.c | ||
| kvm-stub.c | ||
| main-loop.c | ||
| memory.c | ||
| memory_mapping.c | ||
| module-common.c | ||
| monitor.c | ||
| numa.c | ||
| os-posix.c | ||
| os-win32.c | ||
| page_cache.c | ||
| qapi-schema.json | ||
| qdev-monitor.c | ||
| qdict-test-data.txt | ||
| qemu-bridge-helper.c | ||
| qemu-char.c | ||
| qemu-doc.texi | ||
| qemu-ga.texi | ||
| qemu-img-cmds.hx | ||
| qemu-img.c | ||
| qemu-img.texi | ||
| qemu-io-cmds.c | ||
| qemu-io.c | ||
| qemu-nbd.c | ||
| qemu-nbd.texi | ||
| qemu-options-wrapper.h | ||
| qemu-options.h | ||
| qemu-options.hx | ||
| qemu-seccomp.c | ||
| qemu-tech.texi | ||
| qemu-timer.c | ||
| qemu.nsi | ||
| qemu.sasl | ||
| qjson.c | ||
| qmp-commands.hx | ||
| qmp.c | ||
| qtest.c | ||
| rules.mak | ||
| softmmu_template.h | ||
| spice-qemu-char.c | ||
| tcg-runtime.c | ||
| tci.c | ||
| thread-pool.c | ||
| thunk.c | ||
| tpm.c | ||
| trace-events | ||
| translate-all.c | ||
| translate-all.h | ||
| translate-common.c | ||
| user-exec.c | ||
| version.rc | ||
| vl.c | ||
| xen-common-stub.c | ||
| xen-common.c | ||
| xen-hvm-stub.c | ||
| xen-hvm.c | ||
| xen-mapcache.c | ||
README
QEMU README
===========
QEMU is a generic and open source machine & userspace emulator and
virtualizer.
QEMU is capable of emulating a complete machine in software without any
need for hardware virtualization support. By using dynamic translation,
it achieves very good performance. QEMU can also integrate with the Xen
and KVM hypervisors to provide emulated hardware while allowing the
hypervisor to manage the CPU. With hypervisor support, QEMU can achieve
near native performance for CPUs. When QEMU emulates CPUs directly it is
capable of running operating systems made for one machine (e.g. an ARMv7
board) on a different machine (e.g. an x86_64 PC board).
QEMU is also capable of providing userspace API virtualization for Linux
and BSD kernel interfaces. This allows binaries compiled against one
architecture ABI (e.g. the Linux PPC64 ABI) to be run on a host using a
different architecture ABI (e.g. the Linux x86_64 ABI). This does not
involve any hardware emulation, simply CPU and syscall emulation.
QEMU aims to fit into a variety of use cases. It can be invoked directly
by users wishing to have full control over its behaviour and settings.
It also aims to facilitate integration into higher level management
layers, by providing a stable command line interface and monitor API.
It is commonly invoked indirectly via the libvirt library when using
open source applications such as oVirt, OpenStack and virt-manager.
QEMU as a whole is released under the GNU General Public License,
version 2. For full licensing details, consult the LICENSE file.
Building
========
QEMU is multi-platform software intended to be buildable on all modern
Linux platforms, OS-X, Win32 (via the Mingw64 toolchain) and a variety
of other UNIX targets. The simple steps to build QEMU are:
mkdir build
cd build
../configure
make
Complete details of the process for building and configuring QEMU for
all supported host platforms can be found in the qemu-tech.html file.
Additional information can also be found online via the QEMU website:
http://qemu-project.org/Hosts/Linux
http://qemu-project.org/Hosts/W32
Submitting patches
==================
The QEMU source code is maintained under the GIT version control system.
git clone git://git.qemu-project.org/qemu.git
When submitting patches, the preferred approach is to use 'git
format-patch' and/or 'git send-email' to format & send the mail to the
qemu-devel@nongnu.org mailing list. All patches submitted must contain
a 'Signed-off-by' line from the author. Patches should follow the
guidelines set out in the HACKING and CODING_STYLE files.
Additional information on submitting patches can be found online via
the QEMU website
http://qemu-project.org/Contribute/SubmitAPatch
http://qemu-project.org/Contribute/TrivialPatches
Bug reporting
=============
The QEMU project uses Launchpad as its primary upstream bug tracker. Bugs
found when running code built from QEMU git or upstream released sources
should be reported via:
https://bugs.launchpad.net/qemu/
If using QEMU via an operating system vendor pre-built binary package, it
is preferable to report bugs to the vendor's own bug tracker first. If
the bug is also known to affect latest upstream code, it can also be
reported via launchpad.
For additional information on bug reporting consult:
http://qemu-project.org/Contribute/ReportABug
Contact
=======
The QEMU community can be contacted in a number of ways, with the two
main methods being email and IRC
- qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
- #qemu on irc.oftc.net
Information on additional methods of contacting the community can be
found online via the QEMU website:
http://qemu-project.org/Contribute/StartHere
-- End