Commit 10e11f4d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio, misc bugfixes

A bunch of bugfixes - some of these will make sense for 2.1.2
I put Cc: qemu-stable included where appropriate.

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

# gpg: Signature made Thu 18 Sep 2014 19:52:18 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream:
  pc: leave more space for BIOS allocations
  virtio-pci: fix migration for pci bus master
  vhost-user: fix VIRTIO_NET_F_MRG_RXBUF negotiation
  virtio-pci: enable bus master for old guests
  Revert "virtio: don't call device on !vm_running"
  virtio-net: drop assert on vm stop
  Revert "rng-egd: remove redundant free"
  qdev: Move global validation to a single function
  qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals()
  test-qdev-global-props: Test handling of hotpluggable and non-device types
  test-qdev-global-props: Initialize not_used=true for all props
  test-qdev-global-props: Run tests on subprocess
  tests: disable global props test for old glib
  test-qdev-global-props: Trivial comment fix
  hw/machine: Free old values of string properties

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bb26a1e8 438f92ee

backends/rng-egd.c

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ static void rng_egd_set_chardev(Object *obj, const char *value, Error **errp) 
    if (b->opened) {

        error_set(errp, QERR_PERMISSION_DENIED);

    } else {

        g_free(s->chr_name);

        s->chr_name = g_strdup(value);

    }

}

configure

+9 −0
Original line number Diff line number Diff line
@@ -2716,6 +2716,12 @@ for i in $glib_modules; do 
    fi

done



# g_test_trap_subprocess added in 2.38. Used by some tests.

glib_subprocess=yes

if ! $pkg_config --atleast-version=2.38 glib-2.0; then

    glib_subprocess=no

fi



##########################################

# SHA command probe for modules

if test "$modules" = yes; then
@@ -4586,6 +4592,9 @@ if test "$bluez" = "yes" ; then 
  echo "CONFIG_BLUEZ=y" >> $config_host_mak

  echo "BLUEZ_CFLAGS=$bluez_cflags" >> $config_host_mak

fi

if test "glib_subprocess" = "yes" ; then

  echo "CONFIG_HAS_GLIB_SUBPROCESS_TESTS=y" >> $config_host_mak

fi

echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak

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

  echo "CONFIG_GTK=y" >> $config_host_mak

hw/core/machine.c

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ static void machine_set_accel(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->accel);

    ms->accel = g_strdup(value);

}
@@ -79,6 +80,7 @@ static void machine_set_kernel(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->kernel_filename);

    ms->kernel_filename = g_strdup(value);

}
@@ -93,6 +95,7 @@ static void machine_set_initrd(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->initrd_filename);

    ms->initrd_filename = g_strdup(value);

}
@@ -107,6 +110,7 @@ static void machine_set_append(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->kernel_cmdline);

    ms->kernel_cmdline = g_strdup(value);

}
@@ -121,6 +125,7 @@ static void machine_set_dtb(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->dtb);

    ms->dtb = g_strdup(value);

}
@@ -135,6 +140,7 @@ static void machine_set_dumpdtb(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->dumpdtb);

    ms->dumpdtb = g_strdup(value);

}
@@ -176,6 +182,7 @@ static void machine_set_dt_compatible(Object *obj, const char *value, Error **er 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->dt_compatible);

    ms->dt_compatible = g_strdup(value);

}
@@ -232,6 +239,7 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp) 
{

    MachineState *ms = MACHINE(obj);



    g_free(ms->firmware);

    ms->firmware = g_strdup(value);

}

hw/core/qdev-properties-system.c

+1 −17
Original line number Diff line number Diff line
@@ -388,28 +388,12 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) 
static int qdev_add_one_global(QemuOpts *opts, void *opaque)

{

    GlobalProperty *g;

    ObjectClass *oc;



    g = g_malloc0(sizeof(*g));

    g->driver   = qemu_opt_get(opts, "driver");

    g->property = qemu_opt_get(opts, "property");

    g->value    = qemu_opt_get(opts, "value");

    oc = object_class_dynamic_cast(object_class_by_name(g->driver),

                                   TYPE_DEVICE);

    if (oc) {

        DeviceClass *dc = DEVICE_CLASS(oc);



        if (dc->hotpluggable) {

            /* If hotpluggable then skip not_used checking. */

            g->not_used = false;

        } else {

            /* Maybe a typo. */

            g->not_used = true;

        }

    } else {

        /* Maybe a typo. */

        g->not_used = true;

    }

    g->user_provided = true;

    qdev_prop_register_global(g);

    return 0;

}

hw/core/qdev-properties.c

+23 −7
Original line number Diff line number Diff line
@@ -955,19 +955,35 @@ void qdev_prop_register_global_list(GlobalProperty *props) 
    }

}



int qdev_prop_check_global(void)

int qdev_prop_check_globals(void)

{

    GlobalProperty *prop;

    int ret = 0;



    QTAILQ_FOREACH(prop, &global_props, next) {

        if (!prop->not_used) {

        ObjectClass *oc;

        DeviceClass *dc;

        if (prop->used) {

            continue;

        }

        if (!prop->user_provided) {

            continue;

        }

        oc = object_class_by_name(prop->driver);

        oc = object_class_dynamic_cast(oc, TYPE_DEVICE);

        if (!oc) {

            error_report("Warning: global %s.%s has invalid class name",

                       prop->driver, prop->property);

            ret = 1;

        error_report("Warning: \"-global %s.%s=%s\" not used",

            continue;

        }

        dc = DEVICE_CLASS(oc);

        if (!dc->hotpluggable && !prop->used) {

            error_report("Warning: global %s.%s=%s not used",

                       prop->driver, prop->property, prop->value);



            ret = 1;

            continue;

        }

    }

    return ret;

}
@@ -983,7 +999,7 @@ void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename, 
        if (strcmp(typename, prop->driver) != 0) {

            continue;

        }

        prop->not_used = false;

        prop->used = true;

        object_property_parse(OBJECT(dev), prop->value, prop->property, &err);

        if (err != NULL) {

            error_propagate(errp, err);