regenerate against QEMU 7.1.0 #191
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If generating against a QEMU distribution that has unions with base fields, the code generator would generate structs that conflict with each other. For example, BlockdevOptions results in code generation with a number of structs with the same name (i.e., "BlockdevOptionsGluster"), where you'd see a struct emitted for the variant that contains the base member fields and also a standalone BlockdevOptionsGluster which is defined separately in a QAPI document. Because of how union bases work, they are technically distinct structs, so make them distinct.
The KeyValue union changes from a simple union to a flat union with a discriminator and currently code generation for flat unions generates MarshalJSON methods that recurse infinitely.
connorkuehl
force-pushed
the
modern-qapi-unblock-codegen
branch
from
19faaa0
to
7a71513
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I am assuming but am not entirely sure that the restriction against generating lists of interface types as a field (simple union, flat union, and alternate) is because those generators generate structs of their own whose names collide with preexisting structs.
The first commit lifts that restriction and also adds the word "Variant" as a prefix to these types, thus removing the name collisions. There's additional reasoning in the commit as to why that is.
I've also removed a test that starts failing but that is because newer versions of the QEMU API define that type as a discriminated union instead of a flat union, and our code generator currently (on master) generates stack overflows when trying to marshal a discriminated union. I've filed #190 for that.
Depends on #189
Closes #188
Closes #187