Commit 7f8fea8b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging 



QOM/QTest infrastructure fixes and device conversions

* -device / device_add assertion fix
* QEMUMachine conversion to MachineClass
* Device error handling improvements
* QTest cleanups and test cases for some more PCI devices
* PortIO memory leak fixes

# gpg: Signature made Mon 05 May 2014 19:59:16 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  PortioList: Store PortioList in device state
  tests: Add EHCI qtest
  tests: Add ioh3420 qtest
  tests: Add intel-hda qtests
  tests: Add es1370 qtest
  tests: Add ac97 qtest
  qtest: Be paranoid about accept() addrlen argument
  qtest: Add error reporting to socket_accept()
  qtest: Assure that init_socket()'s listen() does not fail
  MAINTAINERS: Document QOM
  arm: Clean up fragile use of error_is_set() in realize() methods
  qom: Clean up fragile use of error_is_set() in set() methods
  hw: Consistently name Error ** objects errp, and not err
  hw: Consistently name Error * objects err, and not errp
  machine: Remove QEMUMachine indirection from MachineClass
  machine: Replace QEMUMachine by MachineClass in accelerator configuration
  vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs
  machine: Copy QEMUMachine's fields to MachineClass
  machine: Remove obsoleted field from QEMUMachine
  qdev: Fix crash by validating the object type

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 951916d0 848696bf

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -601,6 +601,7 @@ USB 
M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

F: hw/usb/*

F: tests/usb-hcd-ehci-test.c



VFIO

M: Alex Williamson <alex.williamson@redhat.com>
@@ -666,6 +667,9 @@ M: Gerd Hoffmann <kraxel@redhat.com> 
S: Maintained

F: audio/

F: hw/audio/

F: tests/ac97-test.c

F: tests/es1370-test.c

F: tests/intel-hda-test.c



Block

M: Kevin Wolf <kwolf@redhat.com>
@@ -780,6 +784,17 @@ S: Supported 
F: qapi-schema.json

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



QOM

M: Anthony Liguori <aliguori@amazon.com>

M: Andreas Färber <afaerber@suse.de>

S: Supported

T: git git://github.com/afaerber/qemu-cpu.git qom-next

F: include/qom/

X: include/qom/cpu.h

F: qom/

X: qom/cpu.c

F: tests/qom-test.c



QMP

M: Luiz Capitulino <lcapitulino@redhat.com>

S: Maintained

backends/rng.c

+7 −4
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
{

    RngBackend *s = RNG_BACKEND(obj);

    RngBackendClass *k = RNG_BACKEND_GET_CLASS(s);

    Error *local_err = NULL;



    if (value == s->opened) {

        return;
@@ -61,12 +62,14 @@ static void rng_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
    }



    if (k->opened) {

        k->opened(s, errp);

        k->opened(s, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }



    if (!error_is_set(errp)) {

        s->opened = value;

    }



    s->opened = true;

}



static void rng_backend_init(Object *obj)

backends/tpm.c

+7 −4
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ static void tpm_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
{

    TPMBackend *s = TPM_BACKEND(obj);

    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);

    Error *local_err = NULL;



    if (value == s->opened) {

        return;
@@ -123,12 +124,14 @@ static void tpm_backend_prop_set_opened(Object *obj, bool value, Error **errp) 
    }



    if (k->opened) {

        k->opened(s, errp);

        k->opened(s, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return;

        }



    if (!error_is_set(errp)) {

        s->opened = value;

    }



    s->opened = true;

}



static void tpm_backend_instance_init(Object *obj)

device-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ DriveInfo *add_init_drive(const char *optstr) 
        return NULL;



    mc = MACHINE_GET_CLASS(current_machine);

    dinfo = drive_init(opts, mc->qemu_machine->block_default_type);

    dinfo = drive_init(opts, mc->block_default_type);

    if (!dinfo) {

        qemu_opts_del(opts);

        return NULL;

hw/audio/adlib.c

+3 −3
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ typedef struct { 
#ifndef HAS_YMF262

    FM_OPL *opl;

#endif

    PortioList port_list;

} AdlibState;



static AdlibState *glob_adlib;
@@ -293,7 +294,6 @@ static MemoryRegionPortio adlib_portio_list[] = { 
static void adlib_realizefn (DeviceState *dev, Error **errp)

{

    AdlibState *s = ADLIB(dev);

    PortioList *port_list = g_new(PortioList, 1);

    struct audsettings as;



    if (glob_adlib) {
@@ -349,8 +349,8 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) 


    adlib_portio_list[0].offset = s->port;

    adlib_portio_list[1].offset = s->port + 8;

    portio_list_init (port_list, OBJECT(s), adlib_portio_list, s, "adlib");

    portio_list_add (port_list, isa_address_space_io(&s->parent_obj), 0);

    portio_list_init (&s->port_list, OBJECT(s), adlib_portio_list, s, "adlib");

    portio_list_add (&s->port_list, isa_address_space_io(&s->parent_obj), 0);

}



static Property adlib_properties[] = {