Commit 72f75c76 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



vhost, pc: fixes for 2.5

Minor vhost fixes.  HW version tweak for PC.
Documentation and test updates.

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

# gpg: Signature made Thu 26 Nov 2015 16:40:25 GMT 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:
  vhost-user-test: fix migration overlap test
  Fix memory leak on error
  Revert "vhost: send SET_VRING_ENABLE at start/stop"
  tests/vhost-user-bridge: read command line arguments
  tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
  vhost-user: clarify start and enable
  vhost-user: set link down when the char device is closed
  pc: Don't set hw_version on pc-*-2.5
  osdep: Change default value of qemu_hw_version() to "2.5+"

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

docs/specs/vhost-user.txt

+15 −5
Original line number Diff line number Diff line
@@ -148,13 +148,23 @@ a feature bit was dedicated for this purpose: 


Starting and stopping rings

----------------------

Client must only process each ring when it is both started and enabled.

Client must only process each ring when it is started.



Client must only pass data between the ring and the

backend, when the ring is enabled.



If ring is started but disabled, client must process the

ring without talking to the backend.



For example, for a networking device, in the disabled state

client must not supply any new RX packets, but must process

and discard any TX packets.



If VHOST_USER_F_PROTOCOL_FEATURES has not been negotiated, the ring is initialized

in an enabled state.



If VHOST_USER_F_PROTOCOL_FEATURES has been negotiated, the ring is initialized

in a disabled state. Client must not process it until ring is enabled by

in a disabled state. Client must not pass data to/from the backend until ring is enabled by

VHOST_USER_SET_VRING_ENABLE with parameter 1, or after it has been disabled by

VHOST_USER_SET_VRING_ENABLE with parameter 0.
@@ -166,7 +176,7 @@ descriptor is readable) on the descriptor specified by 
VHOST_USER_SET_VRING_KICK, and stop ring upon receiving

VHOST_USER_GET_VRING_BASE.



While processing the rings (when they are started and enabled), client must

While processing the rings (whether they are enabled or not), client must

support changing some configuration aspects on the fly.



Multiple queue support
@@ -309,11 +319,11 @@ Message types 
      Id: 4

      Master payload: N/A



      This is no longer used. Used to be sent to request stopping

      This is no longer used. Used to be sent to request disabling

      all rings, but some clients interpreted it to also discard

      connection state (this interpretation would lead to bugs).

      It is recommended that clients either ignore this message,

      or use it to stop all rings.

      or use it to disable all rings.



 * VHOST_USER_SET_MEM_TABLE

hw/acpi/memory_hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static void acpi_memory_hotplug_write(void *opaque, hwaddr addr, uint64_t data, 
                qapi_event_send_mem_unplug_error(dev->id,

                                                 error_get_pretty(local_err),

                                                 &error_abort);

                error_free(local_err);

                break;

            }

            trace_mhp_acpi_pc_dimm_deleted(mem_st->selector);

hw/i386/pc_piix.c

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ static void pc_i440fx_machine_options(MachineClass *m) 
static void pc_i440fx_2_5_machine_options(MachineClass *m)

{

    pc_i440fx_machine_options(m);

    m->hw_version = QEMU_VERSION;

    m->alias = "pc";

    m->is_default = 1;

}

hw/i386/pc_q35.c

+0 −1
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ static void pc_q35_machine_options(MachineClass *m) 
static void pc_q35_2_5_machine_options(MachineClass *m)

{

    pc_q35_machine_options(m);

    m->hw_version = QEMU_VERSION;

    m->alias = "q35";

}

hw/ppc/spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static XICSState *xics_system_init(MachineState *machine, 
            error_report("kernel_irqchip requested but unavailable: %s",

                         error_get_pretty(err));

        }

        error_free(err);

    }



    if (!icp) {