1. 29 2月, 2012 7 次提交
  2. 28 2月, 2012 1 次提交
  3. 27 2月, 2012 4 次提交
    • D
      slirp: Fix assertion failure on rejected DHCP requests · 90d7416a
      David Gibson 提交于
      The guest network stack might DHCPREQUEST an address that the slirp built
      in dhcp server can't let it have - for example if the guest has an old
      leases file from another network configuration.  In this case the dhcp
      server should and does reject the request and prepares to send a DHCPNAK
      to the client.
      
      However, in this case the daddr variable in bootp_reply() is set to
      0.0.0.0.  Shortly afterwards, it unconditionally attempts to pre-insert the
      new client address into the ARP table.  This causes an assertion failure in
      arp_address_add() because of the 0.0.0.0 address.
      
      According to RFC2131, DHCPNAK messages for clients on the same subnet
      must be sent to the broadcast address (S3.2, subpoint 2).
      
      Cc: Jan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      90d7416a
    • J
      slirp: Refactor if_start · b87ffa16
      Jan Kiszka 提交于
      Replace gotos with a while loop, fix coding style.
      
      CC: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
      CC: Fabien Chouteau <chouteau@adacore.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      b87ffa16
    • J
      slirp: Fix requeuing of batchq packets in if_start · b248ede2
      Jan Kiszka 提交于
      In case we requeued a packet that was the head of a longer session
      queue, we failed to restore this ordering. Also, we did not properly
      deal with changes to Slirp::next_m.
      
      Instead of a cumbersome roll back, this fix simply avoids any changes
      until we know if the packet was actually sent. Both fixes crashes due
      to inconsistent queues and simplifies the logic.
      
      Thanks to Zhi Yong Wu who found the reason for these crashes.
      
      CC: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
      CC: Fabien Chouteau <chouteau@adacore.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      b248ede2
    • J
      slirp: Clean up ifs_init · 79e7e937
      Jan Kiszka 提交于
      Remove duplicate ifs_init macros, reimplement the logic as static inline
      in mbuf.h.
      
      CC: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
      CC: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      79e7e937
  4. 25 2月, 2012 20 次提交
  5. 24 2月, 2012 8 次提交
    • A
      Merge remote-tracking branch 'stefanha/trivial-patches' into staging · 85f38553
      Anthony Liguori 提交于
      * stefanha/trivial-patches:
        slirp/misc: fix gcc __warn_memset_zero_len warnings
        vl.c: Increase width of machine name column in "-M ?" output
        tcg: Remove unneeded include statements
      85f38553
    • A
      Merge remote-tracking branch 'mdroth/qga-win32-pull-2-23-12' into staging · 18ac5499
      Anthony Liguori 提交于
      * mdroth/qga-win32-pull-2-23-12:
        qemu-ga: add win32 guest-shutdown command
        qemu-ga: add Windows service integration
        qemu-ga: add initial win32 support
        qemu-ga: fixes for win32 build of qemu-ga
        qemu-ga: rename guest-agent-commands.c -> commands-posix.c
        qemu-ga: separate out common commands from posix-specific ones
        qemu-ga: move channel/transport functionality into wrapper class
        qemu-ga: Add schema documentation for types
      18ac5499
    • A
      Merge remote-tracking branch 'qmp/queue/qmp' into staging · 7c1daf34
      Anthony Liguori 提交于
      * qmp/queue/qmp:
        qmp: add DEVICE_TRAY_MOVED event
        ide: drop ide_tray_state_post_load()
        block: Don't call bdrv_eject() if the tray state didn't change
        block: bdrv_eject(): Make eject_flag a real bool
        block: Rename bdrv_mon_event() & BlockMonEventAction
      7c1daf34
    • A
      Merge remote-tracking branch 'kwolf/for-anthony' into staging · 5105b6d8
      Anthony Liguori 提交于
      * kwolf/for-anthony: (46 commits)
        qemu-iotests: common.config: Allow use of arbitrary qemu* paths
        qemu-iotests: check: print relevant path information
        qemu-iotests: test loading internal snapshots
        qemu-iotests: Update filter for default cluster size
        qemu-iotests: add qed support to 025 image resize test
        qemu-iotests: Update rbd support
        qemu-iotests: common.config: Fix no $TEST_DIR directory
        qemu-iotests: only run 016 for file and sheepdog protocols
        qemu-iotests: Use zero-based offsets for IO patterns
        qemu-iotests: add support for rbd and sheepdog protocols
        qemu-iotests: filter IMGFMT correctly in 019
        qemu-iotests: README: Fix spelling
        qemu-iotests: add support for qed format
        qemu-iotests: filter TEST_DIR correctly in 019
        qemu-iotests: fix 019 golden output
        qemu-iotests: update expected results after qemu-img changes
        qemu-iotests: add read/write from smaller backing image test
        qemu-iotests: add sub-cluster allocating write test for sparse image formats
        qemu-iotests: improve test for qemu-img convert with backing file
        qemu-iotests: consider more cases in parsing qemu-io output
        ...
      5105b6d8
    • A
      Merge remote-tracking branch 'bonzini/virtio-scsi' into staging · 9ef1300b
      Anthony Liguori 提交于
      * bonzini/virtio-scsi:
        scsi-block: always use scsi_generic_ops for cache != none
        scsi: fix searching for an empty id
        scsi: fix wrong return for target INQUIRY
        virtio-scsi: add migration support
        virtio-scsi: process control queue requests
        virtio-scsi: add basic SCSI bus operation
        virtio-scsi: Add basic request processing infrastructure
        virtio-scsi: Add virtio-scsi stub device
        scsi-disk: add migration support
        scsi-generic: add migration support
        scsi: add SCSIDevice vmstate definitions
        scsi-disk: enable scatter/gather functionality
        scsi: add scatter/gather functionality
        scsi: pass residual amount to command_complete
        ahci: use new DMA helpers
        dma-helpers: add accounting wrappers
        dma-helpers: add dma_buf_read and dma_buf_write
        dma-helpers: make QEMUSGList target independent
      9ef1300b
    • A
      target-i386: Introduce x86_cpuid_set_model_id() · dcce6675
      Andreas Färber 提交于
      Move the logic to transform the 48-char model ID into the 12-word model
      value into a helper.
      Signed-off-by: NAndreas Färber <afaerber@suse.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      dcce6675
    • A
      target-i386: Introduce x86_cpuid_version_set_stepping() · 38c3dc46
      Andreas Färber 提交于
      Move the logic for setting the stepping field into a helper function.
      
      To make the function self-contained and to prepare for future
      unordered/multiple uses, mask out any previous stepping values first.
      Signed-off-by: NAndreas Färber <afaerber@suse.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      38c3dc46
    • A
      target-i386: Introduce x86_cpuid_version_set_model() · b0704cbd
      Andreas Färber 提交于
      Move the logic for setting the model and extended model fields
      into a helper function.
      
      To make the function self-contained and to prepare for future
      unordered/multiple uses, mask out any previous model values first.
      Signed-off-by: NAndreas Färber <afaerber@suse.de>
      Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
      b0704cbd