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

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



Four changes here.  Polling for reconnection of character devices,
the QOMification of accelerators, a fix for -kernel support on x86, and one
for a recently-introduced virtio-scsi optimization.

# gpg: Signature made Thu 09 Oct 2014 14:36:50 BST using RSA key ID 4E6B09D7
# gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
# gpg:                 aka "Paolo Bonzini <bonzini@gnu.org>"

* remotes/bonzini/tags/for-upstream: (28 commits)
  qemu-char: Fix reconnect socket error reporting
  qemu-sockets: Add error to non-blocking connect handler
  qemu-error: Add error_vreport()
  virtio-scsi: fix use-after-free of VirtIOSCSIReq
  linuxboot: compute initrd loading address
  kvm: Make KVMState be the TYPE_KVM_ACCEL instance struct
  accel: Create accel object when initializing machine
  accel: Pass MachineState object to accel init functions
  accel: Rename 'init' method to 'init_machine'
  accel: Move accel init/allowed code to separate function
  accel: Remove tcg_available() function
  accel: Move qtest accel registration to qtest.c
  accel: Move Xen registration code to xen-common.c
  accel: Move KVM accel registration to kvm-all.c
  accel: Report unknown accelerator as "not found" instead of "does not exist"
  accel: Make AccelClass.available() optional
  accel: Use QOM classes for accel types
  accel: Move accel name lookup to separate function
  accel: Simplify configure_accelerator() using AccelType *acc variable
  accel: Create AccelType typedef
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b6011bd8 5008e5b7

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ common-obj-$(CONFIG_SPICE) += spice-qemu-char.o 


common-obj-y += audio/

common-obj-y += hw/

common-obj-y += accel.o



common-obj-y += ui/

common-obj-y += bt-host.o bt-vhci.o

accel.c

0 → 100644
+157 −0
Original line number Diff line number Diff line 
/*

 * QEMU System Emulator, accelerator interfaces

 *

 * Copyright (c) 2003-2008 Fabrice Bellard

 * Copyright (c) 2014 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



#include "sysemu/accel.h"

#include "hw/boards.h"

#include "qemu-common.h"

#include "sysemu/arch_init.h"

#include "sysemu/sysemu.h"

#include "sysemu/kvm.h"

#include "sysemu/qtest.h"

#include "hw/xen/xen.h"

#include "qom/object.h"

#include "hw/boards.h"



int tcg_tb_size;

static bool tcg_allowed = true;



static int tcg_init(MachineState *ms)

{

    tcg_exec_init(tcg_tb_size * 1024 * 1024);

    return 0;

}



static const TypeInfo accel_type = {

    .name = TYPE_ACCEL,

    .parent = TYPE_OBJECT,

    .class_size = sizeof(AccelClass),

    .instance_size = sizeof(AccelState),

};



/* Lookup AccelClass from opt_name. Returns NULL if not found */

static AccelClass *accel_find(const char *opt_name)

{

    char *class_name = g_strdup_printf(ACCEL_CLASS_NAME("%s"), opt_name);

    AccelClass *ac = ACCEL_CLASS(object_class_by_name(class_name));

    g_free(class_name);

    return ac;

}



static int accel_init_machine(AccelClass *acc, MachineState *ms)

{

    ObjectClass *oc = OBJECT_CLASS(acc);

    const char *cname = object_class_get_name(oc);

    AccelState *accel = ACCEL(object_new(cname));

    int ret;

    ms->accelerator = accel;

    *(acc->allowed) = true;

    ret = acc->init_machine(ms);

    if (ret < 0) {

        ms->accelerator = NULL;

        *(acc->allowed) = false;

        object_unref(OBJECT(accel));

    }

    return ret;

}



int configure_accelerator(MachineState *ms)

{

    const char *p;

    char buf[10];

    int ret;

    bool accel_initialised = false;

    bool init_failed = false;

    AccelClass *acc = NULL;



    p = qemu_opt_get(qemu_get_machine_opts(), "accel");

    if (p == NULL) {

        /* Use the default "accelerator", tcg */

        p = "tcg";

    }



    while (!accel_initialised && *p != '\0') {

        if (*p == ':') {

            p++;

        }

        p = get_opt_name(buf, sizeof(buf), p, ':');

        acc = accel_find(buf);

        if (!acc) {

            fprintf(stderr, "\"%s\" accelerator not found.\n", buf);

            continue;

        }

        if (acc->available && !acc->available()) {

            printf("%s not supported for this target\n",

                   acc->name);

            continue;

        }

        ret = accel_init_machine(acc, ms);

        if (ret < 0) {

            init_failed = true;

            fprintf(stderr, "failed to initialize %s: %s\n",

                    acc->name,

                    strerror(-ret));

        } else {

            accel_initialised = true;

        }

    }



    if (!accel_initialised) {

        if (!init_failed) {

            fprintf(stderr, "No accelerator found!\n");

        }

        exit(1);

    }



    if (init_failed) {

        fprintf(stderr, "Back to %s accelerator.\n", acc->name);

    }



    return !accel_initialised;

}





static void tcg_accel_class_init(ObjectClass *oc, void *data)

{

    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "tcg";

    ac->init_machine = tcg_init;

    ac->allowed = &tcg_allowed;

}



#define TYPE_TCG_ACCEL ACCEL_CLASS_NAME("tcg")



static const TypeInfo tcg_accel_type = {

    .name = TYPE_TCG_ACCEL,

    .parent = TYPE_ACCEL,

    .class_init = tcg_accel_class_init,

};



static void register_accel_types(void)

{

    type_register_static(&accel_type);

    type_register_static(&tcg_accel_type);

}



type_init(register_accel_types);

arch_init.c

+0 −5
Original line number Diff line number Diff line
@@ -1337,11 +1337,6 @@ void cpudef_init(void) 
#endif

}



int tcg_available(void)

{

    return 1;

}



int kvm_available(void)

{

#ifdef CONFIG_KVM

hw/scsi/virtio-scsi.c

+5 −4
Original line number Diff line number Diff line
@@ -545,11 +545,12 @@ bool virtio_scsi_handle_cmd_req_prepare(VirtIOSCSI *s, VirtIOSCSIReq *req) 


void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req)

{

    if (scsi_req_enqueue(req->sreq)) {

        scsi_req_continue(req->sreq);

    SCSIRequest *sreq = req->sreq;

    if (scsi_req_enqueue(sreq)) {

        scsi_req_continue(sreq);

    }

    bdrv_io_unplug(req->sreq->dev->conf.bs);

    scsi_req_unref(req->sreq);

    bdrv_io_unplug(sreq->dev->conf.bs);

    scsi_req_unref(sreq);

}



static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)

include/hw/boards.h

+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,11 @@ 


#include "qemu/typedefs.h"

#include "sysemu/blockdev.h"

#include "sysemu/accel.h"

#include "hw/qdev.h"

#include "qom/object.h"





typedef struct MachineState MachineState;



typedef void QEMUMachineInitFunc(MachineState *ms);



typedef void QEMUMachineResetFunc(void);
@@ -135,6 +134,7 @@ struct MachineState { 
    char *kernel_cmdline;

    char *initrd_filename;

    const char *cpu_model;

    AccelState *accelerator;

};



#endif