Commit 27acb9dd authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pc,pci,vhost,net fixes, enhancements

Don's patches to limit below-4g ram for pc
Marcel's pcie hotplug rewrite
Gabriel's changes to e1000 auto-negotiation
qemu char bugfixes by Stefan
misc bugfixes

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

# gpg: Signature made Mon 23 Jun 2014 16:25:19 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: (23 commits)
  xen-hvm: Handle machine opt max-ram-below-4g
  pc & q35: Add new machine opt max-ram-below-4g
  xen-hvm: Fix xen_hvm_init() to adjust pc memory layout
  pcie: coding style tweak
  hw/pcie: better hotplug/hotunplug support
  hw/pcie: implement power controller functionality
  hw/pcie: correct debug message
  q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props
  virtio-pci: Report an error when msix vectors init fails
  qemu-char: avoid leaking unused fds in tcp_get_msgfds()
  qemu-char: fix qemu_chr_fe_get_msgfd()
  qapi/string-output-visitor: fix human output
  e1000: factor out checking for auto-negotiation availability
  e1000: move e1000_autoneg_timer() to after set_ics()
  e1000: signal guest on successful link auto-negotiation
  e1000: improve auto-negotiation reporting via mii-tool
  e1000: emulate auto-negotiation during external link status change
  qtest: fix vhost-user-test unbalanced mutex locks
  qtest: fix qtest for vhost-user
  libqemustub: add more stubs for qemu-char
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7ba48975 c4f5cdc5

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1692,7 +1692,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 
        ov = string_output_visitor_new(false);

        visit_type_uint16List(string_output_get_visitor(ov),

                              &m->value->host_nodes, NULL, NULL);

        monitor_printf(mon, "memory device %d\n", i);

        monitor_printf(mon, "memory backend: %d\n", i);

        monitor_printf(mon, "  size:  %" PRId64 "\n", m->value->size);

        monitor_printf(mon, "  merge: %s\n",

                       m->value->merge ? "true" : "false");

hw/i386/pc.c

+47 −0
Original line number Diff line number Diff line
@@ -1643,11 +1643,58 @@ pc_machine_get_hotplug_memory_region_size(Object *obj, Visitor *v, void *opaque, 
    visit_type_int(v, &value, name, errp);

}



static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v,

                                         void *opaque, const char *name,

                                         Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);

    uint64_t value = pcms->max_ram_below_4g;



    visit_type_size(v, &value, name, errp);

}



static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v,

                                         void *opaque, const char *name,

                                         Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);

    Error *error = NULL;

    uint64_t value;



    visit_type_size(v, &value, name, &error);

    if (error) {

        error_propagate(errp, error);

        return;

    }

    if (value > (1ULL << 32)) {

        error_set(&error, ERROR_CLASS_GENERIC_ERROR,

                  "Machine option 'max-ram-below-4g=%"PRIu64

                  "' expects size less than or equal to 4G", value);

        error_propagate(errp, error);

        return;

    }



    if (value < (1ULL << 20)) {

        error_report("Warning: small max_ram_below_4g(%"PRIu64

                     ") less than 1M.  BIOS may not work..",

                     value);

    }



    pcms->max_ram_below_4g = value;

}



static void pc_machine_initfn(Object *obj)

{

    PCMachineState *pcms = PC_MACHINE(obj);



    object_property_add(obj, PC_MACHINE_MEMHP_REGION_SIZE, "int",

                        pc_machine_get_hotplug_memory_region_size,

                        NULL, NULL, NULL, NULL);

    pcms->max_ram_below_4g = 1ULL << 32; /* 4G */

    object_property_add(obj, PC_MACHINE_MAX_RAM_BELOW_4G, "size",

                        pc_machine_get_max_ram_below_4g,

                        pc_machine_set_max_ram_below_4g,

                        NULL, NULL, NULL);

}



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

hw/i386/pc_piix.c

+37 −16
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include "exec/address-spaces.h"

#include "hw/acpi/acpi.h"

#include "cpu.h"

#include "qemu/error-report.h"

#ifdef CONFIG_XEN

#  include <xen/hvm/hvm_info_table.h>

#endif
@@ -98,21 +99,7 @@ static void pc_init1(MachineState *machine, 
    DeviceState *icc_bridge;

    FWCfgState *fw_cfg = NULL;

    PcGuestInfo *guest_info;



    if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }



    icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

    object_property_add_child(qdev_get_machine(), "icc-bridge",

                              OBJECT(icc_bridge), NULL);



    pc_cpus_init(machine->cpu_model, icc_bridge);



    if (kvm_enabled() && kvmclock_enabled) {

        kvmclock_create();

    }

    ram_addr_t lowmem;



    /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).

     * If it doesn't, we need to split it in chunks below and above 4G.
@@ -122,7 +109,25 @@ static void pc_init1(MachineState *machine, 
     * breaking migration.

     */

    if (machine->ram_size >= 0xe0000000) {

        ram_addr_t lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000;

        lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000;

    } else {

        lowmem = 0xe0000000;

    }



    /* Handle the machine opt max-ram-below-4g.  It is basicly doing

     * min(qemu limit, user limit).

     */

    if (lowmem > pc_machine->max_ram_below_4g) {

        lowmem = pc_machine->max_ram_below_4g;

        if (machine->ram_size - lowmem > lowmem &&

            lowmem & ((1ULL << 30) - 1)) {

            error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64

                         ") not a multiple of 1G; possible bad performance.",

                         pc_machine->max_ram_below_4g);

        }

    }



    if (machine->ram_size >= lowmem) {

        above_4g_mem_size = machine->ram_size - lowmem;

        below_4g_mem_size = lowmem;

    } else {
@@ -130,6 +135,22 @@ static void pc_init1(MachineState *machine, 
        below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size,

                                      &ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }



    icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

    object_property_add_child(qdev_get_machine(), "icc-bridge",

                              OBJECT(icc_bridge), NULL);



    pc_cpus_init(machine->cpu_model, icc_bridge);



    if (kvm_enabled() && kvmclock_enabled) {

        kvmclock_create();

    }



    if (pci_enabled) {

        pci_memory = g_new(MemoryRegion, 1);

        memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);

hw/i386/pc_q35.c

+37 −16
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "hw/ide/ahci.h"

#include "hw/usb.h"

#include "hw/cpu/icc_bus.h"

#include "qemu/error-report.h"



/* ICH9 AHCI has 6 ports */

#define MAX_SATA_PORTS     6
@@ -85,20 +86,7 @@ static void pc_q35_init(MachineState *machine) 
    PCIDevice *ahci;

    DeviceState *icc_bridge;

    PcGuestInfo *guest_info;



    if (xen_enabled() && xen_hvm_init(&ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }



    icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

    object_property_add_child(qdev_get_machine(), "icc-bridge",

                              OBJECT(icc_bridge), NULL);



    pc_cpus_init(machine->cpu_model, icc_bridge);

    pc_acpi_init("q35-acpi-dsdt.aml");



    kvmclock_create();

    ram_addr_t lowmem;



    /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory

     * and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
@@ -110,7 +98,25 @@ static void pc_q35_init(MachineState *machine) 
     * breaking migration.

     */

    if (machine->ram_size >= 0xb0000000) {

        ram_addr_t lowmem = gigabyte_align ? 0x80000000 : 0xb0000000;

        lowmem = gigabyte_align ? 0x80000000 : 0xb0000000;

    } else {

        lowmem = 0xb0000000;

    }



    /* Handle the machine opt max-ram-below-4g.  It is basicly doing

     * min(qemu limit, user limit).

     */

    if (lowmem > pc_machine->max_ram_below_4g) {

        lowmem = pc_machine->max_ram_below_4g;

        if (machine->ram_size - lowmem > lowmem &&

            lowmem & ((1ULL << 30) - 1)) {

            error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64

                         ") not a multiple of 1G; possible bad performance.",

                         pc_machine->max_ram_below_4g);

        }

    }



    if (machine->ram_size >= lowmem) {

        above_4g_mem_size = machine->ram_size - lowmem;

        below_4g_mem_size = lowmem;

    } else {
@@ -118,6 +124,21 @@ static void pc_q35_init(MachineState *machine) 
        below_4g_mem_size = machine->ram_size;

    }



    if (xen_enabled() && xen_hvm_init(&below_4g_mem_size, &above_4g_mem_size,

                                      &ram_memory) != 0) {

        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");

        exit(1);

    }



    icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);

    object_property_add_child(qdev_get_machine(), "icc-bridge",

                              OBJECT(icc_bridge), NULL);



    pc_cpus_init(machine->cpu_model, icc_bridge);

    pc_acpi_init("q35-acpi-dsdt.aml");



    kvmclock_create();



    /* pci enabled */

    if (pci_enabled) {

        pci_memory = g_new(MemoryRegion, 1);
@@ -388,7 +409,7 @@ static QEMUMachine pc_q35_machine_v1_4 = { 
    .name = "pc-q35-1.4",

    .init = pc_q35_init_1_4,

    .compat_props = (GlobalProperty[]) {

        PC_COMPAT_1_4,

        PC_Q35_COMPAT_1_4,

        { /* end of list */ }

    },

};

hw/net/e1000.c

+41 −32
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ e1000_link_down(E1000State *s) 
{

    s->mac_reg[STATUS] &= ~E1000_STATUS_LU;

    s->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;

    s->phy_reg[PHY_STATUS] &= ~MII_SR_AUTONEG_COMPLETE;

    s->phy_reg[PHY_LP_ABILITY] &= ~MII_LPAR_LPACK;

}



static void
@@ -197,23 +199,11 @@ set_phy_ctrl(E1000State *s, int index, uint16_t val) 
    }

    if ((val & MII_CR_AUTO_NEG_EN) && (val & MII_CR_RESTART_AUTO_NEG)) {

        e1000_link_down(s);

        s->phy_reg[PHY_STATUS] &= ~MII_SR_AUTONEG_COMPLETE;

        DBGOUT(PHY, "Start link auto negotiation\n");

        timer_mod(s->autoneg_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);

    }

}



static void

e1000_autoneg_timer(void *opaque)

{

    E1000State *s = opaque;

    if (!qemu_get_queue(s->nic)->link_down) {

        e1000_link_up(s);

    }

    s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;

    DBGOUT(PHY, "Auto negotiation is completed\n");

}



static void (*phyreg_writeops[])(E1000State *, int, uint16_t) = {

    [PHY_CTRL] = set_phy_ctrl,

};
@@ -227,7 +217,8 @@ static const char phy_regcap[0x20] = { 
    [PHY_CTRL] = PHY_RW,	[PHY_1000T_CTRL] = PHY_RW,

    [PHY_LP_ABILITY] = PHY_R,	[PHY_1000T_STATUS] = PHY_R,

    [PHY_AUTONEG_ADV] = PHY_RW,	[M88E1000_RX_ERR_CNTR] = PHY_R,

    [PHY_ID2] = PHY_R,		[M88E1000_PHY_SPEC_STATUS] = PHY_R

    [PHY_ID2] = PHY_R,		[M88E1000_PHY_SPEC_STATUS] = PHY_R,

    [PHY_AUTONEG_EXP] = PHY_R,

};



/* PHY_ID2 documented in 8254x_GBe_SDM.pdf, pp. 250 */
@@ -344,6 +335,19 @@ set_ics(E1000State *s, int index, uint32_t val) 
    set_interrupt_cause(s, 0, val | s->mac_reg[ICR]);

}



static void

e1000_autoneg_timer(void *opaque)

{

    E1000State *s = opaque;

    if (!qemu_get_queue(s->nic)->link_down) {

        e1000_link_up(s);

        s->phy_reg[PHY_LP_ABILITY] |= MII_LPAR_LPACK;

        s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;

        DBGOUT(PHY, "Auto negotiation is completed\n");

        set_ics(s, 0, E1000_ICS_LSC); /* signal link status change to guest */

    }

}



static int

rxbufsize(uint32_t v)

{
@@ -844,6 +848,14 @@ receive_filter(E1000State *s, const uint8_t *buf, int size) 
    return 0;

}



static bool

have_autoneg(E1000State *s)

{

    return (s->compat_flags & E1000_FLAG_AUTONEG) &&

           (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN) &&

           (s->phy_reg[PHY_CTRL] & MII_CR_RESTART_AUTO_NEG);

}



static void

e1000_set_link_status(NetClientState *nc)

{
@@ -852,9 +864,16 @@ e1000_set_link_status(NetClientState *nc) 


    if (nc->link_down) {

        e1000_link_down(s);

    } else {

        if (have_autoneg(s) &&

            !(s->phy_reg[PHY_STATUS] & MII_SR_AUTONEG_COMPLETE)) {

            /* emulate auto-negotiation if supported */

            timer_mod(s->autoneg_timer,

                      qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);

        } else {

            e1000_link_up(s);

        }

    }



    if (s->mac_reg[STATUS] != old_status)

        set_ics(s, 0, E1000_ICR_LSC);
@@ -1279,18 +1298,12 @@ static void e1000_pre_save(void *opaque) 
        e1000_mit_timer(s);

    }



    if (!(s->compat_flags & E1000_FLAG_AUTONEG)) {

        return;

    }



    /*

     * If link is down and auto-negotiation is ongoing, complete

     * auto-negotiation immediately.  This allows is to look at

     * MII_SR_AUTONEG_COMPLETE to infer link status on load.

     * If link is down and auto-negotiation is supported and ongoing,

     * complete auto-negotiation immediately. This allows us to look

     * at MII_SR_AUTONEG_COMPLETE to infer link status on load.

     */

    if (nc->link_down &&

        s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN &&

        s->phy_reg[PHY_CTRL] & MII_CR_RESTART_AUTO_NEG) {

    if (nc->link_down && have_autoneg(s)) {

        s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;

    }

}
@@ -1313,15 +1326,11 @@ static int e1000_post_load(void *opaque, int version_id) 
     * Alternatively, restart link negotiation if it was in progress. */

    nc->link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0;



    if (!(s->compat_flags & E1000_FLAG_AUTONEG)) {

        return 0;

    }



    if (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN &&

        s->phy_reg[PHY_CTRL] & MII_CR_RESTART_AUTO_NEG &&

    if (have_autoneg(s) &&

        !(s->phy_reg[PHY_STATUS] & MII_SR_AUTONEG_COMPLETE)) {

        nc->link_down = false;

        timer_mod(s->autoneg_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);

        timer_mod(s->autoneg_timer,

                  qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + 500);

    }



    return 0;