Commit c569c537 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio,vhost,pc: fixes and updates

balloon fixes wrt migration
virtio-vsock device support

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Fri 09 Sep 2016 22:36:13 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  vhost-vsock: add virtio sockets device
  tests/acpi: speedup acpi tests
  virtio-pci: minor refactoring
  vhost: don't set vring call if no vector
  virtio-pci: error out when both legacy and modern modes are disabled
  virtio-balloon: fix stats vq migration
  virtio: add virtqueue_rewind()
  virtio-balloon: discard virtqueue element on reset
  virtio: zero vq->inuse in virtio_reset()
  virtio-pci: reduce modern_mem_bar size
  target-i386: present virtual L3 cache info for vcpus
  pc: Add 2.8 machine
  virtio-pci: use size from correct structure
  virtio: Tell the user what went wrong when event_notifier_init failed

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c2a57aae fc0b9b0e

configure

+10 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ xfs="" 


vhost_net="no"

vhost_scsi="no"

vhost_vsock="no"

kvm="no"

rdma=""

gprof="no"
@@ -674,6 +675,7 @@ Haiku) 
  kvm="yes"

  vhost_net="yes"

  vhost_scsi="yes"

  vhost_vsock="yes"

  QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES"

;;

esac
@@ -1017,6 +1019,10 @@ for opt do 
  ;;

  --enable-vhost-scsi) vhost_scsi="yes"

  ;;

  --disable-vhost-vsock) vhost_vsock="no"

  ;;

  --enable-vhost-vsock) vhost_vsock="yes"

  ;;

  --disable-opengl) opengl="no"

  ;;

  --enable-opengl) opengl="yes"
@@ -4883,6 +4889,7 @@ echo "uuid support $uuid" 
echo "libcap-ng support $cap_ng"

echo "vhost-net support $vhost_net"

echo "vhost-scsi support $vhost_scsi"

echo "vhost-vsock support $vhost_vsock"

echo "Trace backends    $trace_backends"

if have_backend "simple"; then

echo "Trace output file $trace_file-<pid>"
@@ -5264,6 +5271,9 @@ fi 
if test "$vhost_net" = "yes" ; then

  echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak

fi

if test "$vhost_vsock" = "yes" ; then

  echo "CONFIG_VHOST_VSOCK=y" >> $config_host_mak

fi

if test "$blobs" = "yes" ; then

  echo "INSTALL_BLOBS=yes" >> $config_host_mak

fi

hw/i386/pc_piix.c

+13 −3
Original line number Diff line number Diff line
@@ -437,13 +437,25 @@ static void pc_i440fx_machine_options(MachineClass *m) 
    m->default_display = "std";

}



static void pc_i440fx_2_7_machine_options(MachineClass *m)

static void pc_i440fx_2_8_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->alias = "pc";

    m->is_default = 1;

}



DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,

                      pc_i440fx_2_8_machine_options);





static void pc_i440fx_2_7_machine_options(MachineClass *m)

{

    pc_i440fx_2_8_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);

}



DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,

                      pc_i440fx_2_7_machine_options);
@@ -452,8 +464,6 @@ static void pc_i440fx_2_6_machine_options(MachineClass *m) 
{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_i440fx_2_7_machine_options(m);

    m->is_default = 0;

    m->alias = NULL;

    pcmc->legacy_cpu_hotplug = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}

hw/i386/pc_q35.c

+11 −2
Original line number Diff line number Diff line
@@ -293,12 +293,22 @@ static void pc_q35_machine_options(MachineClass *m) 
    m->has_dynamic_sysbus = true;

}



static void pc_q35_2_7_machine_options(MachineClass *m)

static void pc_q35_2_8_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->alias = "q35";

}



DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,

                   pc_q35_2_8_machine_options);



static void pc_q35_2_7_machine_options(MachineClass *m)

{

    pc_q35_2_8_machine_options(m);

    m->alias = NULL;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);

}



DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,

                   pc_q35_2_7_machine_options);
@@ -306,7 +316,6 @@ static void pc_q35_2_6_machine_options(MachineClass *m) 
{

    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

    pc_q35_2_7_machine_options(m);

    m->alias = NULL;

    pcmc->legacy_cpu_hotplug = true;

    SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);

}

hw/s390x/virtio-ccw.c

+54 −0
Original line number Diff line number Diff line
@@ -1658,6 +1658,57 @@ static const TypeInfo virtio_ccw_9p_info = { 
};

#endif



#ifdef CONFIG_VHOST_VSOCK



static Property vhost_vsock_ccw_properties[] = {

    DEFINE_PROP_CSS_DEV_ID("devno", VirtioCcwDevice, parent_obj.bus_id),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);

    Error *err = NULL;



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

    }

}



static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = vhost_vsock_ccw_realize;

    k->exit = virtio_ccw_exit;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = vhost_vsock_ccw_properties;

    dc->reset = virtio_ccw_reset;

}



static void vhost_vsock_ccw_instance_init(Object *obj)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_VSOCK);

}



static const TypeInfo vhost_vsock_ccw_info = {

    .name          = TYPE_VHOST_VSOCK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VHostVSockCCWState),

    .instance_init = vhost_vsock_ccw_instance_init,

    .class_init    = vhost_vsock_ccw_class_init,

};

#endif



static void virtio_ccw_register(void)

{

    type_register_static(&virtio_ccw_bus_info);
@@ -1674,6 +1725,9 @@ static void virtio_ccw_register(void) 
#ifdef CONFIG_VIRTFS

    type_register_static(&virtio_ccw_9p_info);

#endif

#ifdef CONFIG_VHOST_VSOCK

    type_register_static(&vhost_vsock_ccw_info);

#endif

}



type_init(virtio_ccw_register)

hw/s390x/virtio-ccw.h

+15 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include "hw/virtio/virtio-balloon.h"

#include "hw/virtio/virtio-rng.h"

#include "hw/virtio/virtio-bus.h"

#ifdef CONFIG_VHOST_VSOCK

#include "hw/virtio/vhost-vsock.h"

#endif /* CONFIG_VHOST_VSOCK */



#include "hw/s390x/s390_flic.h"

#include "hw/s390x/css.h"
@@ -197,4 +200,16 @@ typedef struct V9fsCCWState { 


#endif /* CONFIG_VIRTFS */



#ifdef CONFIG_VHOST_VSOCK

#define TYPE_VHOST_VSOCK_CCW "vhost-vsock-ccw"

#define VHOST_VSOCK_CCW(obj) \

    OBJECT_CHECK(VHostVSockCCWState, (obj), TYPE_VHOST_VSOCK_CCW)



typedef struct VHostVSockCCWState {

    VirtioCcwDevice parent_obj;

    VHostVSock vdev;

} VHostVSockCCWState;



#endif /* CONFIG_VHOST_VSOCK */



#endif