This function joins two QDicts by absorbing one into the other.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This adds a test for VHDX images created by Microsoft's tool, Disk2VHD.
VHDX images created by this tool have 2 identical header sections, with
identical sequence numbers. This makes sure we detect VHDX images with
identical headers, and do not flag them as corrupt.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
The VHDX spec v1.00 declares that "a header is current if it is the only
valid header or if it is valid and its SequenceNumber field is greater
than the other header’s SequenceNumber field. The parser must only use
data from the current header. If there is no current header, then the
VHDX file is corrupt."
However, the Disk2VHD tool from Microsoft creates a VHDX image file that
has 2 identical headers, including matching checksums and matching
sequence numbers. Likely, as a shortcut the tool is just writing the
header twice, for the active and inactive headers, during the image
creation. Technically, this should be considered a corrupt VHDX file
(at least per the 1.00 spec, and that is how we currently treat it).
But in order to accomodate images created with Disk2VHD, we can safely
create an exception for this case. If we find identical sequence
numbers, then we check the VHDXHeader-sized chunks of each 64KB header
sections (we won't rely just on the crc32c to indicate the headers are
the same). If they are identical, then we go ahead and use the first
one.
Reported-by: Nerijus Baliūnas <nerijus@users.sourceforge.net>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
g_sequence_lookup is not supported by glib < 2.28. The usage
of g_sequence_lookup is not essential in this context (it's a
safeguard against duplicate values in the help message).
Removing the call enables the build on all platforms and
does not change the operation of the help function.
Signed-off-by: Mike Day <ncmike@ncultra.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
bdrv_is_allocated() shouldn't return true for sectors that are
unallocated, but after the end of a short backing file, even though
such sectors are (correctly) marked as containing zeros.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJTdOpIAAoJEK0ScMxN0CebAJUIAKmxOlk39ukPD3hn8Ik1MCr8
byJLcCZrdTzKMAjiovQIAmTmMQ4dba0YI6E+G8H4Z21u74P3fgUbhlt3SHpeMNch
kbfIUJ4PYAar9wze858rD4BANOOMB3qLjkE3LH8WF70S8S7yTc7fsCrDqS0+qG0P
+fFHdoHT1w93O5V07ELI9xCDEeCH7gE6znD0RLAc00SNErDWBCZKIpgT45K0bJmG
1uX8nuUHx6U8TUpjLzwUomJc5o3OeutbF3H2XlVQdzbPbBchkjeHEZ9jv2h2q6bC
e3xVzwBL7IP3vVEMLT6WWkNtI3XO1erDOjzbw/4F6hqpMOFy92Lpmpib8Q2W+S0=
=glsl
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-s390-20140515' into staging
tcg/s390 updates
# gpg: Signature made Thu 15 May 2014 17:24:40 BST using RSA key ID 4DD0279B
# gpg: Can't check signature: public key not found
* remotes/rth/tags/pull-tcg-s390-20140515:
tcg-s390: Implement direct chaining of TBs
tcg-s390: Don't force -march=z990
tcg-s390: Improve setcond
tcg-s390: Allow immediate operands to add2 and sub2
tcg-s390: Implement tcg_register_jit
tcg-s390: Use more risbg in the tlb sequence
tcg-s390: Move ldst helpers out of line
tcg-s390: Convert to new ldst opcodes
tcg-s390: Integrate endianness into TCGMemOp
tcg-s390: Convert to TCGMemOp
tcg-s390: Fix off-by-one in wraparound andi
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
looks like a quiet week
minor bugfix in virtio by myself
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJTciATAAoJECgfDbjSjVRp2ikH/A6mzwfRU91umcqu820NEIuQ
DrEL/DTeVf24SKw8zQIwZdIJ8+mCUBL7mGabZPqkaHAri7rKmqJmBdzTbPM2YXJt
rt3KXOI/dp7hgSN+mpSyumBOKQita5BZ7/krX75ZvUQrxtFpdzuD/NLSY809XGwo
AVQe5Kegt3E9AiqUKq2het8jKWGFbYKDzJu0TWcnlGNvVQE0Ut9G5NwCxbmR1vgv
cpcTtBBBJZDo9g408JscLS1hESM4z39bA87tqsnjAtoFvbmggYoZL2Oqrtu7abmk
HnkcPTWQVCruvCznDmNlSWYgDLPXoL//coYntxkoVT7TERkgeNANpHGw7hi/q/c=
=P6wK
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio update
looks like a quiet week
minor bugfix in virtio by myself
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 13 May 2014 14:37:23 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: allow mapping up to max queue size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJTdBkpAAoJEPSH7xhYctcj5jAQAJKiJ/43TBk0S0wlpoPjw1yA
WSC/oJ2yvf+i6EndJPdnxIA/3K3s7suRFBJVYwLVnGJTUZ6gwGcI7cc/EX/iK0vf
1Ffv/RAuh3nkohFw1ZMLQGqACFskSer0K1wZgQg+YjiJRPzzpVOpaAVm3+c04LRN
AjO9LTqudi2pFaDHfGQMFES3j/5+h2srdad7YLMu4h/17SLtcowO7Yf7GT+GHRyD
c3OHcL6vNoCKkIJQULC8X5czh6zapQZG3SRZ/nLt58yjEyVuq4L2cNRA/614K+5b
1YLz4dX6slj8y17tg8On60emU0Sdu4mOws9HtYSytfmEu045iuF+Wr4kNjO74UGd
NnnjD1pdnuF7356pz87PiVBf7qer5yrv+Bog1KRUwn3ETFqpSOMiKJo0JAGBMKdN
w6Mbkg9C7IR62OfmM5157Mj2Xd681GImNiYzerBMfuFAWk5XsMxuz9Xh03I7WpzS
ASow6SCBIr7bsiKENV7twuz1mIQclsYWXaVt8ldH8bMsTCqiefVeDs4o6A3Na+WC
LztUHzlhVLZU92uJDiIsyQnwmsw032RjhKY9sV/NMa5HLAhF/zZLcn1OfXshrv8t
mVnWngGbY185kml0GmLu9TSnSCBSD8lcwZlRA9JVyxfusxElJUOrQzKzvu69Rn6U
XBWPBwppnDQ0MjOgSZD+
=gg8m
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140515' into staging
migration/next for 20140515
# gpg: Signature made Thu 15 May 2014 02:32:25 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140515:
usb: fix up post load checks
migration: show average throughput when migration finishes
savevm: Remove all the unneeded version_minimum_id_old (rest)
savevm: Remove all the unneeded version_minimum_id_old (usb)
Split ram_save_block
arch_init: Simplify code for load_xbzrle()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
While we still require the LONG DISPLACEMENT facility, defaults
have moved on since then. Don't override the system compiler,
whose default may be set to z9-109 or later.
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
* remotes/kvm/uq/master:
pc: port 92 reset requires a low->high transition
cpu: make CPU_INTERRUPT_RESET available on all targets
apic: do not accept SIPI on the bootstrap processor
target-i386: preserve FPU and MSR state on INIT
target-i386: fix set of registers zeroed on reset
kvm: forward INIT signals coming from the chipset
kvm: reset state from the CPU's reset method
target-i386: the x86 CPL is stored in CS.selector - auto update hflags accordingly.
target-i386: set eflags prior to calling cpu_x86_load_seg_cache() in seg_helper.c
target-i386: set eflags and cr0 prior to calling cpu_x86_load_seg_cache() in smm_helper.c
target-i386: set eflags prior to calling svm_load_seg_cache() in svm_helper.c
pci-assign: limit # of msix vectors
pci-assign: Fix a bug when map MSI-X table memory failed
kvm: make one_reg helpers available for everyone
target-i386: Remove unused data from local array
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJTcTxpAAoJEK0ScMxN0CebexYIAKAQdpfw8eamRMZqwwxllKrM
VjdU3iR8ODpRmfEEvh+ZV80zF2OdiWNnGHAUEqk4Ur9G2r20kLrqtJanq/tX2FUZ
S7GrcpQRWAXYIv872mrY7V2DyyLohIeUmTh6USgZXRC2saEYffOEsmos9uMVZjzD
L3IP50OwpXCTRTwPQ8VyauwENf5ynOvIxkauFKq9PC48T60BOCfBUoNyHMzlMDTl
UKPt/1f13YvAub68MyhpivMTQP8Z1E+ZbBgo6JZ8Wjx/8NaXBAqHSGVby9FTDhac
a1NvjQxlgjpwkjxrygXy51R+5gfWDoJkaqdNbUUqc7FIAsW0BjY0/rX8eIM6m2Q=
=70Dp
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/rth/tags/pull-tgt-i386-20140512' into staging
Fix BT zero flag for new Intel manuals
# gpg: Signature made Mon 12 May 2014 22:26:01 BST using RSA key ID 4DD0279B
# gpg: Can't check signature: public key not found
* remotes/rth/tags/pull-tgt-i386-20140512:
target-i386: Preserve the Z bit for bt/bts/btr/btc
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This reverts commit f915db07ef.
This commit is broken because it does not account for the
build tree and the source tree being different, and can cause
build failures for out-of-tree builds. Revert it until we can
identify a better solution to the problem.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1400153676-30180-1-git-send-email-peter.maydell@linaro.org
Acked-by: Kevin Wolf <kwolf@redhat.com>
Now that ipxe has separate settings for load / boot banner timeouts
re-enable the boot banner while keeping the load banner turned off,
so we don't add a delay to non-pxe boots.
git shortlog:
Adrian Jamróz (2):
[rhine] Rewrite VIA Rhine driver
[velocity] Rewrite VIA Velocity driver
Alex Williamson (4):
[romprefix] Allow ROM banner timeout to be configured independently
[autoboot] Enable infrastructure to specify an autoboot device location
[prefix] Allow prefix to specify a PCI autoboot device location
[romprefix] Store boot bus:dev.fn address as autoboot device location
Alexander Chernyakhovsky (1):
[ocsp] Handle OCSP responses that don't provide certificates
Bo Yang (1):
[build] Avoid strict-aliasing warning for gcc 4.3
Brandon Penglase (1):
[build] Add vmware build target
Christian Hesse (2):
[build] Update build system for Syslinux 6.x
[build] Fix LABEL name for .liso images
Daniel P. Berrange (1):
[zbin] Fix size used for memset in alloc_output_file
Frediano Ziglio (1):
[romprefix] Fix incorrect pointer offset in undiloader.S
Kevin Tran (1):
[tg3] Fix various tg3 issues
Marin Hannache (8):
[linux] Add missing #include <stddef.h>
[legal] Add FILE_LICENCE for valgrind headers
[legal] Add FILE_LICENCE for core/errno.c
[legal] Add FILE_LICENCE for ath9k driver headers
[legal] Add missing FILE_LICENCE declarations
[cmdline] Add "poweroff" command
[nfs] Add support for NFS protocol
[nfs] Fix an issue with the selection of a local port
Michael Brown (363):
[netdevice] Separate VLAN support from presence of VLAN-supporting drivers
[undi] Work around specific devices with known broken interrupt behaviour
[menu] Prevent character code zero from acting as a shortcut key
[menu] Prevent separators with shortcut keys from being selected
[tftp] Allow TFTP block size to be controlled via the PXE TFTP API
[pcbios] Add extra debugging messages when unhiding iPXE from memory
[nbiprefix] Set up real-mode stack before jumping to .text16
[prefix] Use %cs as implicit parameter to uninstall()
[pcbios] Inhibit all calls to INT 15,e820 and INT 15,e801 during POST
[romprefix] Display only one "Ctrl-B" prompt per PCI device during POST
[efi] Update to latest EDK2 headers
[autoboot] Split main control flow out of main() into a new function ipxe()
[efi] Add last_opened_snpdev()
[efi] Expose downloaded images via EFI_SIMPLE_FILE_SYSTEM_PROTOCOL
[efi] Add our own EFI_LOAD_FILE_PROTOCOL implementation
[efi] Fix building with newer binutils
[lkrnprefix] Allow relocation when no initrd is present
[efi] Fix minor typos in efi_image.c
[efi] Add EFI-specific debugging macros
[int13] Split out ISO9660 and El Torito definitions to separate header files
[smbios] Provide SMBIOS version number via smbios_version()
[smbios] Mangle UUIDs for SMBIOS version 2.6 and newer
[dhcp] Use PXE byte ordering for UUID in DHCP option 97
[uuid] Abstract UUID mangling code out to a separate uuid_mangle() function
[efi] Provide efi_guid_ntoa() for printing EFI GUIDs
[efi] Add "reboot" command for EFI
[cmdline] Add ability to perform a warm reboot
[efi] Enable "cpuid" command by default for EFI
[cs89x0] Remove conflicting macro definitions
[igbvf] Remove conflicting macro definitions
[prism2] Use standard type names
[efi] Fetch device path for loaded image during initialisation
[settings] Expose build architecture and platform via settings
[bios] Fix screen clearing on buggy BIOSes
[intel] Remove hardcoded offsets for descriptor ring registers
[intel] Expose functionality to be shared with intelx driver
[intel] Add intelx driver for Intel 10 Gigabit Ethernet NICs
[efi] Remove obsolete EFI I/O implementation using EFI_CPU_IO_PROTOCOL
[libc] Use __einfo() tuple as first argument to EUNIQ()
[libc] Redefine low 8 bits of error code as "platform error code"
[efi] Perform meaningful error code conversions
[efi] Add sample platform-generated error disambiguations
[netdevice] Use link-layer address as part of RNG seed
[build] Allow sparse to find compiler.h
[build] Define __WINT_TYPE__ if necessary
[build] Allow sparse to be invoked via "make C=1"
[build] Avoid sparse undeclared symbol warning for PROVIDE_SYMBOL()
[process] Mark process descriptor as static in PERMANENT_PROCESS
[realtek] Print bad MAC address in debug message when inferring no EEPROM
[build] Use -Wno-decl when running sparse
[build] Fix uses of literal 0 as a NULL pointer
[build] Fix dubious uses of bitwise operators
[build] Default to short wchar_t in stddef.h
[realtek] Use ID word to detect EEPROM presence
[errdb] Strip platform error code for non-platform-generated errors
[pxe] Convert external PXE API errors into iPXE platform-generated errors
[realtek] Allow reaction time between writing RTL_CAPR and reading RTL_CR
[romprefix] Report failure cause when unable to open payload
[realtek] Ensure EEPROM writes reach chip before starting udelay()
[dhcp] Remove obsolete bootp.h header
[netdevice] Add netdev_tx_defer() to allow drivers to defer transmissions
[realtek] Defer packets when no transmit descriptors are available
[settings] Eliminate settings "tag magic"
[smbios] Allow access to unreferenced SMBIOS strings
[smbios] Allow access to multiple instances of SMBIOS structures
[crypto] Report meaningful error when certificate chain validation fails
[build] Use $(eval) if available
[build] Provide "allXXXs" targets for all media on all platforms
[build] Add efidrv.cab target for UEFI Secure Boot signing
[netdevice] Add "chip" setting
[netdevice] Reset MAC address when asked to clear the "mac" setting
[realtek] Fix reopening of legacy-mode 8139 NIC
[crypto] Accept OCSP responses containing multiple certificates
[bzimage] Align initrd images to page boundary
[bzimage] Fix spurious uninitialised-variable warning on some gcc versions
[build] Work around bug in gcc >= 4.8
[autoboot] Use next-server from filename's settings block
[tcp] Do not send RST for unrecognised connections
[tcp] Fix comment to match code behaviour
[test] Add self-tests for base16
[base16] Generalise base16_decode() to hex_decode()
[settings] Use hex_decode() to parse hex settings
[settings] Add "hexraw" setting type
[netdevice] Add "bustype" and "busloc" settings
[settings] Add "busdevfn" setting type
[linux] Add support for accessing PCI configuration space via /proc/bus/pci
[settings] Add config/settings.h
[settings] Expose PCI configuration space via settings mechanism
[settings] Make "netX" settings block function as a symbolic link
[cmdline] Accept "netX" in iPXE commands
[lotest] Include sequence number within loopback test packets
[intel] Incorporate ring producer and consumer counters in diagnostics
[base16] Ensure base16_encode() always terminates its result string
[realtek] Report RX error detail in debug messages
[script] Allow for backslash continuation of script lines
[settings] Add support for navigation keys in "config" user interface
[realtek] Allow extra space in RX buffers
[ifmgmt] Avoid relying on global variable within ifcommon_exec()
[script] Avoid trying to read final character of a zero-length string
[legal] Add missing FILE_LICENCE declarations
[build] Fix %.licence build target
[settings] Clarify usage of the term "named setting"
[settings] Avoid potentially large stack allocations
[settings] Remove temporary name buffer parameter from parse_setting_name()
[settings] Remove default_type parameter from parse_setting_name()
[settings] Expose parse_setting_name()
[settings] Change "not-found" semantics of fetch_setting_copy()
[settings] Add fetchf_setting_copy()
[settings] Eliminate call to fetchf_named_setting() in expand_settings()
[settings] Eliminate call to store_named_setting() in nslookup.c
[settings] Remove now-unused store_named_setting()
[parseopt] Allow parsed option to be modified
[parseopt] Move parse_settings() to parseopt.c
[parseopt] Add parse_setting()
[settings] Eliminate call to storef_named_setting() in choose_exec()
[settings] Eliminate calls to {fetch,store}f_named_setting() in NVO commands
[settings] Remove now-unused fetchf_named_setting() and storef_named_setting()
[script] Allow initial whitespace on lines containing labels
[script] Allow commands following a script label
[settings] Introduce the generalised concept of a numeric setting
[cmdline] Add "inc" command
[pci] Add pci_find_next() to iterate over existent PCI devices
[cmdline] Add "pciscan" command to allow iteration over PCI devices
[udp] Move high-frequency debug messages to DBGLVL_EXTRA
[ipv6] Rename sin_{family,port} to sin6_{family,port} in struct sockaddr_in6
[tcpip] Allow binding to unspecified privileged ports (below 1024)
[settings] Expose CPUID instruction via settings mechanism
[test] Add self-tests for snprintf()
[settings] Allow numeric_setting_value() to handle long setting values
[settings] Expose memory map via settings mechanism
[params] Add support for the general concept of a form parameter list
[cmdline] Add "params" and "param" commands to manage form parameter lists
[uri] Allow URIs to incorporate a parameter list
[http] Add support for HTTP POST
[settings] Make built-in settings a linker table
[linux] Give tap devices a name and bus type
[ipv4] Generalise fragment reassembly mechanism
[netdevice] Increase maximum network-layer address length
[netdevice] Add concept of a network device index
[netdevice] Add method for generating EUI-64 address from link-layer address
[ethernet] Add support for generating multicast hash for IPv6 addresses
[linux] Apply MAC address prior to registering network device
[tcpip] Pass through network device to transport layer protocols
[neighbour] Generalise concept of neighbour discovery
[ipv4] Abstract out protocol-specific portions of "route" command
[ipv6] Replace IPv6 stack
[ipv6] Fix uninitialised-variable warning
[tcp] Reduce path MTU to 1280 bytes
[ipv6] Add inet6_aton()
[build] Work around bug in gcc >= 4.8
[neighbour] Add nstat() function to print out neighbour table
[cmdline] Add "nstat" command
[tcp] Add AF_INET6 socket opener
[udp] Add AF_INET6 socket opener
[netdevice] Add find_netdev_by_index()
[socket] Add concept of a generalised socket address converter
[ipv4] Add IPv4 socket address converter
[ipv6] Add IPv6 socket address converter
[resolv] Use sock_aton() to allow parsing of arbitrary numeric addresses
[icmp] Add support for sending ICMP echo requests
[ping] Add concept of a ping socket
[ping] Add generic ping mechanism
[ping] Add top-level ping() function to ping a host
[cmdline] Add "ping" command
[ipv6] Handle IPv6 option length correctly
[ipv6] Extract link layer addresses from router advertisements
[ipv6] Support stateless address autoconfiguration (SLAAC)
[ipv6] Treat sin6_scope_id consistently
[ipv6] Automatically choose source for link-local and multicast destinations
[pxe] Always retrieve cached DHCPACK and apply to relevant network device
[ipv6] Add ndp_tx_router_solicitation() to send router solicitations
[parseopt] Add parse_timeout()
[netdevice] Make all net_driver methods optional
[interface] Default to calling intf_restart() in response to intf_close()
[job] Allow job_progress() to return an ongoing job status code, if known
[monojob] Add timeout parameter to monojob_wait()
[monojob] Report ongoing job status as overall return status on timeout
[cmdline] Rewrite "sync" command to use monojob_wait()
[autoboot] Fix shell banner timeout
[ifmgmt] Rewrite iflinkwait() to use monojob_wait()
[cmdline] Allow "if<xxx>" commands to take options
[netdevice] Add generic concept of a network device configurator
[dhcp] Add DHCP network device configurator
[parseopt] Add parse_netdev_configurator()
[ifmgmt] Add ifconf() to carry out network device configuration
[autoboot] Use ifconf() to configure network device
[cmdline] Add "ifconf" command
[cmdline] Make "dhcp" command a synonym for "ifconf"
[dhcp] Remove obsolete dhcp() function
[ipv6] Add IPv6 network device configurator
[cmdline] Generate command option help text automatically
[pxe] Ensure cached DHCPACK is retrieved prior to network device creation
[base16] Fix comparison of signed and unsigned integers
[settings] Move user-class setting from dhcp.c to settings.c
[ipv6] Use given source address only if it is not the unspecified address
[ipv6] Add "ipv6" setting type
[dhcpv6] Add basic support for stateful and stateless DHCPv6
[ipv6] Separate the concepts of prefix and address creation
[dhcpv6] Allow stateful DHCPv6 to apply obtained IPv6 addresses
[test] Include failing code within failed test result output
[main] Defer "initialising devices" message until initialising devices
[console] Pass escape sequence context to ANSI escape sequence handlers
[pixbuf] Add generic concept of a pixel buffer
[image] Allow for non-executable image formats
[image] Add image_pixbuf() to create pixel buffer from image
[pnm] Add support for PNM images
[mucurses] Use "<ESC>[2J" ANSI escape sequence to clear screen
[console] Allow console input and output to be disabled independently
[console] Add concept of generic console configuration
[cmdline] Add "console" command to configure console
[fbcon] Add generic concept of a frame buffer console
[vesafb] Add VESA frame buffer console
[vesafb] Include raw status value within VBE error messages
[vesafb] Skip modes for which we cannot get mode information
[vesafb] Return meaningful error when no suitable mode is found
[vesafb] Select an optimal mode, rather than the first acceptable mode
[build] Fix building on OpenBSD 5.4
[console] Allow '?' as an intermediate byte in ANSI escape sequences
[mucurses] Implement curs_set() to control cursor visibility
[settings] Hide cursor when not actively editing a setting
[menu] Hide cursor when displaying menu
[fbcon] Add support for displaying a cursor
[settings] Explicitly separate the concept of a completed fetched setting
[settings] Allow for IPv6 setting types in non-IPv6 builds
[settings] Add fetch_ipv6_setting()
[dns] Add support for resolving IPv6 addresses via AAAA records
[socket] Ensure socket address structure sizes are fixed
[syslog] Add support for IPv6 syslog server
[ipv6] Add support for resolving IPv6 addresses via the "nslookup" command
[linux] Provide access to SMBIOS via /dev/mem
[dhcpv6] Use DUID-UUID form of client DUID
[settings] Force settings into alphabetical order within sections
[settings] Allow for multiple definitions of each predefined setting
[settings] Merge SETTING_IPv4 and SETTING_IPv6
[dhcpv6] Add DHCPv6 "filename" setting
[ipv6] Expose NDP-provided settings (including the DNS server)
[vesafb] Work around data corruption bug in bochs/qemu VBE implementation
[settings] Adapt user interface to fit display size
[login] Adapt user interface to fit display size
[menu] Adapt user interface to fit display size
[console] Allow consoles to update the recorded console size
[fbcon] Update the console width and height after changing mode
[lkrnprefix] Include iPXE version string in image header
[fbcon] Always draw cursor using current foreground and background colours
[console] Add centralised concept of colours and colour pairs
[mucurses] Use centralised concept of colour pairs
[cmdline] Add the "colour" and "cpair" commands
[console] Add concept of a "magic" colour
[vesafb] Set "magic" colour to transparent when a background picture is used
[build] Remove obsolete check for GNU as version 2.9.1
[ipv6] Fix compilation under FreeBSD
[build] Build ROMs used by qemu and VMware as part of "make all"
[libc] Add isprint()
[test] Add okx() macro taking an explicit file name and line number
[deflate] Add support for DEFLATE decompression
[deflate] Fix literal data length calculation
[libc] Add abs()
[uaccess] Add memcmp_user()
[test] Rewrite pnm_ok() using okx()
[test] Generalise pnm_ok() to pixbuf_ok()
[png] Add support for PNG images
[vesafb] Handle failures from fbcon_init()
[fbcon] Centre background picture on console
[fbcon] Allow for an arbitrary margin around the text area
[vesafb] Allow for an arbitrary margin around the text area
[cmdline] Rename "console" command's --bpp option to --depth
[cmdline] Add margin options to the "console" command
[fbcon] Allow ANSI CUP with missing arguments
[cmdline] Always clear screen after reconfiguring console
[intel] Add some missing PCI IDs
[dns] Support DNS search lists
[dns] Update end-of-name pointer after processing CNAME record
[dhcp] Copy exactly the required length when resizing DHCP options
[settings] Remove "uristring" setting type
[params] Use reference counters for form parameter lists
[uri] Refactor URI parsing and formatting
[image] Ensure every image has a fully resolved URI
[tcpip] Add IP statistics collection as per RFC 4293
[cmdline] Add the "ipstat" command
[prefix] Ignore PCI autoboot device location if set to 00:00.0
[tcpip] Provide tcpip_netdev() to determine the transmitting network device
[tcpip] Provide tcpip_mtu() to determine the maximum transmission unit
[tcp] Calculate correct MSS from peer address
[bzimage] Report exact initrd length via bzImage header
[realtek] Include link status register details in debug messages
[romprefix] Do not clobber stack segment when returning to BIOS
[netdevice] Mark devices as open before calling open() method
[tcp] Update window even if ACK does not acknowledge new data
[linux] Avoid starting currticks() from zero every time
[http] Use a retry timer to trigger retried requests
[http] Automatically retry request on a 503 Service Unavailable
[mii] Add mii_dump() to dump all MII registers
[realtek] Dump all MII register contents when link status changes
[monojob] Reset timeout when progress is made
[image] Add "--timeout" parameter to image downloading commands
[efi] Allow for 64-bit EFI_STATUS codes
[efi] Allow driver to be unloaded
[efi] Connect driver to devices as part of installation
[console] Fix display of characters with top bit set
[lotest] Allow loopback testing on shared networks
[netdevice] Notify upper-layer drivers when RX processing is (un)frozen
[efi] Avoid accidentally calling main() twice
[efi] Unload our own image before exiting UEFI application
[efi] Disable SNP devices when running iPXE as the application
[realtek] Add ability to dump all internal registers
[realtek] Clear bit 24 of RCR
[bios] Fix screen clearing on even more buggy BIOSes
[http] Accept Content-Length header with trailing whitespace
[crypto] Remove dynamically-allocated storage for certificate name
[crypto] Remove dynamically-allocated storage for certificate OCSP URI
[build] Remove long-obsolete mechanism for wrapping embedded images
[build] Disable ccache for all relevant build targets
[build] Add dependency of generated files upon Makefile
[crypto] Add pubkey_match() to check for matching public/private key pairs
[crypto] Generalise X.509 cache to a full certificate store
[crypto] Use fingerprint when no common name is available for debug messages
[crypto] Allow signed timestamp error margin to be configured at build time
[test] Rewrite X.509 tests using okx()
[test] Rewrite CMS tests using okx()
[test] Add tests for x509_check_name()
[test] Add subject alternative names to X.509 server test certificate
[crypto] Add support for subjectAltName and wildcard certificates
[crypto] Allow wildcard matches on commonName as well as subjectAltName
[intel] Avoid completely filling the TX descriptor ring
[test] Rewrite TCP/IP tests using okx()
[test] Add self-tests for flsl()
[libc] Add inline assembly implementation of flsl() using BSR instruction
[test] Add tests for 64-bit division
[build] Fix __libgcc attribute for recent gcc versions
[test] Check for correct -mrtd assumption on libgcc arithmetic functions
[libc] Add isqrt() function to find integer square roots
[libc] Add flsll()
[profile] Add generic profiling infrastructure
[cmdline] Add "profstat" command to display profiling statistics
[netdevice] Profile common operations
[intel] Profile common virtual machine operations
[intel] Push new RX descriptors in batches
[librm] Use genuine real mode to accelerate operation in virtual machines
[ipv4] Profile transmit and receive datapaths
[tcp] Profile transmit and receive datapaths
[http] Profile receive datapath
[downloader] Profile receive datapath
[build] Allow for a debug level of zero
[librm] Allow interrupts in protected mode
[comboot] Use built-in interrupt reflector
[pcbios] Do not switch to real mode to check for timer interrupt
[pcbios] Do not switch to real mode to sleep the CPU
[test] Print out profiling statistics after a successful test run
[librm] Add a profiling self-test for measuring mode transition times
[librm] Add meaningful labels at section changes
[librm] Speed up protected-to-real mode transition under KVM
[librm] Speed up real-to-protected mode transition under KVM
[librm] Speed up protected-mode calls under KVM
[profile] Provide methods for profiling individual stages of operations
[librm] Add profiling self-tests for complete real_call and prot_call cycles
[pxe] Profile all PXE API calls
[pxe] Profile UNDI transmit datapath
[pxe] Work around missing PXENV_UNDI_OPEN only when necessary
[undi] Profile all PXE API calls
[undi] Profile transmit and receive datapaths
[undi] Report any PXENV_UNDI_ISR errors via netdev_rx_err()
[undi] Do not switch to real mode to check for NIC interrupt
[undi] Place an upper limit on the number of PXENV_UNDI_ISR calls per poll
Peter Pickford (1):
[serial] Enable UART FIFOs
Robin Smidsrød (2):
[settings] Add "version" builtin setting
[build] Include ipxe.pxe in default build
Stefan Hajnoczi (2):
[netdevice] Add vlan_tag() to get the VLAN tag of a network device
[iscsi] Include 802.1Q VLAN identifier in iBFT
Thomas Miletich (3):
[3c90x] Stall upload engine before setting RX ring address
[3c90x] Don't round up transmit packet length
[3c90x] Fix High-MTU packet reception
lolipop (1):
[intel] Add Intel I217 Gigabit Ethernet PCI ID
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Code grew a bit, had to disable CONFIG_USB_UAS to make the
bios for the old machine types continue top fit into 128k.
git shortlog since 1.7.4:
Eric Northup (2):
init_virtio_blk, init_virtio_scsi: reset HBA on error
vp_init_simple: enable PCI bus-mastering before relying on DMA.
Gabriel L. Somlo (1):
SMBIOS: Check for aggregate tables & entry point in fw_cfg
Gerd Hoffmann (4):
smbios: catch zero-length strings
pci: improve io address space allocation
xhci: allocate scratch pad buffers
vga: rework bar detection, add virtio-vga
Johannes Krampf (5):
build: Remove unneccesary semicolons from acpi_extract scripts.
build: Make print statements in scripts python3 compatible.
build: Be explicit that we want integers when dividing for python3 compat.
build: Avoid sort() on unordered classes for python3 compatibility.
build: Be careful with unicode and byte strings for python3 compatibility.
Kevin O'Connor (79):
build: Don't trash the .config file when src/Kconfig changes.
Remove the pmm handle argument from _malloc().
Clear the total block transfer count on error.
Remove unnecesary updates of the disk op->count field.
Always perform thread cleanup on MainThread stack.
pvscsi: Don't store reference to struct pci_device.
pvscsi: Always run entirely in 32bit mode.
pvscsi: Remove use of LOWFLAT and GLOBALFLAT macros.
usb: Replace EHCI to UHCI/OHCI synchronization with new scheme.
Minor - pciinit.c - order header files and use static on local functions.
Minor - fix misspelling in romfile.c comment.
ehci: memset the qTD structures in ehci_alloc_intr_pipe
build: Update kconfig to version in Linux 3.13.
scripts: Allow encodeint.py to take integers in hex notation.
coreboot: Support alternative locations for CBFS.
debug: Add runtime option to not report the debug serial port to the OS.
debug: Only call serial_debug_preinit() at startup.
debug: Unify the SeaBIOS debug version banner.
xhci: Use 64bit writes to ERDP register.
xhci: Fix incorrect direction setting on status transmissions.
xhci: Set the interval parameter on interrupt pipes.
xhci: Verify PAGESIZE register before initializing driver.
xhci: Allocate and free the xhci inctx structure on each use.
xhci: Move set_address code from xhci_control to xhci_alloc_pipe.
xhci: Eliminate 'struct xhci_device'.
xhci: Support xhci controllers with 64 byte contexts.
xhci: Allow the XHCI USB controller to be enabled for coreboot.
xhci: Don't use a dummy endpoint count in configure command.
xhci: Report the "protocol defined" and PSIC bits of extended capabilities.
xhci: Support USB hubs on xhci controllers.
Add call32_params() helper function.
Add space between DTYPE_* definitions.
xhci: Run the XHCI driver entirely in 32bit mode.
Remove pci_writel() and pci_readl() functions.
xhci: Check if scratch pad allocation fails.
Increase maximum size of permanent high memory area.
usb: USB 3 devices encode bMaxPacketSize0 field.
usb: Move default pipe max packet size code from xhci to main code.
xhci: Use the same endpoint initialization code in xhci_alloc_pipe()
xhci: Add copyright notice to usb-xhci.c
vgabios: Make sure exported structs use PACKED.
vgabios: Simplify the bios save state area.
vgabios: Simplify save/restore mechanism.
vgabios: Attempt to detect old x86emu and force a fault.
vgabios: Don't interpret TAB character.
vgabios: Refactor write_teletype and write_chars.
vgabios: Make sure stdvga_list_modes() doesn't overrun the buffer.
coreboot: Add support for a "links" file to have aliases in CBFS.
Enhance nullTrailingSpace() so that it can also skip leading spaces.
coreboot: Move links file processing to its own function.
vgabios: Fix PMM allocation request size.
smbios: Default all values to zero.
usb: Only disable HID devices if both USB_MOUSE and USB_KEYBOARD are off.
Minor - fix some typos in comments.
Replace CONFIG_THREAD_OPTIONROMS with a runtime config setting.
acpi: Move acpi parsing logic from acpi.c to biostables.c / paravirt.c.
smbios: Move smbios parsing logic from smbios.c to biostables.c.
Move PirAddr definition from pirtable.c to biostables.c.
Use biostables.c for copying bios tables even when generating them.
Document no new changes to pirtable.c, mptable.c, acpi.c, and smbios.c.
apm: Remove old Bochs mechanism for shutdown/suspend/standby.
Minor - remove unused includes from pci.c.
vgabios: Add option to control use of standard VGA IO ports.
vgabios: Split vgafb_scroll() into separate move and clear functions.
vgabios: Rewrite vgafb.c graphics operations to set of 4 standard operators.
vgabios: Introduce text_address().
vgabios: Add support for manipulating framebuffers in high memory.
Set the color attribute when calling vgabios print character.
vgabios: PMM scan was incorrectly depending on a zero %ds segment.
coreboot: Make coreboot table searching available to other code.
vgabios: Initial support for coreboot native vga vgabios.
Minor - replace some tab characters that slipped into the code.
Factor out smbios table walking from display_uuid to smbios_next().
vgabios: Define PlatformRunningOn to make compile happy.
If an int 1587 call is made from an option rom, stay in bigreal mode.
xhci: Use msleep() instead of mdelay() for port status delay.
build: Make sure romlayout.o is recompiled on Kconfig change.
Fix int 1589 calls when CONFIG_ENTRY_EXTRASTACK is enabled.
acpi: Fix acpi dsdt compile warning.
Laszlo Ersek (1):
init_virtio_scsi(): reset the HBA before freeing its virtio ring
Marcel Apfelbaum (3):
resume: restore piix pm config registers after resume
hw/pci: reserve IO and mem for pci-2-pci bridges with no devices attached
hw/pci: check if pci2pci bridges implement optional limit registers
Roger Pau Monne (1):
ld: don't hardcode "-melf_i386"
Sander Eikelenboom (1):
Prevent build failure by not splitting line in the middle of arguments to checkrom.py script
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
There are a variety of common cases for which we can use carry tricks to
avoid a conditional branch. On very new hardware, use LOAD ON CONDITION
instead of a conditional branch.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Elides two insns from the sequence. The resulting tlb compare
sequence is satisfyingly minimal:
risbg %r2,%r8,51,186,56
risbg %r3,%r8,61,178,0
cg %r3,904(%r10,%r2)
lg %r2,920(%r10,%r2)
jlh tlb_miss
Signed-off-by: Richard Henderson <rth@twiddle.net>
Commit af3cbfbe80 hoisted some "common"
loads of the temporary type, forgetting that the types could differ
during truncating moves. This affects the correctness of the memory
offset on big-endian hosts.
Tested-by: Tom Musta <tommusta@gmail.com>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Correct post load checks:
1. dev->setup_len == sizeof(dev->data_buf)
seems fine, no need to fail migration
2. When state is DATA, passing index > len
will cause memcpy with negative length,
resulting in heap overflow
First of the issues was reported by dgilbert.
Reported-by: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
currently the value of the throughput field contains whatever
was the last calculated throughput shortly before the migration
finished.
This patch updates the post migration contents of the field to
the average throughput.
Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
After previous Peter patch, they are redundant. This way we don't
assign them except when needed. Once there, there were lots of case
where the ".fields" indentation was wrong:
.fields = (VMStateField []) {
and
.fields = (VMStateField []) {
Change all the combinations to:
.fields = (VMStateField[]){
The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
After previous Peter patch, they are redundant. This way we don't
assign them except when needed. Once there, there were lots of case
where the ".fields" indentation was wrong:
.fields = (VMStateField []) {
and
.fields = (VMStateField []) {
Change all the combinations to:
.fields = (VMStateField[]){
The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
ram_save_block is getting a bit too complicated, and does two separate
things:
1) Finds a page to send
2) Sends the page (dealing with compression etc)
Split into 'ram_save_page' to send the page and deal with compression (2)
Rename remaining function to 'ram_find_and_save_block'
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
For xbzrle_decode_buffer(), when decoding contents will exceed writing
buffer, it will return -1, so need not check the return value whether
large than writing buffer.
And when failure occurs within load_xbzrle(), it always return -1
without any resources which need release.
So can remove the related checking statements, and also can remove 'rc'
and 'ret' local variables,
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
We got the wrong version of stl_p, the one that bswaps as appropriate
for the target. Since x86 is always little-endian, the "_le_" routine
will resolve to what we want.
Signed-off-by: Richard Henderson <rth@twiddle.net>
In fill_prefetch_fifo(), if the device we are reading from is 16 bit,
then we must not try to transfer an odd number of bytes into the FIFO.
This could otherwise have resulted in our overrunning the prefetch.fifo
array by one byte.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
We don't implement very much of the GPTM TAR register, and what we
do is wrong. The "are we in RT mode?" field is in s->config, not
s->control. Correct this, use LOG_UNIMP rather than hw_error()
for the cases we don't support, and avoid an unlabelled fallthrough
that makes Coverity complain.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Add casts to avoid potentially overflowing the multiplications
of 32 bit quantities in exynos4210_ltick_recalc_count().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Add missing (uint32_t) casts in cases where we're trying to
put a uint16_t value into the top half of a 32-bit field.
These were already present in some but not all places.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
When writing to the YEARS_REG register, if the year value is
99 then the multiplication by 31536000 will overflow into
the sign bit of a 32 bit value and then be erroneously
sign-extended if time_t is 64 bits. Add a cast to avoid this.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Commit 191946c moved the code to handle padding to minimum
length from after the handling of the CRC to before it.
This means that the CRC code doesn't need to cope with the
possibility that the size is less than 60; remove this
dead code.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Add missing 'break' after handling of AW_A10_PIC_BASE_ADDR write.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Linux makes a habit of writing the same value to the SCTLR that it
already holds. In a sample boot of the kernel to a shell prompt
it wrote the SCTLR with the value it already held 325465 times,
and wrote different values just 3 times.
Skip flushing the TLB if the SCTLR value isn't actually being changed;
this speeds up my sample boot by 3-5%.
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1399560029-19007-1-git-send-email-peter.maydell@linaro.org
Convert this device to use vmstate for its save/load, including
providing a post_load function that sanitizes inbound data to
avoid possible buffer overflows if it is malicious.
The sanitizing fixes CVE-2013-4532 (though nobody should be
relying on the security properties of most of the unmaintained
ARM board models anyway, and migration doesn't actually
work on this board due to issues in other device models).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
The rx_fifo pointer is awkward to migrate, and is actually
redundant since it is always possible to determine it from
the current rx[].len/.data and rx_fifo_len. Remove both
rx_fifo and rx_fifo_len from the state, replacing them with
a simple rx_fifo_offset which points at the current location
in the RX fifo.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Fix various debug format strings which were incorrect for the
data type, so that building with debug enabled is possible.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Packet transmission for the stellaris ethernet controller can be triggered
in one of two ways:
* by setting a threshold value in the THR register; when the FIFO
fill level reaches the threshold, the h/w starts transmitting.
Software has to finish filling the FIFO before the transmit
process completes to avoid a (silent) underrun
* by software writing to the TR register to explicitly trigger
transmission
Since QEMU transmits packets instantaneously (from the guest's
point of view), implement "transmit based on threshold" with
our existing mechanism of "transmit as soon as we have the whole
packet", with the additional wrinkle that we don't transmit if
the packet size is below the specified threshold, and implement
"transmit by specific request" properly.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
The datasheet is clear that the frame length written to the DATA
register is actually stored in the TX FIFO; this means we don't
need to keep both tx_frame_len and tx_fifo_len state separately.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
The PADEN bit in the transmit control register enables padding of short
data packets out to the required minimum length. However a typo here
meant we were adjusting tx_fifo_len rather than tx_frame_len, so the
padding didn't actually happen. Fix this bug.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Cc: qemu-stable@nongnu.org
