Merge branch 'for-avi' of git://git.et.redhat.com/qemu-net

Merge branch 'for-avi' of git://git.et.redhat.com/qemu-net

* 'for-avi' of git://git.et.redhat.com/qemu-net: (36 commits)
  Final net cleanup after conversion to QemuOpts
  Port PCI NIC hotplug to QemuOpts
  Port usb net to QemuOpts
  Port host_net_add monitor command to QemuOpts
  Port -net tap to QemuOpts
  Clean up legacy code in net_client_init()
  Port -net user to QemuOpts
  Port -net dump to QemuOpts
  Port -net none and -net nic to QemuOpts
  Port -net vde to QemuOpts
  Port -net socket to QemuOpts
  Add qemu_net_opts
  Never overwrite a QemuOpt
  Add qemu_opts_validate() for post parsing validation
  Make qemu_opts_parse() handle empty strings
  Remove double error message for -device option parsing
  Remove double error message in qemu_option_set()
  Remove bogus error message from qemu_opts_set()
  Drop config_error(), use qemu_error() instead
  Don't exit() in config_error()
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>