From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5vmY-00017h-QP for qemu-devel@nongnu.org; Fri, 19 Jun 2015 08:52:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5vmU-0002oN-Lg for qemu-devel@nongnu.org; Fri, 19 Jun 2015 08:52:30 -0400 Message-ID: <55841080.20501@redhat.com> Date: Fri, 19 Jun 2015 14:52:16 +0200 From: Laszlo Ersek MIME-Version: 1.0 References: <1433161230-29421-1-git-send-email-mst@redhat.com> <1433161230-29421-44-git-send-email-mst@redhat.com> <87h9q4tc4d.fsf@blackfin.pond.sub.org> In-Reply-To: <87h9q4tc4d.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL v2 43/60] i386: drop FDC in pc-q35-2.4+ if neither it nor floppy drives are wanted List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , "Michael S. Tsirkin" Cc: Kevin Wolf , Peter Maydell , Eduardo Habkost , qemu-block@nongnu.org, qemu-devel@nongnu.org, "Gabriel L. Somlo" , Gerd Hoffmann , Paolo Bonzini , John Snow , Richard Henderson On 06/19/15 09:01, Markus Armbruster wrote: > "Michael S. Tsirkin" writes: > >> From: Laszlo Ersek >> >> It is Very annoying to carry forward an outdatEd coNtroller with a mOdern >> Machine type. >> >> Hence, let us not instantiate the FDC when all of the following apply: >> - the machine type is pc-q35-2.4 or later, >> - "-device isa-fdc" is not passed on the command line (nor in the config >> file), >> - no "-drive if=floppy,..." is requested. >> >> Cc: Markus Armbruster >> Cc: Paolo Bonzini >> Cc: Gerd Hoffmann >> Cc: John Snow >> Cc: "Gabriel L. Somlo" >> Cc: "Michael S. Tsirkin" >> Cc: Kevin Wolf >> Cc: qemu-block@nongnu.org >> Suggested-by: Markus Armbruster >> Signed-off-by: Laszlo Ersek >> Acked-by: Paolo Bonzini >> Reviewed-by: Michael S. Tsirkin >> Signed-off-by: Michael S. Tsirkin >> Reviewed-by: Markus Armbruster >> --- >> hw/i386/pc_q35.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c >> index 9f036c8..66220b3 100644 >> --- a/hw/i386/pc_q35.c >> +++ b/hw/i386/pc_q35.c >> @@ -392,6 +392,7 @@ static void pc_q35_2_4_machine_options(MachineClass *m) >> pc_q35_machine_options(m); >> m->default_machine_opts = "firmware=bios-256k.bin"; >> m->default_display = "std"; >> + m->no_floppy = 1; >> m->alias = "q35"; >> } > > Botched merge, see [PATCH] q35: Re-enable FDC on pc-q35-2.3 and older. > > Your merge is closer to a rewrite than to conflict resolution, rendering > my R-by totally meaningless. > > In the future, please either fully test such a merge, or ask the > submitter / reviewers to review and test. Yes, please. While I *was* Cc'd on this patch in the pull request, I didn't review it. I never expect PULLs to amount to such intrusive changes -- I treat them only as a hint that my patch is going in -- so if such changes are necessary (because the original patch doesn't apply any longer), then please ask me to rebase, or give me an explicit heads-up that my verification / testing is needed. Thanks! Laszlo > For comparison, this is the patch that got actually reviewed and tested: > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index ad014e7..671ae69 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -424,7 +424,8 @@ static void pc_q35_init_1_4(MachineState *machine) > #define PC_Q35_2_4_MACHINE_OPTIONS \ > PC_Q35_MACHINE_OPTIONS, \ > .default_machine_opts = "firmware=bios-256k.bin", \ > - .default_display = "std" > + .default_display = "std", \ > + .no_floppy = 1 > > static QEMUMachine pc_q35_machine_v2_4 = { > PC_Q35_2_4_MACHINE_OPTIONS, > @@ -433,7 +434,10 @@ static QEMUMachine pc_q35_machine_v2_4 = { > .init = pc_q35_init, > }; > > -#define PC_Q35_2_3_MACHINE_OPTIONS PC_Q35_2_4_MACHINE_OPTIONS > +#define PC_Q35_2_3_MACHINE_OPTIONS \ > + PC_Q35_MACHINE_OPTIONS, \ > + .default_machine_opts = "firmware=bios-256k.bin", \ > + .default_display = "std" > > static QEMUMachine pc_q35_machine_v2_3 = { > PC_Q35_2_3_MACHINE_OPTIONS, >