diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-24 18:38:32 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-24 18:38:32 +0300 |
| commit | 7f7ab128c382ac42eb8f6dd619c286e4a4d7772a (patch) | |
| tree | e463c67ed5eae691fd0fe5bc07aa0e2a0e91a84b /qemu-options.hx | |
| parent | Merge commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-merge (diff) | |
| parent | Make the e1000 the default network adapter for the pc target. (diff) | |
| download | qemu-kvm-7f7ab128c382ac42eb8f6dd619c286e4a4d7772a.tar.gz qemu-kvm-7f7ab128c382ac42eb8f6dd619c286e4a4d7772a.tar.bz2 qemu-kvm-7f7ab128c382ac42eb8f6dd619c286e4a4d7772a.zip | |
Merge commit '0d6b0b1d8190738b820955bf749741c1ae60e7d7' into upstream-merge
* commit '0d6b0b1d8190738b820955bf749741c1ae60e7d7':
Make the e1000 the default network adapter for the pc target.
eliminate errors about unused results in block/vpc.c
virtio-blk: add msi support.
qdev/prop: convert isa-bus to helper macros.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index f3e915bec..ade1663be 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -829,7 +829,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, STEXI @item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}] Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n} -= 0 is the default). The NIC is an ne2k_pci by default on the PC += 0 is the default). The NIC is an e1000 by default on the PC target. Optionally, the MAC address can be changed to @var{mac}, the device address set to @var{addr} (PCI cards only), and a @var{name} can be assigned for use in monitor commands. |