Commit d916adaa authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'bonzini/tags/for-anthony' into staging 



Here are a bunch of 1.7-tagged patches that I was afraid
were getting forgotten or that did not have a clear maintainer responsible
for making a pull request.

# gpg: Signature made Thu 21 Nov 2013 08:40:59 AM PST using RSA key ID 9B4D86F2
# gpg: Can't check signature: public key not found

# By Peter Maydell (3) and others
# Via Paolo Bonzini
* bonzini/tags/for-anthony:
  qga: Fix compiler warnings (missing format attribute, wrong format strings)
  mips jazz: do not raise data bus exception when accessing invalid addresses
  target-i386: yield to another VCPU on PAUSE
  rng-egd: offset the point when repeatedly read from the buffer
  rng-egd: remove redundant free
  target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid()
  vfio-pci: Fix multifunction=on
  atomic.h: Fix build with clang
  pc: get rid of builtin pvpanic for "-M pc-1.5"
  configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0
  sun4m: Add FCode ROM for TCX framebuffer

Message-id: 1385052578-32352-1-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 833637d4 d607a523

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ ifdef INSTALL_BLOBS 
BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \

vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \

acpi-dsdt.aml q35-acpi-dsdt.aml \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \

ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \

pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \

pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \

efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \

configure

+5 −0
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ query_pkg_config() { 
pkg_config=query_pkg_config

sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"



# If the user hasn't specified ARFLAGS, default to 'rv', just as make does.

ARFLAGS="${ARFLAGS-rv}"



# default flags for all hosts

QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"

QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
@@ -3695,6 +3698,7 @@ echo "C compiler $cc" 
echo "Host C compiler   $host_cc"

echo "C++ compiler      $cxx"

echo "Objective-C compiler $objcc"

echo "ARFLAGS           $ARFLAGS"

echo "CFLAGS            $CFLAGS"

echo "QEMU_CFLAGS       $QEMU_CFLAGS"

echo "LDFLAGS           $LDFLAGS"
@@ -4276,6 +4280,7 @@ echo "HOST_CC=$host_cc" >> $config_host_mak 
echo "CXX=$cxx" >> $config_host_mak

echo "OBJCC=$objcc" >> $config_host_mak

echo "AR=$ar" >> $config_host_mak

echo "ARFLAGS=$ARFLAGS" >> $config_host_mak

echo "AS=$as" >> $config_host_mak

echo "CPP=$cpp" >> $config_host_mak

echo "OBJCOPY=$objcopy" >> $config_host_mak

hw/display/tcx.c

+25 −1
Original line number Diff line number Diff line
@@ -25,8 +25,12 @@ 
#include "qemu-common.h"

#include "ui/console.h"

#include "ui/pixel_ops.h"

#include "hw/loader.h"

#include "hw/sysbus.h"



#define TCX_ROM_FILE "QEMU,tcx.bin"

#define FCODE_MAX_ROM_SIZE 0x10000



#define MAXX 1024

#define MAXY 768

#define TCX_DAC_NREGS 16
@@ -43,6 +47,8 @@ typedef struct TCXState { 
    QemuConsole *con;

    uint8_t *vram;

    uint32_t *vram24, *cplane;

    hwaddr prom_addr;

    MemoryRegion rom;

    MemoryRegion vram_mem;

    MemoryRegion vram_8bit;

    MemoryRegion vram_24bit;
@@ -529,14 +535,31 @@ static int tcx_init1(SysBusDevice *dev) 
{

    TCXState *s = TCX(dev);

    ram_addr_t vram_offset = 0;

    int size;

    int size, ret;

    uint8_t *vram_base;

    char *fcode_filename;



    memory_region_init_ram(&s->vram_mem, OBJECT(s), "tcx.vram",

                           s->vram_size * (1 + 4 + 4));

    vmstate_register_ram_global(&s->vram_mem);

    vram_base = memory_region_get_ram_ptr(&s->vram_mem);



    /* FCode ROM */

    memory_region_init_ram(&s->rom, NULL, "tcx.prom", FCODE_MAX_ROM_SIZE);

    vmstate_register_ram_global(&s->rom);

    memory_region_set_readonly(&s->rom, true);

    sysbus_init_mmio(dev, &s->rom);



    fcode_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, TCX_ROM_FILE);

    if (fcode_filename) {

        ret = load_image_targphys(fcode_filename, s->prom_addr,

                                  FCODE_MAX_ROM_SIZE);

        if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) {

            fprintf(stderr, "tcx: could not load prom '%s'\n", TCX_ROM_FILE);

            return -1;

        }

    }



    /* 8-bit plane */

    s->vram = vram_base;

    size = s->vram_size;
@@ -598,6 +621,7 @@ static Property tcx_properties[] = { 
    DEFINE_PROP_UINT16("width",    TCXState, width,     -1),

    DEFINE_PROP_UINT16("height",   TCXState, height,    -1),

    DEFINE_PROP_UINT16("depth",    TCXState, depth,     -1),

    DEFINE_PROP_HEX64("prom_addr", TCXState, prom_addr, -1),

    DEFINE_PROP_END_OF_LIST(),

};

hw/i386/pc_piix.c

+0 −7
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; 
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };

static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };



static bool has_pvpanic;

static bool has_pci_info;

static bool has_acpi_build = true;
@@ -229,10 +228,6 @@ static void pc_init1(QEMUMachineInitArgs *args, 
    if (pci_enabled) {

        pc_pci_device_init(pci_bus);

    }



    if (has_pvpanic) {

        pvpanic_init(isa_bus);

    }

}



static void pc_init_pci(QEMUMachineInitArgs *args)
@@ -250,13 +245,11 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args) 
static void pc_compat_1_5(QEMUMachineInitArgs *args)

{

    pc_compat_1_6(args);

    has_pvpanic = true;

}



static void pc_compat_1_4(QEMUMachineInitArgs *args)

{

    pc_compat_1_5(args);

    has_pvpanic = false;

    x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);

    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);

}

hw/i386/pc_q35.c

+0 −7
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
/* ICH9 AHCI has 6 ports */

#define MAX_SATA_PORTS     6



static bool has_pvpanic;

static bool has_pci_info;

static bool has_acpi_build = true;
@@ -216,10 +215,6 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 
    if (pci_enabled) {

        pc_pci_device_init(host_bus);

    }



    if (has_pvpanic) {

        pvpanic_init(isa_bus);

    }

}



static void pc_compat_1_6(QEMUMachineInitArgs *args)
@@ -232,13 +227,11 @@ static void pc_compat_1_6(QEMUMachineInitArgs *args) 
static void pc_compat_1_5(QEMUMachineInitArgs *args)

{

    pc_compat_1_6(args);

    has_pvpanic = true;

}



static void pc_compat_1_4(QEMUMachineInitArgs *args)

{

    pc_compat_1_5(args);

    has_pvpanic = false;

    x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);

    x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ);

}