From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:53054)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1RkBKF-0006ji-Fx
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1RkBKB-0002nW-AU
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:31 -0500
Received: from mail-ee0-f45.google.com ([74.125.83.45]:42217)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1RkBKB-0002nR-2e
	for qemu-devel@nongnu.org; Mon, 09 Jan 2012 04:15:27 -0500
Received: by eekb45 with SMTP id b45so2309065eek.4
	for <qemu-devel@nongnu.org>; Mon, 09 Jan 2012 01:15:26 -0800 (PST)
Date: Mon, 9 Jan 2012 08:06:13 +0000
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20120109080613.GA7998@stefanha-thinkpad.localdomain>
References: <alpine.LFD.2.02.1201081253310.14379@bbs.intern>
	<CAJSP0QXCtZ+WMjY+YOQs53NJsUM44N=W+KLiKOa+vdS2_k=8GA@mail.gmail.com>
	<alpine.LFD.2.02.1201082149400.545@bbs.intern>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.LFD.2.02.1201082149400.545@bbs.intern>
Subject: Re: [Qemu-devel] [PATCH] network: Added option to disable NIC
 option roms
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerhard Wiesinger <lists@wiesinger.com>
Cc: Kevin O'Connor <kevin@koconnor.net>, qemu-devel@nongnu.org, Gleb Natapov <gleb@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>

On Sun, Jan 08, 2012 at 09:56:20PM +0100, Gerhard Wiesinger wrote:
> On Sun, 8 Jan 2012, Stefan Hajnoczi wrote:
> 
> >On Sun, Jan 8, 2012 at 11:55 AM, Gerhard Wiesinger <lists@wiesinger.com> wrote:
> >>Option ROM for network interface cards (NICs) can now explicitly disabled
> >>with romfile=disabled parameter. With hotplugable NICs (currently NE2000,
> >>PCNET)
> >>romfile=(empty) didn't work. This patch disables Option ROMs for iPXE for
> >>alls
> >>supported NICs (hotplugable and non hotplugable).
> >>
> >>Examples with 2 NICs with disabled Option ROM (separated on different lines
> >>for readability):
> >>-device rtl8139,mac=1a:46:0b:ca:bc:7c,vlan=0,romfile=disabled
> >>-net tap,ifname=tap0,script=no,downscript=no,vlan=0
> >>-device pcnet,mac=1a:46:0b:ca:bc:7e,vlan=1,romfile=disabled
> >>-net tap,ifname=tap1,script=no,downscript=no,vlan=1
> >
> >Did you consider "no" or "none"?  Those are already used by -net
> >script=no and -vga none.  I'm afraid we don't have much consistency in
> >the command-line and adding more variants of basically the same
> >concept should be avoided when possible.
> 
> Whether the option is spelled "disabled", "no", "none" or all of
> them above: I don't care about that, just the group of maintainers
> should decide (I would prefer all of them ...).
> 
> The only thing: just help me with git and doing another commit and
> preparing V2 patch then ...
> 
> # I did:
> git stash save mypatch
> git branch -b mybranch lastcommit
> # can be optimized with -b option ...
> git checkout mybranch
> git stash pop
> git merge --squash master
> git commit -a -F - <<EOF
> commit message
> EOF
> # Signoff must be added
> git format-patch -s master
> git checkout master
> # Send mail

Okay, you commited your patch onto the 'mypatch' branch.

$ git checkout mypatch  # go back to your branch
$ $EDITOR               # make changes to the code
$ git commit --amend -a # modify the last commit
$ git format-patch -s HEAD^ # generate new patch

Stefan