[Qemu-commits] [qemu/qemu] 621423: filter-rewriter: Add TCP state machine and fix mem...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6214231abde01119d3084a67262d35e909bd9414
      
https://github.com/qemu/qemu/commit/6214231abde01119d3084a67262d35e909bd9414
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M net/colo.c
    M net/colo.h
    M net/filter-rewriter.c

  Log Message:
  -----------
  filter-rewriter: Add TCP state machine and fix memory leak in 
connection_track_table

We add almost full TCP state machine in filter-rewriter, except
TCPS_LISTEN and some simplify in VM active close FIN states.
The reason for this simplify job is because guest kernel will track
the TCP status and wait 2MSL time too, if client resend the FIN packet,
guest will resend the last ACK, so we needn't wait 2MSL time in filter-rewriter.

After a net connection is closed, we didn't clear its related resources
in connection_track_table, which will lead to memory leak.

Let's track the state of net connection, if it is closed, its related
resources will be cleared up.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 0ffcece32519e85a2971cafdc421f4fd3107d766
      
https://github.com/qemu/qemu/commit/0ffcece32519e85a2971cafdc421f4fd3107d766
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M include/migration/colo.h
    M net/colo-compare.c
    A net/colo-compare.h

  Log Message:
  -----------
  colo-compare: implement the process of checkpoint

While do checkpoint, we need to flush all the unhandled packets,
By using the filter notifier mechanism, we can easily to notify
every compare object to do this process, which runs inside
of compare threads as a coroutine.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: dccd0313b69161fe2235c97633f40ecc041542ac
      
https://github.com/qemu/qemu/commit/dccd0313b69161fe2235c97633f40ecc041542ac
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M net/colo-compare.c
    M net/colo-compare.h

  Log Message:
  -----------
  colo-compare: use notifier to notify packets comparing result

It's a good idea to use notifier to notify COLO frame of
inconsistent packets comparing.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 131b2153fc7970fab780dc875f59823e3b23612a
      
https://github.com/qemu/qemu/commit/131b2153fc7970fab780dc875f59823e3b23612a
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c
    M migration/migration.c

  Log Message:
  -----------
  COLO: integrate colo compare with colo frame

For COLO FT, both the PVM and SVM run at the same time,
only sync the state while it needs.

So here, let SVM runs while not doing checkpoint, change
DEFAULT_MIGRATE_X_CHECKPOINT_DELAY to 200*100.

Besides, we forgot to release colo_checkpoint_semd and
colo_delay_timer, fix them here.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 8e48ac95865ac97d10a81cb7a5bbae310878f519
      
https://github.com/qemu/qemu/commit/8e48ac95865ac97d10a81cb7a5bbae310878f519
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c
    M migration/migration.c

  Log Message:
  -----------
  COLO: Add block replication into colo process

Make sure master start block replication after slave's block
replication started.

Besides, we need to activate VM's blocks before goes into
COLO state.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: aad555c2294b5de22524b7dbacc728d51cc63bcc
      
https://github.com/qemu/qemu/commit/aad555c2294b5de22524b7dbacc728d51cc63bcc
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M include/migration/colo.h
    M migration/Makefile.objs
    R migration/colo-comm.c
    M migration/colo.c
    M migration/migration.c
    M migration/savevm.c
    M migration/savevm.h
    M migration/trace-events
    M vl.c

  Log Message:
  -----------
  COLO: Remove colo_state migration struct

We need to know if migration is going into COLO state for
incoming side before start normal migration.

Instead by using the VMStateDescription to send colo_state
from source side to destination side, we use MIG_CMD_ENABLE_COLO
to indicate whether COLO is enabled or not.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 13af18f2228892d19d40ff96672677d168da7e9e
      
https://github.com/qemu/qemu/commit/13af18f2228892d19d40ff96672677d168da7e9e
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M include/exec/ram_addr.h
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h
    M migration/savevm.c

  Log Message:
  -----------
  COLO: Load dirty pages into SVM's RAM cache firstly

We should not load PVM's state directly into SVM, because there maybe some
errors happen when SVM is receving data, which will break SVM.

We need to ensure receving all data before load the state into SVM. We use
an extra memory to cache these data (PVM's ram). The ram cache in secondary side
is initially the same as SVM/PVM's memory. And in the process of checkpoint,
we cache the dirty pages of PVM into this ram cache firstly, so this ram cache
always the same as PVM's memory at every checkpoint, then we flush this cached 
ram
to SVM after we receive all PVM's state.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7d9acafa2cc094d03f46abc522786a1696983639
      
https://github.com/qemu/qemu/commit/7d9acafa2cc094d03f46abc522786a1696983639
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  ram/COLO: Record the dirty pages that SVM received

We record the address of the dirty pages that received,
it will help flushing pages that cached into SVM.

Here, it is a trick, we record dirty pages by re-using migration
dirty bitmap. In the later patch, we will start the dirty log
for SVM, just like migration, in this way, we can record both
the dirty pages caused by PVM and SVM, we only flush those dirty
pages from RAM cache while do checkpoint.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e6f4aa188cf1849b2a4949e62fb04ea44ca0d083
      
https://github.com/qemu/qemu/commit/e6f4aa188cf1849b2a4949e62fb04ea44ca0d083
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/ram.c
    M migration/trace-events

  Log Message:
  -----------
  COLO: Flush memory data from ram cache

During the time of VM's running, PVM may dirty some pages, we will transfer
PVM's dirty pages to SVM and store them into SVM's RAM cache at next checkpoint
time. So, the content of SVM's RAM cache will always be same with PVM's memory
after checkpoint.

Instead of flushing all content of PVM's RAM cache into SVM's MEMORY,
we do this in a more efficient way:
Only flush any page that dirtied by PVM since last checkpoint.
In this way, we can ensure SVM's memory same with PVM's.

Besides, we must ensure flush RAM cache before load device state.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 9ecff6d66e196701de92f596c250e34c1bd11432
      
https://github.com/qemu/qemu/commit/9ecff6d66e196701de92f596c250e34c1bd11432
  Author: zhanghailiang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c
    M qapi/migration.json

  Log Message:
  -----------
  qmp event: Add COLO_EXIT event to notify users while exited COLO

If some errors happen during VM's COLO FT stage, it's important to
notify the users of this event. Together with 'x-colo-lost-heartbeat',
Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict,
it is still necessary to notify users that we exited COLO mode.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 41b6b7792179591553432b207e1b545fb8bd965b
      
https://github.com/qemu/qemu/commit/41b6b7792179591553432b207e1b545fb8bd965b
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo-failover.c
    M migration/colo.c
    M qapi/migration.json

  Log Message:
  -----------
  qapi/migration.json: Rename COLO unknown mode to none mode.

Suggested by Markus Armbruster rename COLO unknown mode to none mode.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: f56c0065b8dd65489621bb7ca1a94d8004d68da1
      
https://github.com/qemu/qemu/commit/f56c0065b8dd65489621bb7ca1a94d8004d68da1
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c
    M qapi/migration.json

  Log Message:
  -----------
  qapi: Add new command to query colo status

Libvirt or other high level software can use this command query colo status.
You can test this command like that:
{'execute':'query-colo-status'}

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 3f6df99d9dc8ce33deae1835e96e659063fa3037
      
https://github.com/qemu/qemu/commit/3f6df99d9dc8ce33deae1835e96e659063fa3037
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c
    M migration/savevm.c
    M migration/savevm.h

  Log Message:
  -----------
  savevm: split the process of different stages for loadvm/savevm

There are several stages during loadvm/savevm process. In different stage,
migration incoming processes different types of sections.
We want to control these stages more accuracy, it will benefit COLO
performance, we don't have to save type of QEMU_VM_SECTION_START
sections everytime while do checkpoint, besides, we want to separate
the process of saving/loading memory and devices state.

So we add three new helper functions: qemu_load_device_state() and
qemu_savevm_live_state() to achieve different process during migration.

Besides, we make qemu_loadvm_state_main() and qemu_save_device_state()
public, and simplify the codes of qemu_save_device_state() by calling the
wrapper qemu_savevm_state_header().

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: d1955d22197615eb65ec7b7ddc1242e5103f5b50
      
https://github.com/qemu/qemu/commit/d1955d22197615eb65ec7b7ddc1242e5103f5b50
  Author: zhanghailiang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  COLO: flush host dirty ram from cache

Don't need to flush all VM's ram from cache, only
flush the dirty pages since last checkpoint

Signed-off-by: Li Zhijian <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 5fbba3d6594aab91a26c255776b80d454682d535
      
https://github.com/qemu/qemu/commit/5fbba3d6594aab91a26c255776b80d454682d535
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M include/net/filter.h
    M net/filter.c
    M net/net.c

  Log Message:
  -----------
  filter: Add handle_event method for NetFilterClass

Filter needs to process the event of checkpoint/failover or
other event passed by COLO frame.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 24525e93c17aabdd88df893f1ceecc37e8b289f3
      
https://github.com/qemu/qemu/commit/24525e93c17aabdd88df893f1ceecc37e8b289f3
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M net/colo-compare.c
    M net/colo.c
    M net/colo.h
    M net/filter-rewriter.c

  Log Message:
  -----------
  filter-rewriter: handle checkpoint and failover event

After one round of checkpoint, the states between PVM and SVM
become consistent, so it is unnecessary to adjust the sequence
of net packets for old connections, besides, while failover
happens, filter-rewriter will into failover mode that needn't
handle the new TCP connection.

Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7b3435309d27910587c7e6e8ba07e4070fb37bbb
      
https://github.com/qemu/qemu/commit/7b3435309d27910587c7e6e8ba07e4070fb37bbb
  Author: zhanghailiang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c

  Log Message:
  -----------
  COLO: notify net filters about checkpoint/failover event

Notify all net filters about the checkpoint and failover event.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 2518aec19250531c4e03208b273a6b44b1344c33
      
https://github.com/qemu/qemu/commit/2518aec19250531c4e03208b273a6b44b1344c33
  Author: zhanghailiang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M migration/colo.c

  Log Message:
  -----------
  COLO: quick failover process by kick COLO thread

COLO thread may sleep at qemu_sem_wait(&s->colo_checkpoint_sem),
while failover works begin, It's better to wakeup it to quick
the process.

Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 8e640892ec2f54bd22d242d83953fba5ba98aac1
      
https://github.com/qemu/qemu/commit/8e640892ec2f54bd22d242d83953fba5ba98aac1
  Author: Zhang Chen <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M docs/COLO-FT.txt

  Log Message:
  -----------
  docs: Add COLO status diagram to COLO-FT.txt

This diagram make user better understand COLO.
Suggested by Markus Armbruster.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 7da2d99fb9fbf30104125c061caaff330e362d74
      
https://github.com/qemu/qemu/commit/7da2d99fb9fbf30104125c061caaff330e362d74
  Author: liujunjie <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  clean up callback when del virtqueue

Before, we did not clear callback like handle_output when delete
the virtqueue which may result be segmentfault.
The scene is as follows:
1. Start a vm with multiqueue vhost-net,
2. then we write VIRTIO_PCI_GUEST_FEATURES in PCI configuration to
triger multiqueue disable in this vm which will delete the virtqueue.
In this step, the tx_bh is deleted but the callback virtio_net_handle_tx_bh
still exist.
3. Finally, we write VIRTIO_PCI_QUEUE_NOTIFY in PCI configuration to
notify the deleted virtqueue. In this way, virtio_net_handle_tx_bh
will be called and qemu will be crashed.

Although the way described above is uncommon, we had better reinforce it.

CC: address@hidden
Signed-off-by: liujunjie <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: fdc89e90fac40c5ca2686733df17b6423fb8d8fb
      
https://github.com/qemu/qemu/commit/fdc89e90fac40c5ca2686733df17b6423fb8d8fb
  Author: Jason Wang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M hw/net/ne2000.c

  Log Message:
  -----------
  ne2000: fix possible out of bound access in ne2000_receive

In ne2000_receive(), we try to assign size_ to size which converts
from size_t to integer. This will cause troubles when size_ is greater
INT_MAX, this will lead a negative value in size and it can then pass
the check of size < MIN_BUF_SIZE which may lead out of bound access of
for both buf and buf1.

Fixing by converting the type of size to size_t.

CC: address@hidden
Reported-by: Daniel Shapira <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1a326646fef38782e5542280040ec3ea23e4a730
      
https://github.com/qemu/qemu/commit/1a326646fef38782e5542280040ec3ea23e4a730
  Author: Jason Wang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M hw/net/rtl8139.c

  Log Message:
  -----------
  rtl8139: fix possible out of bound access

In rtl8139_do_receive(), we try to assign size_ to size which converts
from size_t to integer. This will cause troubles when size_ is greater
INT_MAX, this will lead a negative value in size and it can then pass
the check of size < MIN_BUF_SIZE which may lead out of bound access of
for both buf and buf1.

Fixing by converting the type of size to size_t.

CC: address@hidden
Reported-by: Daniel Shapira <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: b1d80d12c5f7ff081bb80ab4f4241d4248691192
      
https://github.com/qemu/qemu/commit/b1d80d12c5f7ff081bb80ab4f4241d4248691192
  Author: Jason Wang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M hw/net/pcnet.c

  Log Message:
  -----------
  pcnet: fix possible buffer overflow

In pcnet_receive(), we try to assign size_ to size which converts from
size_t to integer. This will cause troubles when size_ is greater
INT_MAX, this will lead a negative value in size and it can then pass
the check of size < MIN_BUF_SIZE which may lead out of bound access
for both buf and buf1.

Fixing by converting the type of size to size_t.

CC: address@hidden
Reported-by: Daniel Shapira <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1592a9947036d60dde5404204a5d45975133caf5
      
https://github.com/qemu/qemu/commit/1592a9947036d60dde5404204a5d45975133caf5
  Author: Jason Wang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: ignore packet size greater than INT_MAX

There should not be a reason for passing a packet size greater than
INT_MAX. It's usually a hint of bug somewhere, so ignore packet size
greater than INT_MAX in qemu_deliver_packet_iov()

CC: address@hidden
Reported-by: Daniel Shapira <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 1001cf45a7ca22d990e19a81029319ca763cad4f
      
https://github.com/qemu/qemu/commit/1001cf45a7ca22d990e19a81029319ca763cad4f
  Author: Jason Wang <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M hw/net/e1000.c
    M hw/net/trace-events

  Log Message:
  -----------
  e1000: indicate dropped packets in HW counters

The e1000 emulation silently discards RX packets if there's
insufficient space in the ring buffer. This leads to errors
on higher-level protocols in the guest, with no indication
about the error cause.

This patch increments the "Missed Packets Count" (MPC) and
"Receive No Buffers Count" (RNBC) HW counters in this case.
As the emulation has no FIFO for buffering packets that can't
immediately be pushed to the guest, these two registers are
practically equivalent (see 10.2.7.4, 10.2.7.33 in
https://www.intel.com/content/www/us/en/embedded/products/networking/82574l-gbe-controller-datasheet.html).

On a Linux guest, the register content  will be reflected in
the "rx_missed_errors" and "rx_no_buffer_count" stats from
"ethtool -S", and in the "missed" stat from "ip -s -s link show",
giving at least some hint about the error cause inside the guest.

If the cause is known, problems like this can often be avoided
easily, by increasing the number of RX descriptors in the guest
e1000 driver (e.g under Linux, "e1000.RxDescriptors=1024").

The patch also adds a qemu trace message for this condition.

Signed-off-by: Martin Wilck <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 37a4442a76d010f5d957e3ee09dfb23364281b37
      
https://github.com/qemu/qemu/commit/37a4442a76d010f5d957e3ee09dfb23364281b37
  Author: Thomas Huth <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: Fix bad "macaddr" property in the documentation

When using the "-device" option, the property is called "mac".
"macaddr" is only used for the legacy "-net nic" option.

Reported-by: Harald Hoyer <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 784c2e4f232adf5ef47a84a262ec72a07d068d6a
      
https://github.com/qemu/qemu/commit/784c2e4f232adf5ef47a84a262ec72a07d068d6a
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-19 (Fri, 19 Oct 2018)

  Changed paths:
    M docs/COLO-FT.txt
    M hw/net/e1000.c
    M hw/net/ne2000.c
    M hw/net/pcnet.c
    M hw/net/rtl8139.c
    M hw/net/trace-events
    M hw/virtio/virtio.c
    M include/exec/ram_addr.h
    M include/migration/colo.h
    M include/net/filter.h
    M migration/Makefile.objs
    R migration/colo-comm.c
    M migration/colo-failover.c
    M migration/colo.c
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h
    M migration/savevm.c
    M migration/savevm.h
    M migration/trace-events
    M net/colo-compare.c
    A net/colo-compare.h
    M net/colo.c
    M net/colo.h
    M net/filter-rewriter.c
    M net/filter.c
    M net/net.c
    M qapi/migration.json
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Fri 19 Oct 2018 04:16:03 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request: (26 commits)
  qemu-options: Fix bad "macaddr" property in the documentation
  e1000: indicate dropped packets in HW counters
  net: ignore packet size greater than INT_MAX
  pcnet: fix possible buffer overflow
  rtl8139: fix possible out of bound access
  ne2000: fix possible out of bound access in ne2000_receive
  clean up callback when del virtqueue
  docs: Add COLO status diagram to COLO-FT.txt
  COLO: quick failover process by kick COLO thread
  COLO: notify net filters about checkpoint/failover event
  filter-rewriter: handle checkpoint and failover event
  filter: Add handle_event method for NetFilterClass
  COLO: flush host dirty ram from cache
  savevm: split the process of different stages for loadvm/savevm
  qapi: Add new command to query colo status
  qapi/migration.json: Rename COLO unknown mode to none mode.
  qmp event: Add COLO_EXIT event to notify users while exited COLO
  COLO: Flush memory data from ram cache
  ram/COLO: Record the dirty pages that SVM received
  COLO: Load dirty pages into SVM's RAM cache firstly
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/1b7490446bf4...784c2e4f232a
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.