On Fri, Jun 19, 2015 at 08:43:29AM +0200, Markus Armbruster wrote: > Laszlo Ersek <ler...@redhat.com> writes: > > > On 06/18/15 18:49, Eduardo Habkost wrote: > >> commit ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4 doesn't match the patch > >> submitted by Laszlo to qemu-devel. We reuse pc_q35_2_4_machine_options() > >> inside pc_q35_2_3_machine_options(), so we need to undo the no_floppy > >> change in pc_q35_2_3_machine_options(). > >> > >> This restores the previous behavior where all the 2.3 and older machines > >> had no_floppy=0. > > Mentioning it was a botched merge, not a review failure wouldn't hurt.
That's what I tried to say when I wrote that the commit doesn't match the patch that Laszlo submitted to qemu-devel. -- Eduardo
