[Qemu-devel] [PATCH 0/2] qdev: two little fixes.

[Qemu-devel] [PATCH 0/2] qdev: two little fixes.

[Gerd Hoffmann]

  Hi,

This just brings two little bugfixes as incremental patches for the qdev
patch series posted last friday, found them while coding / testing more
qdev stuff.

If prefered I can also fold them in and repost the whole series.

cheers,
  Gerd

[Qemu-devel] [PATCH 1/2] qdev: catch unknown devices in -device

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/qdev.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 979ed4f..009e68d 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -133,6 +133,11 @@ DeviceState *qdev_device_add(const char *cmdline)
     }
     info = qdev_find_info(NULL, driver);
 
+    if (!info) {
+        fprintf(stderr, "Device \"%s\" not found.  Try -device '?' for a list.\n",
+                driver);
+        return NULL;
+    }
     if (!info->bus_info->add) {
         fprintf(stderr, "bus \"%s\" can't add devices.\n",
                 info->bus_info->name);
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/2] qdev: fix nic/id windup.

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/pci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index 3410ea7..cc4882e 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -821,7 +821,8 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model,
     for (i = 0; pci_nic_models[i]; i++) {
         if (strcmp(nd->model, pci_nic_models[i]) == 0) {
             dev = pci_create(pci_nic_names[i], devaddr);
-            snprintf(dev->id, sizeof(dev->id), "%s", nd->id);
+            if (nd->id)
+                snprintf(dev->id, sizeof(dev->id), "%s", nd->id);
             dev->nd = nd;
             qdev_init(dev);
             nd->private = dev;
-- 
1.6.2.5