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
This commit is contained in:
commit
6a245c666d
|
@ -74,7 +74,7 @@ static void rng_random_opened(RngBackend *b, Error **errp)
|
||||||
error_set(errp, QERR_INVALID_PARAMETER_VALUE,
|
error_set(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
"filename", "a valid filename");
|
"filename", "a valid filename");
|
||||||
} else {
|
} else {
|
||||||
s->fd = open(s->filename, O_RDONLY | O_NONBLOCK);
|
s->fd = qemu_open(s->filename, O_RDONLY | O_NONBLOCK);
|
||||||
|
|
||||||
if (s->fd == -1) {
|
if (s->fd == -1) {
|
||||||
error_set(errp, QERR_OPEN_FILE_FAILED, s->filename);
|
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);
|
qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
|
||||||
|
|
||||||
if (s->fd != -1) {
|
if (s->fd != -1) {
|
||||||
close(s->fd);
|
qemu_close(s->fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free(s->filename);
|
g_free(s->filename);
|
||||||
|
|
3
configure
vendored
3
configure
vendored
|
@ -2877,7 +2877,7 @@ EOF
|
||||||
spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
|
spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
|
||||||
spice_libs=$($pkg_config --libs 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 && \
|
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
|
compile_prog "$spice_cflags" "$spice_libs" ; then
|
||||||
spice="yes"
|
spice="yes"
|
||||||
libs_softmmu="$libs_softmmu $spice_libs"
|
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/optionrom/Makefile pc-bios/keymaps"
|
||||||
FILES="$FILES pc-bios/spapr-rtas/Makefile"
|
FILES="$FILES pc-bios/spapr-rtas/Makefile"
|
||||||
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
|
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
|
||||||
|
FILES="$FILES pc-bios/qemu-icon.bmp"
|
||||||
for bios_file in \
|
for bios_file in \
|
||||||
$source_path/pc-bios/*.bin \
|
$source_path/pc-bios/*.bin \
|
||||||
$source_path/pc-bios/*.aml \
|
$source_path/pc-bios/*.aml \
|
||||||
|
|
|
@ -170,22 +170,6 @@ static inline DeviceState *milkymist_ac97_create(hwaddr base,
|
||||||
return dev;
|
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,
|
static inline DeviceState *milkymist_minimac2_create(hwaddr base,
|
||||||
hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq)
|
hwaddr buffers_base, qemu_irq rx_irq, qemu_irq tx_irq)
|
||||||
{
|
{
|
||||||
|
|
|
@ -40,7 +40,6 @@ struct PCIHostState {
|
||||||
MemoryRegion conf_mem;
|
MemoryRegion conf_mem;
|
||||||
MemoryRegion data_mem;
|
MemoryRegion data_mem;
|
||||||
MemoryRegion mmcfg;
|
MemoryRegion mmcfg;
|
||||||
MemoryRegion *address_space;
|
|
||||||
uint32_t config_reg;
|
uint32_t config_reg;
|
||||||
PCIBus *bus;
|
PCIBus *bus;
|
||||||
};
|
};
|
||||||
|
|
|
@ -244,7 +244,6 @@ static PCIBus *i440fx_common_init(const char *device_name,
|
||||||
|
|
||||||
dev = qdev_create(NULL, "i440FX-pcihost");
|
dev = qdev_create(NULL, "i440FX-pcihost");
|
||||||
s = PCI_HOST_BRIDGE(dev);
|
s = PCI_HOST_BRIDGE(dev);
|
||||||
s->address_space = address_space_mem;
|
|
||||||
b = pci_bus_new(dev, NULL, pci_address_space,
|
b = pci_bus_new(dev, NULL, pci_address_space,
|
||||||
address_space_io, 0);
|
address_space_io, 0);
|
||||||
s->bus = b;
|
s->bus = b;
|
||||||
|
|
|
@ -567,7 +567,6 @@ static void ppc_prep_init(QEMUMachineInitArgs *args)
|
||||||
|
|
||||||
dev = qdev_create(NULL, "raven-pcihost");
|
dev = qdev_create(NULL, "raven-pcihost");
|
||||||
pcihost = PCI_HOST_BRIDGE(dev);
|
pcihost = PCI_HOST_BRIDGE(dev);
|
||||||
pcihost->address_space = get_system_memory();
|
|
||||||
object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL);
|
object_property_add_child(qdev_get_machine(), "raven", OBJECT(dev), NULL);
|
||||||
qdev_init_nofail(dev);
|
qdev_init_nofail(dev);
|
||||||
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
|
pci_bus = (PCIBus *)qdev_get_child_bus(dev, "pci.0");
|
||||||
|
|
|
@ -2132,7 +2132,7 @@ gluster[+transport]://[server[:port]]/volname/image[?socket=...]
|
||||||
|
|
||||||
Example
|
Example
|
||||||
@example
|
@example
|
||||||
qemu-system-x86_84 --drive file=gluster://192.0.2.1/testvol/a.img
|
qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
See also @url{http://www.gluster.org}.
|
See also @url{http://www.gluster.org}.
|
||||||
|
|
|
@ -565,8 +565,8 @@ int main(int argc, char **argv)
|
||||||
qtest_add_func("/rtc/basic/bcd-12h", basic_12h_bcd);
|
qtest_add_func("/rtc/basic/bcd-12h", basic_12h_bcd);
|
||||||
qtest_add_func("/rtc/set-year/20xx", set_year_20xx);
|
qtest_add_func("/rtc/set-year/20xx", set_year_20xx);
|
||||||
qtest_add_func("/rtc/set-year/1980", set_year_1980);
|
qtest_add_func("/rtc/set-year/1980", set_year_1980);
|
||||||
qtest_add_func("/rtc/register_b_set_flag", register_b_set_flag);
|
qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag);
|
||||||
qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
|
qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers);
|
||||||
ret = g_test_run();
|
ret = g_test_run();
|
||||||
|
|
||||||
if (s) {
|
if (s) {
|
||||||
|
|
|
@ -57,7 +57,7 @@ static const char *qemu_version = QEMU_VERSION;
|
||||||
int socket_set_cork(int fd, int v)
|
int socket_set_cork(int fd, int v)
|
||||||
{
|
{
|
||||||
#if defined(SOL_TCP) && defined(TCP_CORK)
|
#if defined(SOL_TCP) && defined(TCP_CORK)
|
||||||
return setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v));
|
return qemu_setsockopt(fd, SOL_TCP, TCP_CORK, &v, sizeof(v));
|
||||||
#else
|
#else
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
|
@ -66,7 +66,7 @@ int socket_set_cork(int fd, int v)
|
||||||
int socket_set_nodelay(int fd)
|
int socket_set_nodelay(int fd)
|
||||||
{
|
{
|
||||||
int v = 1;
|
int v = 1;
|
||||||
return setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v));
|
return qemu_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &v, sizeof(v));
|
||||||
}
|
}
|
||||||
|
|
||||||
int qemu_madvise(void *addr, size_t len, int advice)
|
int qemu_madvise(void *addr, size_t len, int advice)
|
||||||
|
|
Loading…
Reference in a new issue