diff options
author | Anthony Liguori | 2010-12-17 15:21:29 +0100 |
---|---|---|
committer | Anthony Liguori | 2010-12-17 15:21:29 +0100 |
commit | b254b0d15d48efc3bd43ae535158ded3c1519257 (patch) | |
tree | 856460106817ca5ccbab285b474a52cdcac2a46e /net.c | |
parent | Watchdog: disable watchdog timer when hard-rebooting a guest. (diff) | |
parent | pci/aer: factor out common code (diff) | |
download | qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.tar.gz qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.tar.xz qemu-b254b0d15d48efc3bd43ae535158ded3c1519257.zip |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'net.c')
-rw-r--r-- | net.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1050,6 +1050,10 @@ static const struct { .name = "mcast", .type = QEMU_OPT_STRING, .help = "UDP multicast address and port number", + }, { + .name = "localaddr", + .type = QEMU_OPT_STRING, + .help = "source address for multicast packets", }, { /* end of list */ } }, |