提交 · 50f2bdc75c5ee00617ad874c9ceac2cea660aa1e · openeuler / qemu

27 7月, 2013 6 次提交

qapi: Flat unions with arbitrary discriminator · 50f2bdc7

由 Kevin Wolf 提交于 7月 03, 2013

Instead of the rather verbose syntax that distinguishes base and
subclass fields...

  { "type": "file",
    "read-only": true,
    "data": {
        "filename": "test"
    } }

...we can now have both in the same namespace, allowing a more direct
mapping of the command line, and moving fields between the common base
and subclasses without breaking the API:

  { "driver": "file",
    "read-only": true,
    "filename": "test" }
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>

50f2bdc7

qapi: Add visitor for implicit structs · 761d524d

由 Kevin Wolf 提交于 7月 03, 2013

These can be used when an embedded struct is parsed and members not
belonging to the struct may be present in the input (e.g. parsing a
flat namespace QMP union, where fields from both the base and one
of the alternative types are mixed in the JSON object)
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>

761d524d

docs: Document QAPI union types · 51631493

由 Kevin Wolf 提交于 7月 16, 2013

Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>

51631493

qapi-visit.py: Implement 'base' for unions · 0aef92b9

由 Kevin Wolf 提交于 7月 02, 2013

This implements the visitor part of base types for unions. Parsed into
QMP, this example schema definition...

    { 'type': 'BlockOptionsBase', 'data': { 'read-only': 'bool' } }
    { 'type': 'BlockOptionsQcow2, 'data': { 'lazy-refcounts': 'bool' } }

    { 'union': 'BlockOptions',
      'base': 'BlockOptionsBase',
      'data': {
          'raw': 'BlockOptionsRaw'
          'qcow2': 'BlockOptionsQcow2'
      } }

...would describe the following JSON object:

    { "type": "qcow2",
      "read-only": true,
      "data": { "lazy-refcounts": false } }
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>

0aef92b9

K
qapi-visit.py: Split off generate_visit_struct_fields() · d131c897
由 Kevin Wolf 提交于 7月 02, 2013
```
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
```
d131c897

qapi-types.py: Implement 'base' for unions · e2503f5e

由 Kevin Wolf 提交于 7月 02, 2013

The new 'base' key in a union definition refers to a struct type, which
is inlined into the union definition and can represent fields common to
all kinds.

For example the following schema definition...

    { 'type': 'BlockOptionsBase', 'data': { 'read-only': 'bool' } }

    { 'union': 'BlockOptions',
      'base': 'BlockOptionsBase',
      'data': {
          'raw': 'BlockOptionsRaw'
          'qcow2': 'BlockOptionsQcow2'
      } }

...would result in this generated C struct:

    struct BlockOptions
    {
        BlockOptionsKind kind;
        union {
            void *data;
            BlockOptionsRaw * raw;
            BlockOptionsQcow2 * qcow2;
        };
        bool read_only;
    };
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>

e2503f5e

26 7月, 2013 6 次提交

Merge remote-tracking branch 'mdroth/qga-pull-2013-7-25' into staging · 003e26bc

由 Anthony Liguori 提交于 7月 25, 2013

# By Laszlo Ersek
# Via Michael Roth
* mdroth/qga-pull-2013-7-25:
  qga: escape cmdline args when registering win32 service (CVE-2013-2231)
  ga_install_service(): nest error paths more idiomatically
  qga/service-win32.c: diagnostic output should go to stderr

Message-id: 1374784644-29078-1-git-send-email-mdroth@linux.vnet.ibm.com

003e26bc

Merge remote-tracking branch 'kraxel/seabios-1.7.3' into staging · d1ed9f41

由 Anthony Liguori 提交于 7月 25, 2013

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/seabios-1.7.3:
  seabios: update to 1.7.3

Message-id: 1374673573-25074-1-git-send-email-kraxel@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d1ed9f41

Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging · 874ec3c5

由 Anthony Liguori 提交于 7月 25, 2013

* riku/linux-user-for-upstream: (21 commits)
  linux-user: Handle compressed ISA encodings when processing MIPS exceptions
  linux-user: Unlock mmap_lock when resuming guest from page_unprotect
  linux-user: Reset copied CPUs in cpu_copy() always
  linux-user: Fix epoll on ARM hosts
  linux-user: fix segmentation fault passing with h2g(x) != x
  linux-user: Fix pipe syscall return for SPARC
  linux-user: Fix target_stat and target_stat64 for OpenRISC
  linux-user: Avoid conditional cpu_reset()
  configure: Make NPTL non-optional
  linux-user: Enable NPTL for x86-64
  linux-user: Add i386 TLS setter
  linux-user: Clean up handling of clone() argument order
  linux-user: Add missing 'break' in i386 get_thread_area syscall
  linux-user: Enable NPTL for m68k
  linux-user: Enable NPTL for SPARC targets
  linux-user: Enable NPTL for OpenRISC
  linux-user: Move includes of target-specific headers to end of qemu.h
  configure: Enable threading for unicore32-linux-user
  configure: Enable threading on all ppc and mips linux-user targets
  configure: Don't say target_nptl="no" if there is no linux-user target
  ...

Conflicts:
	linux-user/main.c
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

874ec3c5

qga: escape cmdline args when registering win32 service (CVE-2013-2231) · 340d51df

由 Laszlo Ersek 提交于 7月 03, 2013

Reported-by: NLev Veyde <lveyde@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Signed-off-by: NLaszlo Ersek <lersek@redhat.com>
Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>

340d51df

ga_install_service(): nest error paths more idiomatically · 108365fd

由 Laszlo Ersek 提交于 7月 03, 2013

Acked-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Signed-off-by: NLaszlo Ersek <lersek@redhat.com>
Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>

108365fd

qga/service-win32.c: diagnostic output should go to stderr · febf1c49

由 Laszlo Ersek 提交于 7月 03, 2013

Acked-by: NMichael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Signed-off-by: NLaszlo Ersek <lersek@redhat.com>
Signed-off-by: NMichael Roth <mdroth@linux.vnet.ibm.com>

febf1c49

25 7月, 2013 28 次提交

pc-testdev: add I/O port to test memory.c auto split/combine · d2f5ea97

由 Paolo Bonzini 提交于 7月 22, 2013

The ports at 0xe8..0xeb have impl.min/max_access_size == 1, so
that memory accesses are split and combined by the memory core.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-29-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d2f5ea97

memory: check memory region endianness, not target's · e7342aa3

由 Paolo Bonzini 提交于 7月 22, 2013

When combining multiple accesses into a single value, we need to do so
in the device's desired endianness.  The target endianness does not have
any influence.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-28-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

e7342aa3

memory: pass MemoryRegion to access_with_adjusted_size · 547e9201

由 Paolo Bonzini 提交于 7月 22, 2013

The accessors all use a MemoryRegion opaque value.  Avoid going
uselessly through void*.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-27-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

547e9201

memory: move functions around · e11ef3d1

由 Paolo Bonzini 提交于 7月 22, 2013

Prepare for next patch, no semantic change.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-26-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

e11ef3d1

qtest: add test for ISA I/O space endianness · 8fefa31b

由 Paolo Bonzini 提交于 7月 22, 2013

This writes a register and reads its 1/2/4 byte parts.  Masking
is done in the device model.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-25-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

8fefa31b

default-configs/ppc64: add all components of i82378 SuperIO chip used by prep · 9c998424

由 Paolo Bonzini 提交于 7月 22, 2013

The device provides an ISA bus so that pseries can also run the
endianness test.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-24-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

9c998424

default-configs: add SuperIO to SH4 · 85d3846a

由 Paolo Bonzini 提交于 7月 22, 2013

The device provides an ISA bus to run the endianness test on.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-23-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

85d3846a

default-configs: add test device to all machines supporting ISA · be6d08be

由 Paolo Bonzini 提交于 7月 22, 2013

This will let these machines run an endianness test for ISA
I/O port space.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-22-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

be6d08be

sparc64: unbreak · 2b8fbcd8

由 Paolo Bonzini 提交于 7月 22, 2013

... by making apb a subclass of TYPE_PCI_HOST_BRIDGE.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-21-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

2b8fbcd8

sh4: unbreak r2d · b23ea25f

由 Paolo Bonzini 提交于 7月 22, 2013

... by making sh_pci a subclass of TYPE_PCI_HOST_BRIDGE.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-20-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

b23ea25f

mips: degrade BIOS error to warning · b332d24a

由 Paolo Bonzini 提交于 7月 22, 2013

No free MIPS BIOS is available, so it makes little sense to quit.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-19-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

b332d24a

pc-testdev: remove useless cpu_to_le64/le64_to_cpu · 50405435

由 Paolo Bonzini 提交于 7月 22, 2013

So far the device was only used on little-endian machines.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-18-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

50405435

pc-testdev: support 8 and 16-bit accesses to 0xe0 · b7faba71

由 Paolo Bonzini 提交于 7月 22, 2013

This will let us use the testdev to test endianness.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-17-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

b7faba71

Revert "ioport: remove LITTLE_ENDIAN mark for portio" · f36a6382

由 Paolo Bonzini 提交于 7月 22, 2013

This reverts commit c3cb8e77.

The scenario where I/O ports are accessed with DEVICE_LITTLE_ENDIAN
endianness now works and will soon be unit tested.  Since the PortioList
indirection assumes little endian, define portio_ops the same way.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-16-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

f36a6382

isa_mmio: delete · 61fcb628

由 Paolo Bonzini 提交于 7月 22, 2013

It is not used anymore.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-15-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

61fcb628

ebus: do not use isa_mmio · 0a70e094

由 Paolo Bonzini 提交于 7月 22, 2013

This is untested, because ebus does not have a libqos module.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-14-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

0a70e094

sparc64: remove indirection for I/O port access · 5519ad0c

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-13-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

5519ad0c

mips_fulong2e: do not use isa_mmio · e37b80fa

由 Paolo Bonzini 提交于 7月 22, 2013

This board is little-endian, but still isa_mmio should die. :)
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-12-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

e37b80fa

mipssim: do not use isa_mmio · bdb75c79

由 Paolo Bonzini 提交于 7月 22, 2013

Untested, this board does not support PCI so it cannot run endianness-test.
It should fix endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-11-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

bdb75c79

ppc440_bamboo: do not use isa_mmio · 68501502

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-10-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

68501502

mips_malta: do not use isa_mmio · ee77854f

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-9-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

ee77854f

mips_r4k: do not use isa_mmio · 39594968

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-8-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

39594968

mips_jazz: do not use isa_mmio · f51100cc

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-7-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

f51100cc

prep: fix I/O port endianness · 921f8040

由 Paolo Bonzini 提交于 7月 22, 2013

Do not swap endianness here, it will happen during cpu_{in,out}{b,w,l}.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-6-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

921f8040

spapr_pci: remove indirection for I/O port access · 66aab867

由 Alexey Kardashevskiy 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-5-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

66aab867

ppc_newworld: do not use isa_mmio · 2b1096e0

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-4-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

2b1096e0

ppc_oldworld: do not use isa_mmio · 7d52857e

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-3-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

7d52857e

sh4: do not use isa_mmio · 4759ab6b

由 Paolo Bonzini 提交于 7月 22, 2013

This fixes endianness bugs in I/O port access (for sh4eb).
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1374501278-31549-2-git-send-email-pbonzini@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

4759ab6b