Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 13 3月, 2014 28 次提交
  3. 12 3月, 2014 12 次提交
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · a822837d
      由 Peter Maydell 提交于 
      Tracing pull request

# gpg: Signature made Wed 12 Mar 2014 13:20:10 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  trace: Fix build warnings for Win32 build
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a822837d
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-misc-1' into staging · 01ac27ce
      由 Peter Maydell 提交于 
      Docs: Introduce multiport serial support in qemupciserial.inf.

# gpg: Signature made Wed 12 Mar 2014 09:35:55 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-misc-1:
  Docs: Introduce multiport serial support in qemupciserial.inf.
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      01ac27ce
    • P
      trace: Fix build warnings for Win32 build · 84f3fe1b
      由 Peter Maydell 提交于 
      The Win32 build warns about trace/control-internal.h:

warning: 'trace_event_count' declared inline after being called

Fix this by simply reordering trace_event_id() and
trace_event_count().
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: NStefan Weil <sw@weilnetz.de>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      84f3fe1b
    • P
      Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging · 2c3445bb
      由 Peter Maydell 提交于 
      * remotes/kiszka/queues/slirp:
  slirp smb with modern win guests when samba is also running on host
  qemu/slirp: Fix SMB security configuration on newer samba versions
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2c3445bb
    • P
      Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging · 7602e3e4
      由 Peter Maydell 提交于 
      * remotes/mcayland/qemu-sparc:
  target-sparc: Add and use CPU_FEATURE_CASA
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7602e3e4
    • P
      Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging · 613c12ec
      由 Peter Maydell 提交于 
      * remotes/qmp-unstable/queue/qmp:
  tests: test-qmp-commands: Fix double free
  qapi script: do not add "_" for every capitalized char in enum
  qapi script: do not allow string discriminator
  qapi: convert BlockdevOptions to use enum discriminator
  qapi script: support enum type as discriminator in union
  qapi script: use same function to generate enum string
  qapi script: code move for generate_enum_name()
  qapi script: check correctness of union
  qapi script: remember line number in schema parsing
  qapi script: add check for duplicated key
  qapi script: remember explicitly defined enum values
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      613c12ec
    • M
      Docs: Introduce multiport serial support in qemupciserial.inf. · dc9528fd
      由 Miki Mishael 提交于 
            Support for pci-serial-2x and pci-serial-4x
      was added to the inf file.
      Standard Windows driver mf.sys used to
      split single function device into per-port nodes.
Signed-off-by: NMiki Mishael <mmishael@redhat.com>
Signed-off-by: NDmitry Fleytman <dfleytma@redhat.com>
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      dc9528fd
    • S
      tap: avoid deadlocking rx · 68e5ec64
      由 Stefan Hajnoczi 提交于 
      The net subsystem has a control flow mechanism so peer NetClientStates
can tell each other to stop sending packets.  This is used to stop
monitoring the tap file descriptor for incoming packets if the guest rx
ring has no spare buffers.

There is a corner case when tap_can_send() is true at the beginning of
an event loop iteration but becomes false before the tap_send() fd
handler is invoked.

tap_send() will read the packet from the tap file descriptor and attempt
to send it.  The net queue will hold on to the packet and return 0,
indicating that further I/O is not possible.  tap then stops monitoring
the file descriptor for reads.

This is unlike the normal case where tap_can_send() is the same before
and during the event loop iteration.  The event loop would simply not
monitor the file descriptor if tap_can_send() returns true.  Upon next
iteration it would check tap_can_send() again and begin monitoring if we
can send.

The deadlock happens because tap_send() explicitly disabled read_poll.
This is done with the expectation that the peer will call
qemu_net_queue_flush().  But hw/net/virtio-net.c does not monitor
vm_running transitions and issue the flush.  Hence we're left with a
broken tap device.

Cc: qemu-stable@nongnu.org
Reported-by: NNeil Skrypuch <neil@tembosocial.com>
Tested-by: NNeil Skrypuch <neil@tembosocial.com>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      68e5ec64
    • M
      slirp smb with modern win guests when samba is also running on host · 5c1e1890
      由 Michael Tokarev 提交于 
      After numerous reports that -smb (or -netdev user,smb=foo) not working
with modern windows (win7 and vista are reported as non-working), I
started digging myself.  And found that indeed it doesn't work, and
why.

The thing is that modern win tries to connect to port 445 (microsoft-ds)
first, and if that fails, it falls back to old port 139 (netbios-ssn).

slirp code in qemu only redirects port 139, it does not touch port 445.

So the prob is that if samba is also running on the host, guest will try
to communicate using port 445, and that will succed, but ofcourse guest
will not talk with our samba but with samba running on the host.

If samba is not running on the host, guest will fall back to port 139,
and will reach the redirecting rule and qemu will spawn smbd correctly.

The solution is to redirect both ports (139 and 445), and the fix is
a one-liner, adding second call to slirp_add_exec() at the end of
net/slirp.c:slirp_smb() function (provided below).

But it looks like that is not a proper fix really, since in theory
we should redirect both ports to the SAME, single samba instance,
but I'm not sure this is possible with slirp.  Well, even if two
smbd processes will be run on the same config dir, it should not
be a problem.

The one-liner (not exactly 1 since it touches previous line too) is like
this:
Signed-off-By: NMichael Tokarev <mjt@tls.msk.ru>
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      5c1e1890
    • M
      qemu/slirp: Fix SMB security configuration on newer samba versions · c2804ee6
      由 Michael Buesch 提交于 
      The smb.conf automatically generated by qemu's -smb option fails on current
samba, because smbd rejects the security=share option with the following warning:

>   WARNING: Ignoring invalid value 'share' for parameter 'security'

Which makes it fall back to security=user without guest login.
This results in being unable to login to the samba server from the guest OS.

This fixes it by selecting 'user' explicitly and mapping
unknown users to guest logins.
Signed-off-by: NMichael Buesch <m@bues.ch>
Reviewed-by: NMichael Tokarev <mjt@tls.msk.ru>
Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      c2804ee6
    • S
      target-sparc: Add and use CPU_FEATURE_CASA · 16c358e9
      由 Sebastian Huber 提交于 
      The LEON3 processor has support for the CASA instruction which is
normally only available for SPARC V9 processors.  Binutils 2.24
and GCC 4.9 will support this instruction for LEON3.  GCC uses it to
generate C11 atomic operations.

The CAS synthetic instruction uses an ASI of 0x80.  If TARGET_SPARC64 is
not defined use a supervisor data load/store for an ASI of 0x80 in
helper_ld_asi()/helper_st_asi().  The supervisor data load/store was
choosen according to the LEON3 documentation.

The ASI 0x80 is defined in the SPARC V9 manual, Table 12—Address Space
Identifiers (ASIs).  Here we have: 0x80, ASI_PRIMARY, Unrestricted
access, Primary address space.

Tested with the following program:

  #include <assert.h>
  #include <stdatomic.h>

  void test(void)
  {
    atomic_int a;
    int e;
    _Bool b;

    atomic_store(&a, 1);
    e = 1;
    b = atomic_compare_exchange_strong(&a, &e, 2);
    assert(b);
    assert(atomic_load(&a) == 2);

    atomic_store(&a, 3);
    e = 4;
    b = atomic_compare_exchange_strong(&a, &e, 5);
    assert(!b);
    assert(atomic_load(&a) == 3);
  }

Tested also on a NGMP board with a LEON4 processor.
Reviewed-by: NFabien Chouteau <chouteau@adacore.com>
Reviewed-by: NAndreas Färber <afaerber@suse.de>
Tested-by: NMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: NRichard Henderson <rth@twiddle.net>
Signed-off-by: NSebastian Huber <sebastian.huber@embedded-brains.de>
Signed-off-by: NMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
      16c358e9
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · be813ef0
      由 Peter Maydell 提交于 
      acpi,pc,test bug fixes

More small fixes: the issues annoy developers so
I thought they are worth fixing quickly.
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 11 Mar 2014 11:27:44 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  acpi-test: update expected SSDT files
  acpi-build: don't access unaligned addresses
  q35: Correct typo BRDIGE -> BRIDGE
  configure: don't modify .status on error
  pc: avoid duplicate names for ROM MRs
  loader: rename in_ram/has_mr
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      be813ef0