From: Mark McLoughlin <markmc@redhat.com>
Date: Tue, 6 Oct 2009 11:17:15 +0000 (+0100)
Subject: Port PCI NIC hotplug to QemuOpts
X-Git-Tag: qemu-xen-4.2.0~5346
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c59c7ea94796a4fce2fe79b8f9aa3628dc2e0b2a;p=qemu-xen.git

Port PCI NIC hotplug to QemuOpts

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 44f6a2f9bb..7af4f29e7d 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -32,14 +32,26 @@
 #include "block_int.h"
 #include "scsi-disk.h"
 #include "virtio-blk.h"
+#include "qemu-config.h"
 
 #if defined(TARGET_I386) || defined(TARGET_X86_64)
 static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
-                                       const char *devaddr, const char *opts)
+                                       const char *devaddr,
+                                       const char *opts_str)
 {
+    QemuOpts *opts;
     int ret;
 
-    ret = net_client_init(mon, "nic", opts);
+    opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", NULL);
+    if (!opts) {
+        monitor_printf(mon, "parsing network options '%s' failed\n",
+                       opts_str ? opts_str : "");
+        return NULL;
+    }
+
+    qemu_opt_set(opts, "type", "nic");
+
+    ret = net_client_init_from_opts(mon, opts);
     if (ret < 0)
         return NULL;
     if (nd_table[ret].devaddr) {