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 <li...@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