On 01/06/2015 10:45 PM, Paolo Bonzini wrote:
On 06/01/2015 14:29, Marcel Apfelbaum wrote:
@@ -1484,9 +1484,10 @@ static void ppc_spapr_init(MachineState *machine)
/* Graphics */
if (spapr_vga_init(phb->bus)) {
spapr->has_graphics = true;
+ machine->usb |= defaults_enabled();
}
Could the solution be to do this in instance_init? Then you would have
patches 2, 4, 5, 6, 3 (patch 1 would not be needed anymore).
Hi Paolo,
Thanks for the review.
While I agree it will be better if we place this in instance_init,
setting the machine_usb to defaults_enabled() there would be problematic
since it depends on
- papr_vga_init(phb->bus) for sparpr and
- (PPC_INPUT(env) == PPC_FLAGS_INPUT_970) for mac99.
(The env itself is set in machine_init)
Both of those conditions may be available only at machine_init time,
and I am not sure how it would affect those machines.
This is why I prefer it this way,
Thanks,
Marcel
Paolo