Commit 9b748c5e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



trivial patches pull request (20190206)

- acpi: remove unused functions/variables
- tests: remove useless architecture checks
- some typo fixes and documentation update
- flash_cfi02: fix memory leak

# gpg: Signature made Wed 06 Mar 2019 11:05:12 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  thunk: fix of malloc to g_new
  hostmem-file: simplify ifdef-s in file_backend_memory_alloc()
  build: Correct explanation of unnest-vars example
  bswap: Fix accessors syntax in comment
  doc: fix typos for documents in tree
  block/pflash_cfi02: Fix memory leak and potential use-after-free
  hw/acpi: remove unnecessary variable acpi_table_builtin
  hw/acpi: remove unused function acpi_table_add_builtin()
  hw/i386/pc.c: remove unused function pc_acpi_init()
  tests: Remove (mostly) useless architecture checks

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b5b6b2b9 0e081fde

backends/hostmem-file.c

+4 −5
Original line number Diff line number Diff line
@@ -41,10 +41,12 @@ struct HostMemoryBackendFile { 
static void

file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

#ifndef CONFIG_POSIX

    error_setg(errp, "backend '%s' not supported on this host",

               object_get_typename(OBJECT(backend)));

#else

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);

#ifdef CONFIG_POSIX

    gchar *name;

#endif



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");
@@ -54,9 +56,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        error_setg(errp, "mem-path property not set");

        return;

    }

#ifndef CONFIG_POSIX

    error_setg(errp, "-mem-path not supported on this host");

#else

    backend->force_prealloc = mem_prealloc;

    name = host_memory_backend_get_name(backend);

    memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),

docs/COLO-FT.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ to make sure the state of VM in Secondary side is always consistent with VM in 
Primary side.



COLO Proxy:

Delivers packets to Primary and Seconday, and then compare the responses from

Delivers packets to Primary and Secondary, and then compare the responses from

both side. Then decide whether to start a checkpoint according to some rules.

Please refer to docs/colo-proxy.txt for more information.

docs/amd-memory-encryption.txt

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ References 
AMD Memory Encryption whitepaper:

http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf



Secure Encrypted Virutualization Key Management:

Secure Encrypted Virtualization Key Management:

[1] http://support.amd.com/TechDocs/55766_SEV-KM API_Specification.pdf



KVM Forum slides:

docs/can.txt

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Links to other resources 
     https://gitlab.fel.cvut.cz/canbus/qemu-canbus

 (3) RTEMS page describing project

     https://devel.rtems.org/wiki/Developer/Simulators/QEMU/CANEmulation

 (4) RTLWS 2015 article about the projevt and its use with CANopen emulation

 (4) RTLWS 2015 article about the project and its use with CANopen emulation

     http://rtime.felk.cvut.cz/publications/public/rtlws2015-qemu-can.pdf

     Slides

     http://rtime.felk.cvut.cz/publications/public/rtlws2015-qemu-can-slides.pdf

docs/colo-proxy.txt

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Below is a COLO proxy ascii figure: 
|         |  +------------------------------------------------------+  |                        |        |                              |

|netfilter|  |                       |                         |    |  |   netfilter            |        |                              |

| +----------+ +----------------------------+                  |    |  |  +-----------------------------------------------------------+ |

| |       |  |                       |      |        out       |    |  |  |                     |        |  filter excute order       | |

| |       |  |                       |      |        out       |    |  |  |                     |        |  filter execute order      | |

| |       |  |          +-----------------------------+        |    |  |  |                     |        | +------------------->      | |

| |       |  |          |            |      |         |        |    |  |  |                     |        |   TCP                      | |

| | +-----+--+-+  +-----v----+ +-----v----+ |pri +----+----+sec|    |  |  | +------------+  +---+----+---v+rewriter++  +------------+ | |
@@ -53,7 +53,7 @@ Below is a COLO proxy ascii figure: 
| |      |   tx        |   rx           rx  |                  |  |    |  |            tx                        all       |  rx      | |

| |      |             |                    |                  |  |    |  +-----------------------------------------------------------+ |

| |      |             +--------------+     |                  |  |    |                                                   |            |

| |      |   filter excute order      |     |                  |  |    |                                                   |            |

| |      |   filter execute order     |     |                  |  |    |                                                   |            |

| |      |  +---------------->        |     |                  |  +--------------------------------------------------------+            |

| +-----------------------------------------+                  |       |                                                                |

|        |                            |                        |       |                                                                |
@@ -92,7 +92,7 @@ but do nothing, just pass to next filter. 


Redirect Server Filter --> COLO-Compare

COLO-compare receive primary guest packet then

waiting scondary redirect packet to compare it.

waiting secondary redirect packet to compare it.

If packet same,send queued primary packet and clear

queued secondary packet, Otherwise send primary packet

and do checkpoint.