PORTREVISION=	1

diff --git a/nova/objects/floating_ip.py b/nova/objects/floating_ip.py

index 9881dfcecf..922a86a31e 100644

--- a/nova/objects/floating_ip.py

+++ b/nova/objects/floating_ip.py

@@ -194,7 +194,8 @@ class FloatingIPList(obj_base.ObjectListBase, obj_base.NovaObject):

     def get_by_project(cls, context, project_id):

         db_floatingips = db.floating_ip_get_all_by_project(context, project_id)

         return obj_base.obj_make_list(context, cls(context),

-                                      objects.FloatingIP, db_floatingips)

+                                      objects.FloatingIP, db_floatingips,

+                                      expected_attrs=['fixed_ip'])

     @obj_base.remotable_classmethod

     def get_by_fixed_address(cls, context, fixed_address):

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py

index 6d0e41ad2c..ebd1a6fdad 100644

--- a/nova/virt/libvirt/driver.py

+++ b/nova/virt/libvirt/driver.py

@@ -4321,7 +4321,7 @@ class LibvirtDriver(driver.ComputeDriver):

     def _create_consoles(self, virt_type, guest, instance, flavor, image_meta,

                          caps):

-        if virt_type in ("qemu", "kvm"):

+        if virt_type in ("qemu", "kvm", "xen"):

             # Create the serial console char devices

             self._create_serial_console_devices(guest, instance, flavor,

                                                 image_meta)