Commit 6a245c66 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging 

# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  Fix the wrong description in qemu manual
  pci_host: Drop write-only address_space field
  rng-random: Use qemu_open / qemu_close
  configure: Require at least spice-protocol-0.12.3
  osdep: replace setsockopt by qemu_setsockopt
  lm32: remove unused function
  rtc-test: Fix test failures with recent glib
  configure: Create link to icon bitmap for out-of-tree builds
parents 6d06368d db2d5eba

backends/rng-random.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp) 
        error_set(errp, QERR_INVALID_PARAMETER_VALUE,

                  "filename", "a valid filename");

    } else {

        s->fd = open(s->filename, O_RDONLY | O_NONBLOCK);

        s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);



        if (s->fd == -1) {

            error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
@@ -130,7 +130,7 @@ static void rng_random_finalize(Object *obj) 
    qemu_set_fd_handler(s->fd, NULL, NULL, NULL);



    if (s->fd != -1) {

        close(s->fd);

        qemu_close(s->fd);

    }



    g_free(s->filename);

configure

+2 −1
Original line number Diff line number Diff line
@@ -2877,7 +2877,7 @@ EOF 
  spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)

  spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)

  if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \

     $pkg_config --atleast-version=0.12.2 spice-protocol > /dev/null 2>&1 && \

     $pkg_config --atleast-version=0.12.3 spice-protocol > /dev/null 2>&1 && \

     compile_prog "$spice_cflags" "$spice_libs" ; then

    spice="yes"

    libs_softmmu="$libs_softmmu $spice_libs"
@@ -4375,6 +4375,7 @@ FILES="$FILES tests/tcg/lm32/Makefile po/Makefile" 
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"

FILES="$FILES pc-bios/spapr-rtas/Makefile"

FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"

FILES="$FILES pc-bios/qemu-icon.bmp"

for bios_file in \

    $source_path/pc-bios/*.bin \

    $source_path/pc-bios/*.aml \

hw/milkymist-hw.h

+0 −16
Original line number Diff line number Diff line
@@ -170,22 +170,6 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base, 
    return dev;

}



static inline DeviceState *milkymist_minimac_create(hwaddr base,

        qemu_irq rx_irq, qemu_irq tx_irq)

{

    DeviceState *dev;



    qemu_check_nic_model(&nd_table[0], "minimac");

    dev = qdev_create(NULL, "milkymist-minimac");

    qdev_set_nic_properties(dev, &nd_table[0]);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, rx_irq);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 1, tx_irq);



    return dev;

}



static inline DeviceState *milkymist_minimac2_create(hwaddr base,

        hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq)

{

hw/pci/pci_host.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct PCIHostState { 
    MemoryRegion conf_mem;

    MemoryRegion data_mem;

    MemoryRegion mmcfg;

    MemoryRegion *address_space;

    uint32_t config_reg;

    PCIBus *bus;

};

hw/piix_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static PCIBus *i440fx_common_init(const char *device_name, 


    dev = qdev_create(NULL, "i440FX-pcihost");

    s = PCI_HOST_BRIDGE(dev);

    s->address_space = address_space_mem;

    b = pci_bus_new(dev, NULL, pci_address_space,

                    address_space_io, 0);

    s->bus = b;