Merge remote-tracking branch 'stefanha/net' into staging

# By Amos Kong (1) and Sebastian Huber (1)
# Via Stefan Hajnoczi
* stefanha/net:
  virtio-net: fix the memory leak in rxfilter_notify()
  smc91c111: Fix receive starvation

Message-id: 1384532032-19057-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 9c2aef82e61a92bbd27ef60991b48c27bcd43e55..f8a4981e278555f366fee90d5b453ded7ceb0053 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -168,6 +168,7 @@ static void spapr_vty_class_init(ObjectClass *klass, void *data)
     k->dt_name = "vty";
     k->dt_type = "serial";
     k->dt_compatible = "hvterm1";
+    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
     dc->props = spapr_vty_properties;
     dc->vmsd = &vmstate_spapr_vty;
 }

diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c
index 4ff04113db4aed895fefc0c9813b55278c613855..1bd6f50aaaad0b006dd3e552ec8c8b8918d7db96 100644 (file)
--- a/hw/net/spapr_llan.c
+++ b/hw/net/spapr_llan.c
@@ -531,6 +531,7 @@ static void spapr_vlan_class_init(ObjectClass *klass, void *data)
     k->dt_type = "network";
     k->dt_compatible = "IBM,l-lan";
     k->signal_mask = 0x1;
+    set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
     dc->props = spapr_vlan_properties;
     k->rtce_window_size = 0x10000000;
     dc->vmsd = &vmstate_spapr_llan;

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index eb4500e26fa27926400184b1fddb2006f9a01ca0..beaad682ac6fb21b3ab03135f3b86a45c750f15f 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -182,6 +182,7 @@ static void spapr_nvram_class_init(ObjectClass *klass, void *data)
     k->dt_name = "nvram";
     k->dt_type = "nvram";
     k->dt_compatible = "qemu,spapr-nvram";
+    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
     dc->props = spapr_nvram_properties;
 }
 

diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c
index 2a26042701a17a3724ec4aeb72daaec3c38d0064..c0c46d7f7cfac6705928c8dfdd0ea30323f69b4c 100644 (file)
--- a/hw/scsi/spapr_vscsi.c
+++ b/hw/scsi/spapr_vscsi.c
@@ -1223,6 +1223,7 @@ static void spapr_vscsi_class_init(ObjectClass *klass, void *data)
     k->dt_type = "vscsi";
     k->dt_compatible = "IBM,v-scsi";
     k->signal_mask = 0x00000001;
+    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
     dc->props = spapr_vscsi_properties;
     k->rtce_window_size = 0x10000000;
     dc->vmsd = &vmstate_spapr_vscsi;

diff --git a/pc-bios/README b/pc-bios/README
index b4138d16d861671c1d877100f9db473717405f3a..1501cf14b4efb1d2a8ba0e35c27b04d2a605693b 100644 (file)
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -17,7 +17,7 @@
 - SLOF (Slimline Open Firmware) is a free IEEE 1275 Open Firmware
   implementation for certain IBM POWER hardware.  The sources are at
   https://github.com/aik/SLOF, and the image currently in qemu is
-  built from git tag qemu-slof-20130827.
+  built from git tag qemu-slof-20131015.
 
 - sgabios (the Serial Graphics Adapter option ROM) provides a means for
   legacy x86 software to communicate with an attached serial console as

diff --git a/pc-bios/slof.bin b/pc-bios/slof.bin
index 0e8b51ad1f3ecde581db2a49c1b75e96e9084c41..92a9831be7ade3d09a8b0aea08d0694da792da51 100644 (file)
Binary files a/pc-bios/slof.bin and b/pc-bios/slof.bin differ

diff --git a/roms/SLOF b/roms/SLOF
index a523d1b0cd6e96cf5e393f0a10f897e8ed639fdc..e2e8ac901e617573ea383f9cffd136146d0675a4 160000 (submodule)
--- a/roms/SLOF
+++ b/roms/SLOF
@@ -1 +1 @@
-Subproject commit a523d1b0cd6e96cf5e393f0a10f897e8ed639fdc
+Subproject commit e2e8ac901e617573ea383f9cffd136146d0675a4